]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: consolidate encoding snaps into pg log code in finish_ctx 5631/head
authorZhiqiang Wang <zhiqiang.wang@intel.com>
Fri, 21 Aug 2015 08:08:46 +0000 (16:08 +0800)
committerZhiqiang Wang <zhiqiang.wang@intel.com>
Fri, 21 Aug 2015 08:08:46 +0000 (16:08 +0800)
'MODIFY', 'PROMOTE' and 'CLEAN' are sharing the same encoding snaps
code.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
src/osd/ReplicatedPG.cc

index 5a0eda2cc384ccd10e9db2d8bc56587f8dd60d16..34358ddd0225a6120f13afd20143468407aad996 100644 (file)
@@ -6132,15 +6132,9 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc
                                    ctx->user_at_version, ctx->reqid,
                                    ctx->mtime));
   if (soid.snap < CEPH_NOSNAP) {
-    set<snapid_t> _snaps(ctx->new_obs.oi.snaps.begin(),
-                        ctx->new_obs.oi.snaps.end());
     switch (log_op_type) {
     case pg_log_entry_t::MODIFY:
     case pg_log_entry_t::PROMOTE:
-      dout(20) << __func__ << " encoding snaps " << ctx->new_obs.oi.snaps
-              << dendl;
-      ::encode(ctx->new_obs.oi.snaps, ctx->log.back().snaps);
-      break;
     case pg_log_entry_t::CLEAN:
       dout(20) << __func__ << " encoding snaps " << ctx->new_obs.oi.snaps
               << dendl;