diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2012-05-03 12:50:23 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2012-05-03 12:52:31 -0700 |
| commit | 3228643f1ec34a500246ddc1e16025f05b587342 (patch) | |
| tree | d2bcab07311bddbcbc087a57d754a9fc5f71bd76 | |
| parent | b5a18ad8f9dc7b67aa71cedb1cf7edfa8bb97160 (diff) | |
| download | ceph-3228643f1ec34a500246ddc1e16025f05b587342.tar.gz | |
rgw: update cache interface for put_obj_meta
This fixes issue #2381.
The method interface was different than the one needed in order
to override the one in RGWRados.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/rgw/rgw_cache.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h index 79e544d42c1..1d55bb45e10 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -195,7 +195,8 @@ public: map<string, bufferlist>* rmattrs); int put_obj_meta(void *ctx, rgw_obj& obj, uint64_t size, time_t *mtime, map<std::string, bufferlist>& attrs, RGWObjCategory category, bool exclusive, - map<std::string, bufferlist>* rmattrs, const bufferlist *data); + map<std::string, bufferlist>* rmattrs, const bufferlist *data, + RGWObjManifest *manifest); int put_obj_data(void *ctx, rgw_obj& obj, const char *data, off_t ofs, size_t len, bool exclusive); @@ -338,7 +339,7 @@ int RGWCache<T>::set_attrs(void *ctx, rgw_obj& obj, template <class T> int RGWCache<T>::put_obj_meta(void *ctx, rgw_obj& obj, uint64_t size, time_t *mtime, map<std::string, bufferlist>& attrs, RGWObjCategory category, bool exclusive, - map<std::string, bufferlist>* rmattrs, const bufferlist *data) + map<std::string, bufferlist>* rmattrs, const bufferlist *data, RGWObjManifest *manifest) { rgw_bucket bucket; string oid; @@ -355,7 +356,7 @@ int RGWCache<T>::put_obj_meta(void *ctx, rgw_obj& obj, uint64_t size, time_t *mt info.flags |= CACHE_FLAG_DATA; } } - int ret = T::put_obj_meta(ctx, obj, size, mtime, attrs, category, exclusive, rmattrs, data); + int ret = T::put_obj_meta(ctx, obj, size, mtime, attrs, category, exclusive, rmattrs, data, manifest); if (cacheable) { string name = normal_name(bucket, oid); if (ret >= 0) { |