RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-15 15:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/PrimaryLogPG: drop odd maintain_ssc hack

Browse Source 
This was added two years ago by b61f3e43f1,
but I can see why it is needed here.  The test case for that
original bug (from a3442cf078) passes
fine.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-09-08 15:24:42 -04:00
parent e4c4942467
commit d5efb8a7be
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osd/PrimaryLogPG.cc
View File

@ -7298,7 +7298,7 @@ int PrimaryLogPG::prepare_transaction(OpContext *ctx)
return result;
}
void PrimaryLogPG::finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc)
void PrimaryLogPG::finish_ctx(OpContext *ctx, int log_op_type)
{
const hobject_t& soid = ctx->obs->oi.soid;
dout(20) << __func__ << " " << soid << " " << ctx
@ -7382,9 +7382,7 @@ void PrimaryLogPG::finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc
// apply new object state.
ctx->obc->obs = ctx->new_obs;
if (soid.is_head() &&
!ctx->obc->obs.exists &&
(!maintain_ssc || ctx->cache_evict)) {
if (soid.is_head() && !ctx->obc->obs.exists) {
ctx->obc->ssc->exists = false;
ctx->obc->ssc->snapset = SnapSet();
} else {
@ -12776,7 +12774,7 @@ bool PrimaryLogPG::agent_maybe_evict(ObjectContextRef& obc, bool after_flush)
if (obc->obs.oi.is_dirty())
--ctx->delta_stats.num_objects_dirty;
assert(r == 0);
finish_ctx(ctx.get(), pg_log_entry_t::DELETE, false);
finish_ctx(ctx.get(), pg_log_entry_t::DELETE);
simple_opc_submit(std::move(ctx));
osd->logger->inc(l_osd_tier_evict);
osd->logger->inc(l_osd_agent_evict);

2
src/osd/PrimaryLogPG.h
View File

@ -1097,7 +1097,7 @@ protected:
const hobject_t& head, const hobject_t& coid,
object_info_t *poi);
void execute_ctx(OpContext *ctx);
void finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc=true);
void finish_ctx(OpContext *ctx, int log_op_type);
void reply_ctx(OpContext *ctx, int err);
void reply_ctx(OpContext *ctx, int err, eversion_t v, version_t uv);
void make_writeable(OpContext *ctx);