bump version to 18.2.4-pve3

[ceph.git] / ceph / src / rgw / rgw_torrent.cc

diff --git a/ceph/src/rgw/rgw_torrent.cc b/ceph/src/rgw/rgw_torrent.cc
index 3470471d535429b019a2b9cacbca87dc7add5b9d..e1a1417a5a6fdc08beb383167bd5866ee2d01ba3 100644 (file)
--- a/ceph/src/rgw/rgw_torrent.cc
+++ b/ceph/src/rgw/rgw_torrent.cc
@@ -16,7 +16,7 @@
 
 #define dout_subsys ceph_subsys_rgw
 
-using ceph::crypto::MD5;
+using namespace std;
 using namespace librados;
 using namespace boost;
 using ceph::crypto::SHA1;
@@ -34,16 +34,16 @@ seed::~seed()
   seed::info.sha1_bl.clear();
   bl.clear();
   s = NULL;
-  store = NULL;
+  driver = NULL;
 }
 
-void seed::init(struct req_state *p_req, rgw::sal::RGWRadosStore *p_store)
+void seed::init(req_state *_req, rgw::sal::Driver* _driver)
 {
-  s = p_req;
-  store = p_store;
+  s = _req;
+  driver = _driver;
 }
 
-int seed::get_torrent_file(rgw::sal::RGWObject* object,
+int seed::get_torrent_file(rgw::sal::Object* object,
                            uint64_t &total_len,
                            ceph::bufferlist &bl_data,
                            rgw_obj &obj)
@@ -66,17 +66,17 @@ int seed::get_torrent_file(rgw::sal::RGWObject* object,
 
   string oid, key;
   get_obj_bucket_and_oid_loc(obj, oid, key);
-  ldout(s->cct, 20) << "NOTICE: head obj oid= " << oid << dendl;
+  ldpp_dout(s, 20) << "NOTICE: head obj oid= " << oid << dendl;
 
   const set<string> obj_key{RGW_OBJ_TORRENT};
   map<string, bufferlist> m;
-  const int r = object->omap_get_vals_by_keys(oid, obj_key, &m);
+  const int r = object->omap_get_vals_by_keys(s, oid, obj_key, &m);
   if (r < 0) {
-    ldout(s->cct, 0) << "ERROR: omap_get_vals_by_keys failed: " << r << dendl;
+    ldpp_dout(s, 0) << "ERROR: omap_get_vals_by_keys failed: " << r << dendl;
     return r;
   }
   if (m.size() != 1) {
-    ldout(s->cct, 0) << "ERROR: omap key " RGW_OBJ_TORRENT " not found" << dendl;
+    ldpp_dout(s, 0) << "ERROR: omap key " RGW_OBJ_TORRENT " not found" << dendl;
     return -EINVAL;
   }
   bl.append(std::move(m.begin()->second));
@@ -116,7 +116,7 @@ int seed::complete(optional_yield y)
   ret = save_torrent_file(y);
   if (0 != ret)
   {
-    ldout(s->cct, 0) << "ERROR: failed to save_torrent_file() ret= "<< ret << dendl;
+    ldpp_dout(s, 0) << "ERROR: failed to save_torrent_file() ret= "<< ret << dendl;
     return ret;
   }
 
@@ -204,7 +204,7 @@ void seed::set_announce()
 
   if (announce_list.empty())
   {
-    ldout(s->cct, 5) << "NOTICE: announce_list is empty " << dendl;    
+    ldpp_dout(s, 5) << "NOTICE: announce_list is empty " << dendl;    
     return;
   }
 
@@ -249,18 +249,11 @@ int seed::save_torrent_file(optional_yield y)
 {
   int op_ret = 0;
   string key = RGW_OBJ_TORRENT;
-  rgw_obj obj(s->bucket->get_key(), s->object->get_name());
 
-  rgw_raw_obj raw_obj;
-  store->getRados()->obj_to_raw(s->bucket->get_info().placement_rule, obj, &raw_obj);
-
-  auto obj_ctx = store->svc()->sysobj->init_obj_ctx();
-  auto sysobj = obj_ctx.get_obj(raw_obj);
-
-  op_ret = sysobj.omap().set(key, bl, y);
+  op_ret = s->object->omap_set_val_by_key(s, key, bl, false, y);
   if (op_ret < 0)
   {
-    ldout(s->cct, 0) << "ERROR: failed to omap_set() op_ret = " << op_ret << dendl;
+    ldpp_dout(s, 0) << "ERROR: failed to omap_set() op_ret = " << op_ret << dendl;
     return op_ret;
   }