]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: use get_next_version() in finish_promote
authorSage Weil <sage@inktank.com>
Fri, 25 Oct 2013 04:40:09 +0000 (21:40 -0700)
committerSage Weil <sage@inktank.com>
Sat, 14 Dec 2013 00:35:55 +0000 (16:35 -0800)
Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc

index 5e417b360541a1fbb78d2f9148097bcc85e69582..549686a08a64f2e443e18b94e5921d086b5055cd 100644 (file)
@@ -4725,8 +4725,7 @@ void ReplicatedPG::finish_promote(int r, OpRequestRef op,
     tctx->user_at_version = results->user_version;
   }
   info.stats.stats.add(delta, obc->obs.oi.category);
-  tctx->at_version.epoch = get_osdmap()->get_epoch();
-  tctx->at_version.version = pg_log.get_head().version + 1;
+  tctx->at_version.epoch = get_next_version();
 
   tctx->log.push_back(pg_log_entry_t(
          pg_log_entry_t::MODIFY,