curvefs/client: fix client core dump error

curvefs/src/client/fuse_s3_client.cpp

@@ -48,16 +48,18 @@ using curvefs::mds::topology::MemcacheServerInfo;
 
 CURVEFS_ERROR FuseS3Client::Init(const FuseClientOption &option) {
     FuseClientOption opt(option);
-    // init kvcache
-    if (FLAGS_supportKVcache && !InitKVCache(option.kvClientManagerOpt)) {
-        return CURVEFS_ERROR::INTERNAL;
-    }
+    initbgFetchThread_ = false;
 
     CURVEFS_ERROR ret = FuseClient::Init(opt);
     if (ret != CURVEFS_ERROR::OK) {
         return ret;
     }
 
+    // init kvcache
+    if (FLAGS_supportKVcache && !InitKVCache(option.kvClientManagerOpt)) {
+        return CURVEFS_ERROR::INTERNAL;
+    }
+
     // set fs S3Option
     const auto& s3Info = fsInfo_->detail().s3info();
     ::curve::common::S3InfoOption fsS3Option;
@@ -92,6 +94,7 @@ CURVEFS_ERROR FuseS3Client::Init(const FuseClientOption &option) {
 
     bgFetchStop_.store(false, std::memory_order_release);
     bgFetchThread_ = Thread(&FuseS3Client::BackGroundFetch, this);
+    initbgFetchThread_ = true;
     GetTaskFetchPool();
     return ret;
 }
@@ -370,7 +373,9 @@ void FuseS3Client::travelChunks(fuse_ino_t ino, google::protobuf::Map<uint64_t,
 
 void FuseS3Client::UnInit() {
     bgFetchStop_.store(true, std::memory_order_release);
-    bgFetchThread_.join();
+    if (initbgFetchThread_) {
+        bgFetchThread_.join();
+    }
     FuseClient::UnInit();
     s3Adaptor_->Stop();
     curve::common::S3Adapter::Shutdown();

curvefs/src/client/fuse_s3_client.h

@@ -43,16 +43,14 @@ using curve::common::GetObjectAsyncCallBack;
 class FuseS3Client : public FuseClient {
  public:
     FuseS3Client()
-      : FuseClient(),
-        s3Adaptor_(std::make_shared<S3ClientAdaptorImpl>()) {}
+        : FuseClient(), s3Adaptor_(std::make_shared<S3ClientAdaptorImpl>()) {}
 
     FuseS3Client(const std::shared_ptr<MdsClient> &mdsClient,
-        const std::shared_ptr<MetaServerClient> &metaClient,
-        const std::shared_ptr<InodeCacheManager> &inodeManager,
-        const std::shared_ptr<DentryCacheManager> &dentryManager,
-        const std::shared_ptr<S3ClientAdaptor> &s3Adaptor)
-        : FuseClient(mdsClient, metaClient,
-            inodeManager, dentryManager),
+                 const std::shared_ptr<MetaServerClient> &metaClient,
+                 const std::shared_ptr<InodeCacheManager> &inodeManager,
+                 const std::shared_ptr<DentryCacheManager> &dentryManager,
+                 const std::shared_ptr<S3ClientAdaptor> &s3Adaptor)
+        : FuseClient(mdsClient, metaClient, inodeManager, dentryManager),
           s3Adaptor_(s3Adaptor) {}
 
     CURVEFS_ERROR Init(const FuseClientOption &option) override;
@@ -120,6 +118,7 @@ class FuseS3Client : public FuseClient {
     // s3 adaptor
     std::shared_ptr<S3ClientAdaptor> s3Adaptor_;
 
+    bool initbgFetchThread_;
     Thread bgFetchThread_;
     std::atomic<bool> bgFetchStop_;
     std::mutex fetchMtx_;

curvefs/src/client/rpcclient/mds_client.cpp

@@ -441,7 +441,7 @@ bool MdsClientImpl::AllocOrGetMemcacheCluster(uint32_t fsId,
         return ret;
     };
 
-    return ReturnError(rpcexcutor_.DoRPCTask(task, mdsOpt_.mdsMaxRetryMS));
+    return 0 == ReturnError(rpcexcutor_.DoRPCTask(task, mdsOpt_.mdsMaxRetryMS));
 }
 
 FSStatusCode MdsClientImpl::AllocS3ChunkId(uint32_t fsId, uint32_t idNum,

curvefs/test/client/test_fuse_s3_client.cpp

@@ -167,6 +167,7 @@ TEST_F(TestFuseS3Client, test_Init_with_KVCache) {
             .WillOnce(DoAll(SetArgPointee<1>(memcacheCluster), Return(false)));
 
         ASSERT_EQ(CURVEFS_ERROR::INTERNAL, testclient->Init(opt));
+        testclient->UnInit();
     }
     curvefs::client::common::FLAGS_supportKVcache = false;
 }