From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 7 Jan 2016 00:25:49 +0000 (-0800)
Subject: rgw: update datalog also when unlinking object instance
X-Git-Tag: v10.1.0~354^2~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=813c021f6eb90b94a565c8298e9a22a5672859ba;p=ceph.git

rgw: update datalog also when unlinking object instance

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e545a65cf69..758312d070e 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -7225,20 +7225,6 @@ int RGWRados::Object::Delete::delete_obj()
       if (r < 0) {
         return r;
       }
-
-      BucketShard *bs;
-      r = target->get_bucket_shard(&bs);
-      if (r < 0) {
-        ldout(store->ctx(), 5) << "failed to get BucketShard object: r=" << r << dendl;
-        return r;
-      }
-
-      r = store->data_log->add_entry(bs->bucket, bs->shard_id);
-      if (r < 0) {
-        lderr(store->ctx()) << "ERROR: failed writing data log" << dendl;
-        return r;
-      }
-
     } else {
       rgw_bucket_dir_entry dirent;
 
@@ -7254,6 +7240,19 @@ int RGWRados::Object::Delete::delete_obj()
       result.version_id = instance;
     }
 
+    BucketShard *bs;
+    int r = target->get_bucket_shard(&bs);
+    if (r < 0) {
+      ldout(store->ctx(), 5) << "failed to get BucketShard object: r=" << r << dendl;
+      return r;
+    }
+
+    r = store->data_log->add_entry(bs->bucket, bs->shard_id);
+    if (r < 0) {
+      lderr(store->ctx()) << "ERROR: failed writing data log" << dendl;
+      return r;
+    }
+
     return 0;
   }