From 28f9fba04104211dbe46c9b64f390c51fbfc6cb2 Mon Sep 17 00:00:00 2001
From: wxyu <xy.wang@zilliz.com>
Date: Mon, 9 Sep 2019 15:57:02 +0800
Subject: [PATCH] MS-528 Hide some config used future

Former-commit-id: 196031ea29c7328291476429dfda7455f9e284c8
---
 cpp/CHANGELOG.md                |  1 +
 cpp/conf/server_config.template | 23 +++++------------------
 cpp/src/scheduler/SchedInst.cpp |  3 ++-
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index 2468951022..dab772d02f 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -106,6 +106,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-524 - Add some unittest in event_test and resource_test
 - MS-525 - Disable parallel reduce in SearchTask
 - MS-527 - Update scheduler_test and enable it
+- MS-528 - Hide some config used future
 
 ## New Feature
 - MS-343 - Implement ResourceMgr
diff --git a/cpp/conf/server_config.template b/cpp/conf/server_config.template
index 8d439b08ef..aa65ef5cb5 100644
--- a/cpp/conf/server_config.template
+++ b/cpp/conf/server_config.template
@@ -48,51 +48,38 @@ resource_config:
   # example:
   # resource_name:               # resource name, just using in connections below
   #   type: DISK                 # resource type, optional: DISK/CPU/GPU
-  #   memory: 256                # memory size, unit: GB
   #   device_id: 0
-  #   enable_loader: true        # if is enable loader, optional: true, false
   #   enable_executor: false     # if is enable executor, optional: true, false
 
   resources:
     ssda:
       type: DISK
-      memory: 2048
       device_id: 0
-      enable_loader: true
       enable_executor: false
 
     cpu:
       type: CPU
-      memory: 64
       device_id: 0
-      enable_loader: true
       enable_executor: false
 
     gpu0:
       type: GPU
-      memory: 6
       device_id: 0
-      enable_loader: true
       enable_executor: true
       gpu_resource_num: 2
       pinned_memory: 300
       temp_memory: 300
 
-#    gtx1660:
-#      type: GPU
-#      memory: 6
-#      device_id: 1
-#      enable_loader: true
-#      enable_executor: true
-
   # connection list, length: 0~N
-      # format: -${resource_name}===${resource_name}
+  # example:
+  # connection_name:
+  #   speed: 100                                        # unit: MS/s
+  #   endpoint: ${resource_name}===${resource_name}
   connections:
     io:
       speed: 500
       endpoint: ssda===cpu
-    pcie:
+    pcie0:
       speed: 11000
       endpoint: cpu===gpu0
-#    - cpu===gtx1660
 
diff --git a/cpp/src/scheduler/SchedInst.cpp b/cpp/src/scheduler/SchedInst.cpp
index 12be4d2eb8..f9392f3425 100644
--- a/cpp/src/scheduler/SchedInst.cpp
+++ b/cpp/src/scheduler/SchedInst.cpp
@@ -36,7 +36,8 @@ StartSchedulerService() {
             auto type = resconf.GetValue(server::CONFIG_RESOURCE_TYPE);
 //        auto memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_MEMORY);
             auto device_id = resconf.GetInt64Value(server::CONFIG_RESOURCE_DEVICE_ID);
-            auto enable_loader = resconf.GetBoolValue(server::CONFIG_RESOURCE_ENABLE_LOADER);
+//            auto enable_loader = resconf.GetBoolValue(server::CONFIG_RESOURCE_ENABLE_LOADER);
+            auto enable_loader = true;
             auto enable_executor = resconf.GetBoolValue(server::CONFIG_RESOURCE_ENABLE_EXECUTOR);
             auto pinned_memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_PIN_MEMORY);
             auto temp_memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_TEMP_MEMORY);