rgw: pass the sync mode into the RGWMetadataManager::put() calls.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index e5d880f7d24be927b604d117d05072570ea9feeb..d6b28ca5ecb946392ecc4cb81789e05aec31a065 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1816,7 +1816,7 @@ next:
       cerr << "ERROR: failed to read input: " << cpp_strerror(-ret) << std::endl;
       return ret;
     }
-    ret = store->meta_mgr->put(metadata_key, bl);
+    ret = store->meta_mgr->put(metadata_key, bl, RGWMetadataHandler::APPLY_ALWAYS);
     if (ret < 0) {
       cerr << "ERROR: can't put key: " << cpp_strerror(-ret) << std::endl;
       return -ret;

diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index 1afe991ff50433ea7693c777b6c22367fc93ed78..4e12c6a5e96d086ef320e717a0846d0221e96638 100644 (file)
--- a/src/rgw/rgw_metadata.cc
+++ b/src/rgw/rgw_metadata.cc
@@ -329,7 +329,8 @@ int RGWMetadataManager::get(string& metadata_key, Formatter *f)
   return 0;
 }
 
-int RGWMetadataManager::put(string& metadata_key, bufferlist& bl)
+int RGWMetadataManager::put(string& metadata_key, bufferlist& bl,
+                            RGWMetadataHandler::sync_type_t sync_type)
 {
   RGWMetadataHandler *handler;
   string entry;
@@ -358,9 +359,6 @@ int RGWMetadataManager::put(string& metadata_key, bufferlist& bl)
     return -EINVAL;
   }
 
-  RGWMetadataHandler::sync_type_t sync_type;
-  sync_type = RGWMetadataHandler::APPLY_ALWAYS;
-
   return handler->put(store, entry, objv_tracker, mtime, jo, sync_type);
 }
 

diff --git a/src/rgw/rgw_metadata.h b/src/rgw/rgw_metadata.h
index be9daaa0ba554598fef7f6e2157f5dbcdcfc877e..b4e1584cf91fa947b5fc55155f9d124ab2bbeeea 100644 (file)
--- a/src/rgw/rgw_metadata.h
+++ b/src/rgw/rgw_metadata.h
@@ -183,7 +183,8 @@ public:
                 map<string, bufferlist>* rmattrs,
                 RGWObjVersionTracker *objv_tracker);
   int get(string& metadata_key, Formatter *f);
-  int put(string& metadata_key, bufferlist& bl);
+  int put(string& metadata_key, bufferlist& bl,
+          RGWMetadataHandler::sync_type_t sync_mode);
   int remove(string& metadata_key);
 
   int list_keys_init(string& section, void **phandle);

diff --git a/src/rgw/rgw_rest_metadata.cc b/src/rgw/rgw_rest_metadata.cc
index 69f8a5ccbc45204c44d3a0cbca44d29b5e5a2faa..7cf97f5db265c302777ca0180cff05aa65066c2d 100644 (file)
--- a/src/rgw/rgw_rest_metadata.cc
+++ b/src/rgw/rgw_rest_metadata.cc
@@ -161,7 +161,9 @@ void RGWOp_Metadata_Put::execute() {
   
   frame_metadata_key(s, metadata_key);
   
-  http_ret = store->meta_mgr->put(metadata_key, bl);
+  RGWMetadataHandler::sync_type_t sync_type = RGWMetadataHandler::APPLY_ALWAYS;
+
+  http_ret = store->meta_mgr->put(metadata_key, bl, sync_type);
   if (http_ret < 0) {
     dout(5) << "ERROR: can't put key: " << cpp_strerror(http_ret) << dendl;
     return;