osd: remove existing object before rename is called

In redirected manifest case, the object exists in the upper tier.
So, to avoid a conflict when rename() is called, remove existing
object first.

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsumg.com>

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 82c9c420aa6825f68d07a27d29c9af583b3e2637..82afb620305fb7e688bcd23a098fdbaa1f43b572 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -9426,6 +9426,13 @@ void PrimaryLogPG::process_copy_chunk(hobject_t oid, ceph_tid_t tid, int r)
       } else {
        // finish writing to temp object, then move into place
        dout(20) << "fill_in_final_tx: writing to temp object" << dendl;
+       if (obs.oi.has_manifest() && obs.oi.manifest.is_redirect() && obs.exists) {
+         /* In redirect manifest case, the object exists in the upper tier.
+          * So, to avoid a conflict when rename() is called, remove existing
+          * object first
+          */
+         t->remove(obs.oi.soid);
+       }
        _write_copy_chunk(cop, t);
        t->rename(obs.oi.soid, cop->results.temp_oid);
       }