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>

diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
index 79e544d42c1aaac77e4c0754c7c46048597eeb9e..1d55bb45e10d6df98bf4d086c23bdc510b9bb434 100644 (file)
--- 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) {