[opt] curvefs: Change the confusing configuration name

Signed-off-by: swj <[email protected]>
opencurve · Aug 4, 2023 · 9d48ce9 · 9d48ce9
1 parent 63d3bda
commit 9d48ce9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/curvefs/conf/metaserver.conf b/curvefs/conf/metaserver.conf
@@ -5,10 +5,10 @@ trash.scanPeriodSec=600
 trash.expiredAfterSec=604800
 
 # s3
-# if s3.enableDeleteObjects set True, batch size limit the object num of delete count per delete request
+# if s3.enableBatchDelete set True, batch size limit the object num of delete count per delete request
 s3.batchsize=100
 # if s3 sdk support batch delete objects, set True; other set False
-s3.enableDeleteObjects=False
+s3.enableBatchDelete=False
 # http = 0, https = 1
 s3.http_scheme=0
 s3.verify_SSL=False

diff --git a/curvefs/src/metaserver/metaserver.cpp b/curvefs/src/metaserver/metaserver.cpp
@@ -136,8 +136,8 @@ void Metaserver::InitLocalFileSystem() {
 void InitS3Option(const std::shared_ptr<Configuration>& conf,
                   S3ClientAdaptorOption* s3Opt) {
     LOG_IF(FATAL, !conf->GetUInt64Value("s3.batchsize", &s3Opt->batchSize));
-    LOG_IF(FATAL, !conf->GetBoolValue("s3.enableDeleteObjects",
-                                      &s3Opt->enableDeleteObjects));
+    LOG_IF(FATAL, !conf->GetBoolValue("s3.enableBatchDelete",
+                                      &s3Opt->enableBatchDelete));
 }
 
 void Metaserver::InitPartitionOption(std::shared_ptr<S3ClientAdaptor> s3Adaptor,

diff --git a/curvefs/src/metaserver/s3/metaserver_s3_adaptor.cpp b/curvefs/src/metaserver/s3/metaserver_s3_adaptor.cpp
@@ -32,7 +32,7 @@ void S3ClientAdaptorImpl::Init(const S3ClientAdaptorOption &option,
     blockSize_ = option.blockSize;
     chunkSize_ = option.chunkSize;
     batchSize_ = option.batchSize;
-    enableDeleteObjects_ = option.enableDeleteObjects;
+    enableBatchDelete_ = option.enableBatchDelete;
     objectPrefix_ = option.objectPrefix;
     client_ = client;
 }
@@ -43,13 +43,13 @@ void S3ClientAdaptorImpl::Reinit(const S3ClientAdaptorOption& option,
     blockSize_ = option.blockSize;
     chunkSize_ = option.chunkSize;
     batchSize_ = option.batchSize;
-    enableDeleteObjects_ = option.enableDeleteObjects;
+    enableBatchDelete_ = option.enableBatchDelete;
     objectPrefix_ = option.objectPrefix;
     client_->Reinit(ak, sk, endpoint, bucketName);
 }
 
 int S3ClientAdaptorImpl::Delete(const Inode &inode) {
-    if (enableDeleteObjects_) {
+    if (enableBatchDelete_) {
         return DeleteInodeByDeleteBatchChunk(inode);
     } else {
         return DeleteInodeByDeleteSingleChunk(inode);
@@ -212,7 +212,7 @@ void S3ClientAdaptorImpl::GetS3ClientAdaptorOption(
     option->blockSize = blockSize_;
     option->chunkSize = chunkSize_;
     option->batchSize = batchSize_;
-    option->enableDeleteObjects = enableDeleteObjects_;
+    option->enableBatchDelete = enableBatchDelete_;
     option->objectPrefix = objectPrefix_;
 }
 

diff --git a/curvefs/src/metaserver/s3/metaserver_s3_adaptor.h b/curvefs/src/metaserver/s3/metaserver_s3_adaptor.h
@@ -36,7 +36,7 @@ struct S3ClientAdaptorOption {
     uint64_t chunkSize;
     uint64_t batchSize;
     uint32_t objectPrefix;
-    bool enableDeleteObjects;
+    bool enableBatchDelete;
 };
 
 class S3ClientAdaptor {
@@ -150,7 +150,7 @@ class S3ClientAdaptorImpl : public S3ClientAdaptor {
     uint64_t chunkSize_;
     uint64_t batchSize_;
     uint32_t objectPrefix_;
-    bool enableDeleteObjects_;
+    bool enableBatchDelete_;
 };
 }  // namespace metaserver
 }  // namespace curvefs

diff --git a/curvefs/test/metaserver/metaserver_s3_adaptor_test.cpp b/curvefs/test/metaserver/metaserver_s3_adaptor_test.cpp
@@ -36,7 +36,7 @@ class MetaserverS3AdaptorTest : public testing::Test {
         option.chunkSize = 4 * 1024 * 1024;
         option.batchSize = 5;
         option.objectPrefix = 0;
-        option.enableDeleteObjects = false;
+        option.enableBatchDelete = false;
         mockMetaserverS3Client_ = new MockS3Client();
         metaserverS3ClientAdaptor_ = new S3ClientAdaptorImpl();
 
@@ -208,7 +208,7 @@ TEST_F(MetaserverS3AdaptorTest, test_delete_batch_chunks) {
     option.chunkSize = 4 * 1024 * 1024;
     option.batchSize = 5;
     option.objectPrefix = 0;
-    option.enableDeleteObjects = true;
+    option.enableBatchDelete = true;
     metaserverS3ClientAdaptor_->Init(option, mockMetaserverS3Client_);
 
     // Init
@@ -237,7 +237,7 @@ TEST_F(MetaserverS3AdaptorTest, test_delete_batch_idempotence) {
     option.chunkSize = 4 * 1024 * 1024;
     option.batchSize = 5;
     option.objectPrefix = 0;
-    option.enableDeleteObjects = true;
+    option.enableBatchDelete = true;
     metaserverS3ClientAdaptor_->Init(option, mockMetaserverS3Client_);
 
     // Init
@@ -283,7 +283,7 @@ TEST_F(MetaserverS3AdaptorTest, test_delete_batch_deleted) {
     option.chunkSize = 4 * 1024 * 1024;
     option.batchSize = 5;
     option.objectPrefix = 0;
-    option.enableDeleteObjects = true;
+    option.enableBatchDelete = true;
     metaserverS3ClientAdaptor_->Init(option, mockMetaserverS3Client_);
 
     // Init