Merge branch 'master' into config-update

XiaoMi · Dec 16, 2020 · 61bb5dc · 61bb5dc
2 parents 10b7e93 + c372f6e
commit 61bb5dc
Show file tree

Hide file tree

Showing 13 changed files with 176 additions and 59 deletions.
diff --git a/include/dsn/dist/replication/replication_ddl_client.h b/include/dsn/dist/replication/replication_ddl_client.h
@@ -180,7 +180,8 @@ class replication_ddl_client
 
     error_with<start_bulk_load_response> start_bulk_load(const std::string &app_name,
                                                          const std::string &cluster_name,
-                                                         const std::string &file_provider_type);
+                                                         const std::string &file_provider_type,
+                                                         const std::string &remote_root_path);
 
     error_with<control_bulk_load_response>
     control_bulk_load(const std::string &app_name, const bulk_load_control_type::type control_type);

diff --git a/include/dsn/dist/replication/replication_types.h b/include/dsn/dist/replication/replication_types.h
diff --git a/src/client/replication_ddl_client.cpp b/src/client/replication_ddl_client.cpp
@@ -1552,12 +1552,14 @@ void replication_ddl_client::query_disk_info(
 error_with<start_bulk_load_response>
 replication_ddl_client::start_bulk_load(const std::string &app_name,
                                         const std::string &cluster_name,
-                                        const std::string &file_provider_type)
+                                        const std::string &file_provider_type,
+                                        const std::string &remote_root_path)
 {
     auto req = make_unique<start_bulk_load_request>();
     req->app_name = app_name;
     req->cluster_name = cluster_name;
     req->file_provider_type = file_provider_type;
+    req->remote_root_path = remote_root_path;
     return call_rpc_sync(start_bulk_load_rpc(std::move(req), RPC_CM_START_BULK_LOAD));
 }
 

diff --git a/src/common/replication_common.cpp b/src/common/replication_common.cpp
@@ -514,11 +514,6 @@ void replication_options::initialize()
                                          cold_backup_checkpoint_reserve_minutes,
                                          "reserve minutes of cold backup checkpoint");
 
-    bulk_load_provider_root = dsn_config_get_value_string("replication",
-                                                          "bulk_load_provider_root",
-                                                          "bulk_load_provider_root",
-                                                          "bulk load root on remote file provider");
-
     max_concurrent_bulk_load_downloading_count = FLAGS_max_concurrent_bulk_load_downloading_count;
 
     replica_helper::load_meta_servers(meta_servers);

diff --git a/src/common/replication_common.h b/src/common/replication_common.h
@@ -120,7 +120,6 @@ class replication_options
     std::string cold_backup_root;
     int32_t cold_backup_checkpoint_reserve_minutes;
 
-    std::string bulk_load_provider_root;
     int32_t max_concurrent_bulk_load_downloading_count;
 
 public: