diff options
| author | Greg Farnum <greg@inktank.com> | 2013-07-17 12:50:14 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-07-25 16:00:17 -0700 |
| commit | 18eabd33221f0739f78d96ea8d91ae141b781bcf (patch) | |
| tree | 68b503c851348155a21852023aa31d025656c526 | |
| parent | 4f9855e4705ede5d937b6e533ce9f116dec793a8 (diff) | |
| download | ceph-18eabd33221f0739f78d96ea8d91ae141b781bcf.tar.gz | |
rgw: pass the sync mode into the RGWMetadataManager::put() calls.
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/rgw/rgw_admin.cc | 2 | ||||
| -rw-r--r-- | src/rgw/rgw_metadata.cc | 6 | ||||
| -rw-r--r-- | src/rgw/rgw_metadata.h | 3 | ||||
| -rw-r--r-- | src/rgw/rgw_rest_metadata.cc | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index e5d880f7d24..d6b28ca5ecb 100644 --- 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 1afe991ff50..4e12c6a5e96 100644 --- 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 be9daaa0ba5..b4e1584cf91 100644 --- 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 69f8a5ccbc4..7cf97f5db26 100644 --- 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; |