supply datastore integration test

Change-Id: Ic3ad15a9444dca34efad5a41c1731d850de5ce11
sunxm123 · May 31, 2019 · 90302ed · 90302ed
1 parent a592320
commit 90302ed
Show file tree

Hide file tree

Showing 48 changed files with 4,844 additions and 529 deletions.
diff --git a/conf/chunkserver.conf.example b/conf/chunkserver.conf.example
@@ -58,6 +58,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver.conf.0 b/deploy/local/chunkserver/conf/chunkserver.conf.0
@@ -58,6 +58,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver.conf.1 b/deploy/local/chunkserver/conf/chunkserver.conf.1
@@ -58,6 +58,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver.conf.2 b/deploy/local/chunkserver/conf/chunkserver.conf.2
@@ -58,6 +58,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver.conf.docker1 b/deploy/local/chunkserver/conf/chunkserver.conf.docker1
@@ -39,6 +39,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver.conf.docker2 b/deploy/local/chunkserver/conf/chunkserver.conf.docker2
@@ -39,6 +39,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver.conf.docker3 b/deploy/local/chunkserver/conf/chunkserver.conf.docker3
@@ -39,6 +39,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver.conf.docker4 b/deploy/local/chunkserver/conf/chunkserver.conf.docker4
@@ -39,6 +39,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver_docker.conf.0 b/deploy/local/chunkserver/conf/chunkserver_docker.conf.0
@@ -39,6 +39,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver_docker.conf.1 b/deploy/local/chunkserver/conf/chunkserver_docker.conf.1
@@ -39,6 +39,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/deploy/local/chunkserver/conf/chunkserver_docker.conf.2 b/deploy/local/chunkserver/conf/chunkserver_docker.conf.2
@@ -39,6 +39,11 @@ curve.root_password=
 curve.config_path=conf/client.conf
 s3.config_path=conf/s3.conf
 
+#
+# Local FileSystem settings
+#
+fs.enable_renameat2=true
+
 #
 # Storage engine settings
 #

diff --git a/src/chunkserver/datastore/chunkfile_pool.cpp b/src/chunkserver/datastore/chunkfile_pool.cpp
@@ -62,7 +62,7 @@ int ChunkfilePoolHelper::PersistEnCodeMetaInfo(
 
     root[kCRC] = crc;
 
-    int fd = fsptr->Open(persistPath.c_str(), O_RDWR|O_CREAT);
+    int fd = fsptr->Open(persistPath.c_str(), O_RDWR|O_CREAT|O_SYNC);
     if (fd < 0) {
         LOG(ERROR) << "meta file open failed, "
                    << persistPath.c_str();
@@ -85,7 +85,6 @@ int ChunkfilePoolHelper::PersistEnCodeMetaInfo(
         return -1;
     }
 
-    fsptr->Fsync(fd);
     fsptr->Close(fd);
     delete[] writeBuffer;
     return 0;
@@ -381,7 +380,6 @@ int ChunkfilePool::RecycleChunk(const std::string& chunkpath) {
 }
 
 void ChunkfilePool::UnInitialize() {
-    fsptr_              = nullptr;
     currentdir_         = "";
 
     std::unique_lock<std::mutex> lk(mtx_);