RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 08:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ReplicatedPG: handle FLAG_OMAP on promote and copyfrom

Browse Source 
Fixes: #7967
Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2014-04-03 10:39:39 -07:00
parent 27e353ccc1
commit 9894a55d3b
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/osd/ReplicatedPG.cc
View File

@ -5472,6 +5472,9 @@ void ReplicatedPG::process_copy_chunk(hobject_t oid, ceph_tid_t tid, int r)
return;
}
if (cop->omap.size())
cop->results.has_omap = true;
if (r >= 0 && pool.info.require_rollback() && cop->omap.size()) {
r = -EOPNOTSUPP;
}
@ -5668,6 +5671,14 @@ void ReplicatedPG::finish_copyfrom(OpContext *ctx)
--ctx->delta_stats.num_whiteouts;
}
if (cb->results->has_omap) {
dout(10) << __func__ << " setting omap flag on " << obs.oi.soid << dendl;
obs.oi.set_flag(object_info_t::FLAG_OMAP);
} else {
dout(10) << __func__ << " clearing omap flag on " << obs.oi.soid << dendl;
obs.oi.clear_flag(object_info_t::FLAG_OMAP);
}
interval_set<uint64_t> ch;
if (obs.oi.size > 0)
ch.insert(0, obs.oi.size);
@ -5744,6 +5755,11 @@ void ReplicatedPG::finish_promote(int r, OpRequestRef op,
dout(20) << __func__ << " creating whiteout on " << soid << dendl;
osd->logger->inc(l_osd_tier_whiteout);
} else {
if (results->has_omap) {
dout(10) << __func__ << " setting omap flag on " << soid << dendl;
tctx->new_obs.oi.set_flag(object_info_t::FLAG_OMAP);
}
tctx->op_t->append(results->final_tx);
delete results->final_tx;
results->final_tx = NULL;
@ -10861,6 +10877,8 @@ bool ReplicatedPG::agent_maybe_evict(ObjectContextRef& obc)
ctx->at_version = get_next_version();
assert(ctx->new_obs.exists);
int r = _delete_oid(ctx, true);
if (obc->obs.oi.is_omap())
ctx->delta_stats.num_objects_omap--;
assert(r == 0);
finish_ctx(ctx, pg_log_entry_t::DELETE);
simple_repop_submit(repop);

4
src/osd/ReplicatedPG.h
View File

@ -123,9 +123,11 @@ public:
librados::snap_set_t snapset; ///< src snapset (if head)
bool mirror_snapset;
map<string, bufferlist> attrs; ///< src user attrs
bool has_omap;
CopyResults() : object_size(0), started_temp_obj(false),
final_tx(NULL), user_version(0),
should_requeue(false), mirror_snapset(false) {}
should_requeue(false), mirror_snapset(false),
has_omap(false) {}
};
struct CopyOp {