From 1bda01736fe55e55b406331ddc831ae96f4d4776 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Jan 2017 06:57:29 -0600 Subject: [PATCH] osd/osd_types: clean up OSDOp printers Specify which ones get offset~length instead of blacklisting those that don't. Signed-off-by: Sage Weil --- src/osd/osd_types.cc | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 20235bd6c49e..93a8664549c3 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -5322,18 +5322,6 @@ ostream& operator<<(ostream& out, const OSDOp& op) if (ceph_osd_op_type_data(op.op.op)) { // data extent switch (op.op.op) { - case CEPH_OSD_OP_STAT: - case CEPH_OSD_OP_DELETE: - case CEPH_OSD_OP_LIST_WATCHERS: - case CEPH_OSD_OP_LIST_SNAPS: - case CEPH_OSD_OP_UNDIRTY: - case CEPH_OSD_OP_ISDIRTY: - case CEPH_OSD_OP_CACHE_FLUSH: - case CEPH_OSD_OP_CACHE_TRY_FLUSH: - case CEPH_OSD_OP_CACHE_EVICT: - case CEPH_OSD_OP_CACHE_PIN: - case CEPH_OSD_OP_CACHE_UNPIN: - break; case CEPH_OSD_OP_ASSERT_VER: out << " v" << op.op.assert_ver.ver; break; @@ -5342,7 +5330,8 @@ ostream& operator<<(ostream& out, const OSDOp& op) break; case CEPH_OSD_OP_MASKTRUNC: case CEPH_OSD_OP_TRIMTRUNC: - out << " " << op.op.extent.truncate_seq << "@" << (int64_t)op.op.extent.truncate_size; + out << " " << op.op.extent.truncate_seq << "@" + << (int64_t)op.op.extent.truncate_size; break; case CEPH_OSD_OP_ROLLBACK: out << " " << snapid_t(op.op.snap.snapid); @@ -5368,12 +5357,23 @@ ostream& operator<<(ostream& out, const OSDOp& op) out << " object_size " << op.op.alloc_hint.expected_object_size << " write_size " << op.op.alloc_hint.expected_write_size; break; - default: + case CEPH_OSD_OP_READ: + case CEPH_OSD_OP_SPARSE_READ: + case CEPH_OSD_OP_SYNC_READ: + case CEPH_OSD_OP_WRITE: + case CEPH_OSD_OP_WRITEFULL: + case CEPH_OSD_OP_ZERO: + case CEPH_OSD_OP_APPEND: + case CEPH_OSD_OP_MAPEXT: out << " " << op.op.extent.offset << "~" << op.op.extent.length; if (op.op.extent.truncate_seq) - out << " [" << op.op.extent.truncate_seq << "@" << (int64_t)op.op.extent.truncate_size << "]"; + out << " [" << op.op.extent.truncate_seq << "@" + << (int64_t)op.op.extent.truncate_size << "]"; if (op.op.flags) out << " [" << ceph_osd_op_flag_string(op.op.flags) << "]"; + default: + // don't show any arg info + break; } } else if (ceph_osd_op_type_attr(op.op.op)) { // xattr name @@ -5384,7 +5384,8 @@ ostream& operator<<(ostream& out, const OSDOp& op) if (op.op.xattr.value_len) out << " (" << op.op.xattr.value_len << ")"; if (op.op.op == CEPH_OSD_OP_CMPXATTR) - out << " op " << (int)op.op.xattr.cmp_op << " mode " << (int)op.op.xattr.cmp_mode; + out << " op " << (int)op.op.xattr.cmp_op + << " mode " << (int)op.op.xattr.cmp_mode; } else if (ceph_osd_op_type_exec(op.op.op)) { // class.method if (op.op.cls.class_len && op.indata.length()) { -- 2.47.3