From: Samuel Just <sjust@redhat.com>
Date: Thu, 9 Jul 2015 23:11:58 +0000 (-0700)
Subject: ReplicatedPG::finish_promote: do not prefill new_clones
X-Git-Tag: v9.1.0~492^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=57fbc23a47a0f96de416d21e674291dc91673407;p=ceph.git

ReplicatedPG::finish_promote: do not prefill new_clones

new_clones will end up smaller than clones.  The removed clone
will leave a 0 at the end.

Fixes: 12263
Backport: firefly, hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index a443899a572..20259e5d711 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -6628,7 +6628,7 @@ void ReplicatedPG::finish_promote(int r, CopyResults *results,
     OpContext *tctx = repop->ctx;
     tctx->at_version = get_next_version();
     filter_snapc(tctx->new_snapset.snaps);
-    vector<snapid_t> new_clones(tctx->new_snapset.clones.size());
+    vector<snapid_t> new_clones;
     for (vector<snapid_t>::iterator i = tctx->new_snapset.clones.begin();
 	 i != tctx->new_snapset.clones.end();
 	 ++i) {