From: Samuel Just <sjust@redhat.com>
Date: Fri, 18 Mar 2016 18:11:58 +0000 (-0700)
Subject: ObjectStore::Transaction::_update_op: handle OP_TRY_RENAME
X-Git-Tag: v10.1.1~74^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb9e80c94ffe0a2d06b84dc7d844a295ffd75432;p=ceph.git

ObjectStore::Transaction::_update_op: handle OP_TRY_RENAME

Fixes: http://tracker.ceph.com/issues/15205
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index fba6b76fcf18..f0727df27f3c 100644
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -718,6 +718,14 @@ public:
         op->dest_oid = om[op->dest_oid];
         break;
 
+      case OP_TRY_RENAME:
+        assert(op->cid < cm.size());
+        assert(op->oid < om.size());
+        assert(op->dest_oid < om.size());
+        op->cid = cm[op->cid];
+        op->oid = om[op->oid];
+        op->dest_oid = om[op->dest_oid];
+
       case OP_SPLIT_COLLECTION2:
         assert(op->cid < cm.size());
         op->dest_cid = cm[op->dest_oid];