curvefs-mds: fix an uninitialized that spawn infinite threads

opencurve · Apr 12, 2022 · 05ada9e · 05ada9e
1 parent 2a84e86
commit 05ada9e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/curvefs/conf/mds.conf b/curvefs/conf/mds.conf
@@ -106,6 +106,8 @@ mds.scheduler.metaserver.cooling.timeSec=1800
 # the backend thread check whether fs is able to delete,
 # check partition of deleting fs is deleting
 mds.fsmanager.backEndThreadRunInterSec=10
+# number of threads that load space info of volume
+mds.fsmanager.reloadSpaceConcurrency=10
 
 #### s3
 # TODO(huyao): use more meaningfull name

diff --git a/curvefs/src/mds/fs_manager.h b/curvefs/src/mds/fs_manager.h
@@ -65,7 +65,7 @@ using ::curvefs::mds::topology::TopologyManager;
 
 struct FsManagerOption {
     uint32_t backEndThreadRunInterSec;
-    uint32_t spaceReloadConcurrency;
+    uint32_t spaceReloadConcurrency = 10;
     curve::common::S3AdapterOption s3AdapterOption;
 };
 

diff --git a/curvefs/src/mds/mds.cpp b/curvefs/src/mds/mds.cpp
@@ -133,6 +133,14 @@ void MDS::InitScheduleOption(ScheduleOption* scheduleOption) {
 void MDS::InitFsManagerOptions(FsManagerOption* fsManagerOption) {
     conf_->GetValueFatalIfFail("mds.fsmanager.backEndThreadRunInterSec",
                                &fsManagerOption->backEndThreadRunInterSec);
+
+    LOG_IF(ERROR,
+           conf_->GetUInt32Value("mds.fsmanager.reloadSpaceConcurrency",
+                                 &fsManagerOption->spaceReloadConcurrency))
+        << "Get `mds.fsmanager.reloadSpaceConcurrency` from conf error, use "
+           "default value: "
+        << fsManagerOption->spaceReloadConcurrency;
+
     ::curve::common::InitS3AdaptorOptionExceptS3InfoOption(
         conf_.get(), &fsManagerOption->s3AdapterOption);
 }