]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Objecter: add ignore overlay flag if got redirect reply 21275/head
authorTim Lin <timlin@qnap.com>
Wed, 7 Mar 2018 08:58:52 +0000 (16:58 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 6 Apr 2018 19:55:38 +0000 (21:55 +0200)
Objecter's target calculation should ignore overlays if client got redirect reply.

Fixes: https://tracker.ceph.com/issues/23296
Signed-off-by: Ting Yi Lin <wooertim@gmail.com>
(cherry picked from commit a9ada31d5f7efa40cb98f1fafbc4dcaa2b53ab36)

src/osdc/Objecter.cc

index 89fc7bcc6326cf7f5894983aa17b4e8b7e5c0c3f..bc1876ef8836f83d67858eb2ebb9f41867d2b989 100644 (file)
@@ -3454,7 +3454,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
     op->tid = 0;
     m->get_redirect().combine_with_locator(op->target.target_oloc,
                                           op->target.target_oid.name);
-    op->target.flags |= CEPH_OSD_FLAG_REDIRECTED;
+    op->target.flags |= (CEPH_OSD_FLAG_REDIRECTED | CEPH_OSD_FLAG_IGNORE_OVERLAY);
     _op_submit(op, sul, NULL);
     m->put();
     return;