Merge pull request ceph#135 from irq0/pr/remove-writing-state

jecluis · Mar 24, 2023 · 595792a · 595792a
2 parents 256ad80 + 553fdc8
commit 595792a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 15 deletions.
diff --git a/src/rgw/driver/sfs/multipart.cc b/src/rgw/driver/sfs/multipart.cc
@@ -145,7 +145,6 @@ int SFSMultipartUpload::complete(
   auto parts_it = parts.cbegin();
   auto etags_it = part_etags.cbegin();
 
-  outobj->metadata_change_version_state(store, ObjectState::WRITING);
   for (; parts_it != parts.cend() && etags_it != part_etags.cend();
        ++parts_it, ++etags_it) {
     ceph_assert(etags_it->first >= 0);

diff --git a/src/rgw/driver/sfs/object.cc b/src/rgw/driver/sfs/object.cc
@@ -230,7 +230,6 @@ int SFSObject::copy_object(
     return -EEXIST;
   }
 
-  dstref->metadata_change_version_state(store, ObjectState::WRITING);
   lsfs_dout(dpp, 10) << "copying file from '" << srcpath << "' to '" << dstpath
                      << "'" << dendl;
   std::filesystem::create_directories(dstpath.parent_path());

diff --git a/src/rgw/driver/sfs/object_state.h b/src/rgw/driver/sfs/object_state.h
@@ -18,7 +18,6 @@ namespace rgw::sal {
 
 enum class ObjectState {
   OPEN = 0,
-  WRITING,
   COMMITTED,
   LOCKED,
   DELETED,

diff --git a/src/rgw/driver/sfs/writer.cc b/src/rgw/driver/sfs/writer.cc
@@ -80,8 +80,6 @@ int SFSAtomicWriter::process(bufferlist&& data, uint64_t offset) {
   lsfs_dout(dpp, 10) << "data len: " << data.length() << ", offset: " << offset
                      << dendl;
 
-  objref->metadata_change_version_state(store, ObjectState::WRITING);
-
   std::filesystem::path object_path =
       store->get_data_path() / objref->get_storage_path();
   ceph_assert(std::filesystem::exists(object_path));

diff --git a/src/test/rgw/sfs/test_rgw_sfs_sqlite_versioned_objects.cc b/src/test/rgw/sfs/test_rgw_sfs_sqlite_versioned_objects.cc
@@ -470,23 +470,16 @@ TEST_F(TestSFSSQLiteVersionedObjects, Testobject_stateConversion) {
 
   auto ret_object = db_objects.get_versioned_object(db_object.id);
   ASSERT_TRUE(ret_object.has_value());
-  ASSERT_EQ(rgw::sal::ObjectState::WRITING, ret_object->object_state);
-
-  db_object.object_state = 2;
-  storage.replace(db_object);
-
-  ret_object = db_objects.get_versioned_object(db_object.id);
-  ASSERT_TRUE(ret_object.has_value());
   ASSERT_EQ(rgw::sal::ObjectState::COMMITTED, ret_object->object_state);
 
-  db_object.object_state = 3;
+  db_object.object_state = 2;
   storage.replace(db_object);
 
   ret_object = db_objects.get_versioned_object(db_object.id);
   ASSERT_TRUE(ret_object.has_value());
   ASSERT_EQ(rgw::sal::ObjectState::LOCKED, ret_object->object_state);
 
-  db_object.object_state = 4;
+  db_object.object_state = 3;
   storage.replace(db_object);
 
   ret_object = db_objects.get_versioned_object(db_object.id);
@@ -684,7 +677,7 @@ TEST_F(TestSFSSQLiteVersionedObjects, TestUpdate) {
   ASSERT_TRUE(ret_ver_object.has_value());
   compareVersionedObjects(object, *ret_ver_object);
 
-  object.object_state = rgw::sal::ObjectState::WRITING;
+  object.object_state = rgw::sal::ObjectState::OPEN;
   db_versioned_objects->store_versioned_object(object);
 
   ret_ver_object = db_versioned_objects->get_versioned_object(1);