2

curvefs/proto/mds.proto

@@ -77,7 +77,7 @@ enum FsStatus {
 
 message FsDetail {
     optional common.Volume volume = 1;
-    optional common.S3Info s3Info = 2;
+    optional common.S3Info s3info = 2;
 }
 
 message Mountpoint {
@@ -115,7 +115,8 @@ message GetFsInfoResponse {
 }
 
 message UpdateS3InfoRequest {
-    required common.S3Info s3Info = 1;
+    required string fsName = 1;
+    required common.S3Info s3Info = 2;
 }
 
 message UpdateS3InfoResponse {

curvefs/src/client/BUILD

@@ -92,6 +92,7 @@ cc_library(
         "//external:brpc",
         "//external:gflags",
         "//external:glog",
+        "//external:json",
         "//src/client:curve_client",
         "//src/common:curve_common",
         "//src/common:curve_s3_adapter",

curvefs/src/client/curve_fuse_op.cpp

@@ -428,41 +428,54 @@ FuseClient* Client() {
 void UpdateS3Config(fuse_req_t req,
                     fuse_ino_t ino,
                     const char* name,
-                    const char* value,
-                    size_t size) {
+                    const char* value) {
+
+    auto fs = g_ClientInstance->GetFileSystem();
 
     if (g_ClientInstance->GetFsInfo()->fstype() != FSType::TYPE_S3) {
         LOG(ERROR) << "updating s3 config only works for s3";
-        return EOPNOTSUPP;
+        return fs->ReplyError(req, CURVEFS_ERROR::NOT_SUPPORT);
     }
 
     const std::string fsName = g_ClientInstance->GetFsInfo()->fsname();
-    const curvefs::common::S3Info oldS3Info = g_ClientInstance->GetFsInfo()->detail()->s3Info();
-    const curvefs::common::S3Info newS3Info(oldS3Info);
+    const curvefs::common::S3Info oldS3Info = g_ClientInstance->GetFsInfo()->detail().s3info();
+    curvefs::common::S3Info newS3Info(oldS3Info);
 
     Json::CharReaderBuilder builder;
     Json::CharReaderBuilder::strictMode(&builder.settings_);
     std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
     Json::Value rootNode;
     JSONCPP_STRING errormsg;
-    if (reader->parse(value, value + strlen(value), &rootNode, &errormsg)) {
-        newS3Info.ak = rootNode["ak"].asString();
-        newS3Info.sk = rootNode["sk"].asString();
-        newS3Info.bucket = rootNode["bucket"].asString();
-        newS3Info.endpoint = rootNode["endpoint"].asString();
-
-        FsInfo fsInfo;
-        FSStatusCode statusCode = g_ClientInstance->mdsClient_->UpdateS3Info(fsName, newS3Info, &fsInfo);
-        if (statusCode == FSStatusCode::OK) {
-            g_ClientInstance->SetFsInfo(fsInfo);
-        }
-    } else {
+    FSStatusCode statusCode;
+    if (!reader->parse(value, value + strlen(value), &rootNode, &errormsg)) {
+        statusCode = FSStatusCode::INTERNAL_ERROR;
         LOG(ERROR) << "Error parsing the input value ' "
                    << value
                    << " ': " << errormsg;
+        fuse_reply_err(req, FSStatusCode::INTERNAL_ERROR);
+        return;
     }
 
-    fuse_reply_err(req, statusCode);
+    FuseS3Client* g_S3ClientInstance = dynamic_cast<FuseS3Client*>(g_ClientInstance);
+    if (!g_S3ClientInstance) {
+        LOG(ERROR) << "Dynamic cast from FuseClient to FuseS3Client failed";
+        return fs->ReplyError(req, CURVEFS_ERROR::INTERNAL);
+    }
+
+    newS3Info.set_ak(rootNode["ak"].asString());
+    newS3Info.set_sk(rootNode["sk"].asString());
+    newS3Info.set_bucketname(rootNode["bucketname"].asString());
+    newS3Info.set_endpoint(rootNode["endpoint"].asString());
+
+    FsInfo fsInfo;
+    CURVEFS_ERROR updateStatusCode = g_S3ClientInstance->UpdateS3Info(fsName, newS3Info, fsInfo);
+    if (updateStatusCode != CURVEFS_ERROR::OK) {
+        return fs->ReplyError(req, updateStatusCode);
+    }
+
+    g_ClientInstance->SetFsInfo(std::make_shared<FsInfo>(fsInfo));
+
+    return fs->ReplyError(req, CURVEFS_ERROR::OK);
 }
 
 void TriggerWarmup(fuse_req_t req,

curvefs/src/client/filesystem/error.h

@@ -59,6 +59,7 @@ enum class CURVEFS_ERROR {
     NOSYS = -20,
     END_OF_FILE = -21,
     NOT_A_DIRECTORY = -22,
+    UPDATE_S3_INFO_FAILED = -23,
 };
 
 std::string StrErr(CURVEFS_ERROR code);

curvefs/src/client/filesystem/xattr.h

@@ -45,7 +45,7 @@ const char XATTR_DIR_RFBYTES[] = "curve.dir.rfbytes";
 const char XATTR_DIR_PREFIX[] = "curve.dir";
 const char XATTR_WARMUP_OP[] = "curvefs.warmup.op";
 const char XATTR_WARMUP_OP_LIST[] = "curvefs.warmup.op.list";
-const char XATTR_S3_CONFIG[] = "curvefs.s3.config";
+const char XATTR_S3_CONFIG[] = "curvefs.s3.update.config";
 
 inline bool IsSpecialXAttr(const std::string& key) {
     static std::map<std::string, bool> xattrs {

curvefs/src/client/fuse_s3_client.cpp

@@ -389,6 +389,28 @@ CURVEFS_ERROR FuseS3Client::Truncate(InodeWrapper *inode, uint64_t length) {
     return s3Adaptor_->Truncate(inode, length);
 }
 
+CURVEFS_ERROR FuseS3Client::UpdateS3Info(const std::string& fsName,
+                                        const curvefs::common::S3Info& s3Info,
+                                        FsInfo& fsInfo) {
+    ::curve::common::S3InfoOption s3InfoOption;
+    ::curvefs::client::common::S3Info2FsS3Option(s3Info, &s3InfoOption);
+    FSStatusCode updateStatusCode = mdsClient_->UpdateS3Info(fsName, s3Info, &fsInfo);
+    if (updateStatusCode != FSStatusCode::OK) {
+        LOG(ERROR) << "Update s3 info error code: (FSStatusCode)"
+                   << updateStatusCode;
+        return CURVEFS_ERROR::UPDATE_S3_INFO_FAILED;
+    }
+
+    if (option_.s3Opt.s3AdaptrOpt.ak != s3Info.ak() ||
+        option_.s3Opt.s3AdaptrOpt.sk != s3Info.sk() ||
+        option_.s3Opt.s3AdaptrOpt.s3Address != s3Info.endpoint() ||
+        option_.s3Opt.s3AdaptrOpt.bucketName != s3Info.bucketname()) {
+        s3Adaptor_->GetS3Client()->Reinit(option_.s3Opt.s3AdaptrOpt);
+    }
+
+    return CURVEFS_ERROR::OK;
+}
+
 CURVEFS_ERROR FuseS3Client::FuseOpFlush(fuse_req_t req, fuse_ino_t ino,
                                         struct fuse_file_info *fi) {
     (void)req;

curvefs/src/client/fuse_s3_client.h

@@ -125,6 +125,10 @@ class FuseS3Client : public FuseClient {
 
     CURVEFS_ERROR Truncate(InodeWrapper *inode, uint64_t length) override;
 
+    CURVEFS_ERROR UpdateS3Info(const std::string& fsName,
+                              const curvefs::common::S3Info& s3Info,
+                              FsInfo& fsInfo);
+
  private:
     bool InitKVCache(const KVClientManagerOpt &opt);
 

curvefs/src/client/metric/client_metric.h

@@ -43,6 +43,7 @@ namespace metric {
 struct MDSClientMetric {
     static const std::string prefix;
 
+    InterfaceMetric updateS3Info;
     InterfaceMetric mountFs;
     InterfaceMetric umountFs;
     InterfaceMetric getFsInfo;
@@ -61,6 +62,7 @@ struct MDSClientMetric {
     MDSClientMetric()
         : mountFs(prefix, "mountFs"),
           umountFs(prefix, "umountFs"),
+          updateS3Info(prefix, "updateS3Info"),
           getFsInfo(prefix, "getFsInfo"),
           getMetaServerInfo(prefix, "getMetaServerInfo"),
           getMetaServerListInCopysets(prefix, "getMetaServerListInCopysets"),

curvefs/src/client/rpcclient/base_client.cpp

@@ -36,7 +36,7 @@ void MDSBaseClient::UpdateS3Info(const std::string& fsName,
                                  brpc::Channel* channel) {
     UpdateS3InfoRequest request;
     request.set_fsname(fsName);
-    request.set_s3Info(s3Info);
+    request.mutable_s3info()->CopyFrom(s3Info);
     curvefs::mds::MdsService_Stub stub(channel);
     stub.UpdateS3Info(cntl, &request, response, nullptr);
 }

curvefs/src/client/rpcclient/base_client.h

@@ -76,6 +76,8 @@ using curvefs::mds::FsInfo;
 using curvefs::mds::FsStatus;
 using curvefs::mds::GetFsInfoRequest;
 using curvefs::mds::GetFsInfoResponse;
+using curvefs::mds::UpdateS3InfoRequest;
+using curvefs::mds::UpdateS3InfoResponse;
 using curvefs::mds::MountFsRequest;
 using curvefs::mds::MountFsResponse;
 using curvefs::mds::GetLatestTxIdRequest;

curvefs/src/client/rpcclient/mds_client.cpp

@@ -65,13 +65,13 @@ FSStatusCode MdsClientImpl::UpdateS3Info(const std::string& fsName,
     auto task = RPCTask {
         (void)addrindex;
         (void)rpctimeoutMS;
-        mdsClientMetric_.mountFs.qps.count << 1;
-        LatencyUpdater updater(&mdsClientMetric_.mountFs.latency);
+        mdsClientMetric_.updateS3Info.qps.count << 1;
+        LatencyUpdater updater(&mdsClientMetric_.updateS3Info.latency);
         UpdateS3InfoResponse response;
         mdsbasecli_->UpdateS3Info(fsName, s3Info, &response, cntl, channel);
         if (cntl->Failed()) {
-            mdsClientMetric_.mountFs.eps.count << 1;
-            LOG(WARNING) << "MountFs Failed, errorcode = " << cntl->ErrorCode()
+            mdsClientMetric_.updateS3Info.eps.count << 1;
+            LOG(WARNING) << "UpdateS3Info Failed, errorcode = " << cntl->ErrorCode()
                          << ", error content:" << cntl->ErrorText()
                          << ", log id = " << cntl->log_id();
             return -cntl->ErrorCode();
@@ -80,7 +80,7 @@ FSStatusCode MdsClientImpl::UpdateS3Info(const std::string& fsName,
         FSStatusCode ret = response.statuscode();
         if (ret != FSStatusCode::OK) {
             LOG(WARNING) << "UpdateS3Info: fsname = " << fsName
-                         << ", mountPt = " << mountPt.ShortDebugString()
+                         << ", s3Info = " << s3Info.ShortDebugString()
                          << ", errcode = " << ret
                          << ", errmsg = " << FSStatusCode_Name(ret);
         } else if (response.has_fsinfo()) {

curvefs/src/client/rpcclient/mds_client.h

@@ -60,6 +60,7 @@ namespace curvefs {
 namespace client {
 namespace rpcclient {
 
+using curvefs::common::S3Info;
 using curvefs::mds::GetLatestTxIdRequest;
 using curvefs::mds::GetLatestTxIdResponse;
 using curvefs::mds::CommitTxRequest;
@@ -76,7 +77,7 @@ class MdsClient {
                               MDSBaseClient *baseclient) = 0;
 
     virtual FSStatusCode UpdateS3Info(const std::string& fsName,
-                                      const curvefs::common::S3Info& s3Info, FsInfo* fsInfo) = 0;
+                                      const S3Info& s3Info, FsInfo* fsInfo) = 0;
 
     virtual FSStatusCode MountFs(const std::string& fsName,
                                  const Mountpoint& mountPt, FsInfo* fsInfo) = 0;
@@ -174,7 +175,7 @@ class MdsClientImpl : public MdsClient {
     FSStatusCode Init(const ::curve::client::MetaServerOption &mdsOpt,
                       MDSBaseClient *baseclient) override;
 
-    FSStatusCode UpdateS3Info(const std::string& fsName, const curvefs::common::S3Info& s3Info,
+    FSStatusCode UpdateS3Info(const std::string& fsName, const S3Info& s3Info,
                               FsInfo* fsInfo) override;
 
     FSStatusCode MountFs(const std::string& fsName, const Mountpoint& mountPt,

curvefs/src/client/s3/client_s3.cpp

@@ -28,6 +28,10 @@ void S3ClientImpl::Init(const curve::common::S3AdapterOption &option) {
     s3Adapter_->Init(option);
 }
 
+void S3ClientImpl::Reinit(const curve::common::S3AdapterOption &option) {
+    s3Adapter_->Reinit(option);
+}
+
 void S3ClientImpl::Deinit() {
     s3Adapter_->Deinit();
 }

curvefs/src/client/s3/client_s3.h

@@ -41,6 +41,7 @@ class S3Client {
     S3Client() {}
     virtual ~S3Client() {}
     virtual void Init(const curve::common::S3AdapterOption& option) = 0;
+    virtual void Reinit(const curve::common::S3AdapterOption& option) = 0;
     virtual void Deinit() = 0;
     virtual int Upload(const std::string& name, const char* buf,
                        uint64_t length) = 0;
@@ -65,6 +66,7 @@ class S3ClientImpl : public S3Client {
     }
     virtual ~S3ClientImpl() {}
     void Init(const curve::common::S3AdapterOption& option);
+    void Reinit(const curve::common::S3AdapterOption& option);
     void Deinit();
     int Upload(const std::string& name, const char* buf, uint64_t length);
     void UploadAsync(std::shared_ptr<PutObjectAsyncContext> context);

curvefs/src/mds/fs_info_wrapper.h

@@ -35,6 +35,7 @@ namespace curvefs {
 namespace mds {
 
 using ::curvefs::common::FSType;
+using ::curvefs::common::S3Info;
 
 // A wrapper for proto FsInfo
 class FsInfoWrapper {
@@ -67,8 +68,8 @@ class FsInfoWrapper {
     }
 
     void SetS3Info(S3Info s3info) {
-        const FsDetail fsdetail_ = GetFsDetail();
-        fsdetail_._set_s3info(s3info)
+        FsDetail fsdetail_ = GetFsDetail();
+        fsdetail_.mutable_s3info()->CopyFrom(s3info);
     }
 
     void SetFsName(const std::string& name) {

curvefs/src/mds/fs_manager.cpp

@@ -599,7 +599,7 @@ FSStatusCode FsManager::DeleteFs(const std::string& fsName) {
 }
 
 FSStatusCode FsManager::UpdateS3Info(const std::string& fsName,
-                                     const curvefs::common::S3Info& s3Info, FsInfo* fsInfo) {
+                                     const S3Info& s3Info, FsInfo* fsInfo) {
     NameLockGuard lock(nameLock_, fsName);
 
     // query fs
@@ -611,21 +611,18 @@ FSStatusCode FsManager::UpdateS3Info(const std::string& fsName,
         return ret;
     }
 
-    // insert mountpoint
+    // update s3Info
     wrapper.SetS3Info(s3Info);
     // for persistence consider
     ret = fsStorage_->Update(wrapper);
     if (ret != FSStatusCode::OK) {
         LOG(WARNING) << "UpdateS3Info fail, update fs fail, fsName = " << fsName
-                     << ", mountpoint = " << mountpoint.ShortDebugString()
+                     << ", s3Info = " << s3Info.ShortDebugString()
                      << ", errCode = " << FSStatusCode_Name(ret);
         return ret;
     }
-    // update client alive time
-    UpdateClientAliveTime(mountpoint, fsName, false);
 
     // convert fs info
-    FsMetric::GetInstance().OnMount(wrapper.GetFsName(), mountpoint);
     *fsInfo = std::move(wrapper).ProtoFsInfo();
 
     return FSStatusCode::OK;

curvefs/src/mds/fs_manager.h

@@ -62,10 +62,11 @@ using ::curve::common::Atomic;
 using ::curve::common::InterruptibleSleeper;
 using ::curve::common::S3Adapter;
 using ::curve::common::Thread;
+
+using ::curvefs::common::S3Info;
 using ::curvefs::mds::topology::PartitionTxId;
 using ::curvefs::mds::topology::Topology;
 using ::curvefs::mds::topology::TopologyManager;
-
 using ::curvefs::mds::dlock::DLock;
 using ::curvefs::mds::Mountpoint;
 
@@ -130,7 +131,7 @@ class FsManager {
      *
      */
     FSStatusCode UpdateS3Info(const std::string& fsName,
-                              const Mountpoint& mountpoint, FsInfo* fsInfo);
+                              const S3Info& mountpoint, FsInfo* fsInfo);
 
     /**
      * @brief Mount fs, mount point can not repeat. It will increate

curvefs/src/mds/mds_service.cpp

@@ -149,8 +149,8 @@ void MdsServiceImpl::UpdateS3Info(::google::protobuf::RpcController* controller,
     const std::string &fsName = request->fsname();
     const curvefs::common::S3Info &s3Info = request->s3info();
 
-    LOG(INFO) << "MountFs request, fsName = " << fsName
-              << ", mountPoint = " << mount.ShortDebugString();
+    LOG(INFO) << "UpdateS3Info request, fsName = " << fsName
+              << ", s3Info = " << s3Info.ShortDebugString();
 
     FSStatusCode status =
         fsManager_->UpdateS3Info(fsName, s3Info, response->mutable_fsinfo());
@@ -159,14 +159,14 @@ void MdsServiceImpl::UpdateS3Info(::google::protobuf::RpcController* controller,
         response->clear_fsinfo();
         response->set_statuscode(status);
         LOG(ERROR) << "UpdateS3Info fail, fsName = " << fsName
-                   << ", mountPoint = " << mount.ShortDebugString()
+                   << ", s3Info = " << s3Info.ShortDebugString()
                    << ", errCode = " << FSStatusCode_Name(status);
         return;
     }
 
     response->set_statuscode(FSStatusCode::OK);
     LOG(INFO) << "UpdateS3Info success, fsName = " << fsName
-              << ", mountPoint = " << mount.ShortDebugString()
+              << ", s3Info = " << s3Info.ShortDebugString()
               << ", mps: " << response->mutable_fsinfo()->mountpoints_size();
 }
 

curvefs/src/mds/mds_service.h

@@ -50,6 +50,11 @@ class MdsServiceImpl : public MdsService {
                   CreateFsResponse* response,
                   ::google::protobuf::Closure* done);
 
+    void UpdateS3Info(::google::protobuf::RpcController* controller,
+                      const UpdateS3InfoRequest* request,
+                      UpdateS3InfoResponse* response,
+                      ::google::protobuf::Closure* done);
+
     void MountFs(::google::protobuf::RpcController* controller,
                  const MountFsRequest* request,
                  MountFsResponse* response,

curvefs/test/client/mock_client_s3.h

@@ -41,6 +41,7 @@ class MockS3Client : public S3Client {
     ~MockS3Client() {}
 
     MOCK_METHOD1(Init, void(const curve::common::S3AdapterOption &options));
+    MOCK_METHOD1(Reinit, void(const curve::common::S3AdapterOption &options));
     MOCK_METHOD0(Deinit, void());
     MOCK_METHOD3(Upload, int(const std::string &name, const char *buf,
                              uint64_t length));