From 27eb4c5e93e005c8bb1edaa6e77db8a0ce4e68ea Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 30 Dec 2013 12:52:39 -0800 Subject: [PATCH] ceph_test_rados: improve read debug output Signed-off-by: Sage Weil --- src/test/osd/RadosModel.h | 10 ++++++---- src/test/osd/TestRados.cc | 33 ++++++++++++++------------------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index eeeb5ef15d88d..c24dd23181b64 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -1019,7 +1019,7 @@ public: } else { snap = -1; } - std::cout << num << ": snap " << snap << std::endl; + std::cout << num << ": read oid " << oid << " snap " << snap << std::endl; done = 0; completion = context->rados.aio_create_completion((void *) this, &read_callback, 0); @@ -1714,7 +1714,8 @@ public: } else { snap = -1; } - std::cout << num << ": snap " << snap << std::endl; + std::cout << num << ": is_dirty oid " << oid << " snap " << snap + << std::endl; pair *cb_arg = new pair(this, @@ -1812,7 +1813,8 @@ public: // not being particularly specific here about knowing which // flushes are on the oldest clean snap and which ones are not. can_fail = !blocking || !context->snaps.empty(); - cout << num << ": snap " << snap << std::endl; + cout << num << ": " << (blocking ? "cache_flush" : "cache_try_flush") + << " oid " << oid << " snap " << snap << std::endl; if (snap >= 0) { context->io_ctx.snap_set_read(context->snaps[snap]); @@ -1909,7 +1911,7 @@ public: } else { snap = -1; } - cout << num << ": snap " << snap << std::endl; + cout << num << ": cache_evict oid " << oid << " snap " << snap << std::endl; if (snap >= 0) { context->io_ctx.snap_set_read(context->snaps[snap]); diff --git a/src/test/osd/TestRados.cc b/src/test/osd/TestRados.cc index c555dcdf72cf2..31ec58a57c463 100644 --- a/src/test/osd/TestRados.cc +++ b/src/test/osd/TestRados.cc @@ -88,27 +88,25 @@ private: //cout << "oids not in use " << context.oid_not_in_use.size() << std::endl; assert(context.oid_not_in_use.size()); - cout << m_op << ": "; switch (type) { case TEST_OP_READ: oid = *(rand_choose(context.oid_not_in_use)); - cout << "read oid " << oid << std::endl; return new ReadOp(m_op, &context, oid, m_stats); case TEST_OP_WRITE: oid = *(rand_choose(context.oid_not_in_use)); - cout << "write oid " << oid << " current snap is " + cout << m_op << ": " << "write oid " << oid << " current snap is " << context.current_snap << std::endl; return new WriteOp(m_op, &context, oid, m_stats); case TEST_OP_DELETE: oid = *(rand_choose(context.oid_not_in_use)); - cout << "delete oid " << oid << " current snap is " + cout << m_op << ": " << "delete oid " << oid << " current snap is " << context.current_snap << std::endl; return new DeleteOp(m_op, &context, oid, m_stats); case TEST_OP_SNAP_CREATE: - cout << "snap_create" << std::endl; + cout << m_op << ": " << "snap_create" << std::endl; return new SnapCreateOp(m_op, &context, m_stats); case TEST_OP_SNAP_REMOVE: @@ -119,38 +117,39 @@ private: int snap = rand_choose(context.snaps)->first; if (context.snaps_in_use.lookup(snap)) continue; // in use; try again! - cout << "snap_remove snap " << snap << std::endl; + cout << m_op << ": " << "snap_remove snap " << snap << std::endl; return new SnapRemoveOp(m_op, &context, snap, m_stats); } case TEST_OP_ROLLBACK: { string oid = *(rand_choose(context.oid_not_in_use)); - cout << "rollback oid " << oid << std::endl; + cout << m_op << ": " << "rollback oid " << oid << " current snap is " + << context.current_snap << std::endl; return new RollbackOp(m_op, &context, oid); } case TEST_OP_SETATTR: oid = *(rand_choose(context.oid_not_in_use)); - cout << "setattr oid " << oid + cout << m_op << ": " << "setattr oid " << oid << " current snap is " << context.current_snap << std::endl; return new SetAttrsOp(m_op, &context, oid, m_stats); case TEST_OP_RMATTR: oid = *(rand_choose(context.oid_not_in_use)); - cout << "rmattr oid " << oid + cout << m_op << ": " << "rmattr oid " << oid << " current snap is " << context.current_snap << std::endl; return new RemoveAttrsOp(m_op, &context, oid, m_stats); case TEST_OP_TMAPPUT: oid = *(rand_choose(context.oid_not_in_use)); - cout << "tmapput oid " << oid + cout << m_op << ": " << "tmapput oid " << oid << " current snap is " << context.current_snap << std::endl; return new TmapPutOp(m_op, &context, oid, m_stats); case TEST_OP_WATCH: oid = *(rand_choose(context.oid_not_in_use)); - cout << "watch oid " << oid + cout << m_op << ": " << "watch oid " << oid << " current snap is " << context.current_snap << std::endl; return new WatchOp(m_op, &context, oid, m_stats); @@ -159,54 +158,50 @@ private: do { oid2 = *(rand_choose(context.oid_not_in_use)); } while (oid == oid2); - cout << "copy_from oid " << oid << " from oid " << oid2 + cout << m_op << ": " << "copy_from oid " << oid << " from oid " << oid2 << " current snap is " << context.current_snap << std::endl; return new CopyFromOp(m_op, &context, oid, oid2, m_stats); case TEST_OP_HIT_SET_LIST: { uint32_t hash = rjhash32(rand()); - cout << "hit_set_list " << hash << std::endl; + cout << m_op << ": " << "hit_set_list " << hash << std::endl; return new HitSetListOp(m_op, &context, hash, m_stats); } case TEST_OP_UNDIRTY: { oid = *(rand_choose(context.oid_not_in_use)); - cout << "undirty oid " << oid << std::endl; + cout << m_op << ": " << "undirty oid " << oid << std::endl; return new UndirtyOp(m_op, &context, oid, m_stats); } case TEST_OP_IS_DIRTY: { oid = *(rand_choose(context.oid_not_flushing)); - cout << "is_dirty oid " << oid << std::endl; return new IsDirtyOp(m_op, &context, oid, m_stats); } case TEST_OP_CACHE_FLUSH: { oid = *(rand_choose(context.oid_not_in_use)); - cout << "cache_flush oid " << oid << std::endl; return new CacheFlushOp(m_op, &context, oid, m_stats, true); } case TEST_OP_CACHE_TRY_FLUSH: { oid = *(rand_choose(context.oid_not_in_use)); - cout << "cache_try_flush oid " << oid << std::endl; return new CacheFlushOp(m_op, &context, oid, m_stats, false); } case TEST_OP_CACHE_EVICT: { oid = *(rand_choose(context.oid_not_in_use)); - cout << "cache_evict oid " << oid << std::endl; return new CacheEvictOp(m_op, &context, oid, m_stats); } default: - cerr << "Invalid op type " << type << std::endl; + cerr << m_op << ": Invalid op type " << type << std::endl; assert(0); } } -- 2.39.5