From 8e930e3d2fc24fe378e16c0feb3d40e1a6189396 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 3 Oct 2015 13:09:04 -0400 Subject: [PATCH] messages/MOSDOp: avoid uninit/undecoded fields in print() Signed-off-by: Sage Weil --- src/messages/MOSDOp.h | 52 ++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h index 345afa129ae00..e25bfc24cc35c 100755 --- a/src/messages/MOSDOp.h +++ b/src/messages/MOSDOp.h @@ -444,37 +444,29 @@ struct ceph_osd_request_head { const char *get_type_name() const { return "osd_op"; } void print(ostream& out) const { - if (!partial_decode_needed) - out << "osd_op(" << get_reqid(); - out << " "; - if (!oloc.nspace.empty()) - out << oloc.nspace << "/"; - out << oid; - -#if 0 - out << " "; - if (may_read()) - out << "r"; - if (may_write()) - out << "w"; -#endif - if (snapid != CEPH_NOSNAP) - out << "@" << snapid; - - if (oloc.key.size()) - out << " " << oloc; - - out << " " << ops; - out << " " << pgid; - if (is_retry_attempt()) - out << " RETRY=" << get_retry_attempt(); - if (reassert_version != eversion_t()) - out << " reassert_version=" << reassert_version; - if (!final_decode_needed) - out << " snapc " << get_snap_seq() << "=" << snaps; - if (!partial_decode_needed) + out << "osd_op("; + if (!partial_decode_needed) { + out << get_reqid() << ' '; + out << pgid; + if (!final_decode_needed) { + out << ' '; + if (!oloc.nspace.empty()) + out << oloc.nspace << "/"; + out << oid + << " " << ops + << " snapc " << get_snap_seq() << "=" << snaps; + if (oloc.key.size()) + out << " " << oloc; + if (is_retry_attempt()) + out << " RETRY=" << get_retry_attempt(); + } else { + out << " (undecoded)"; + } out << " " << ceph_osd_flag_string(get_flags()); - out << " e" << osdmap_epoch; + if (reassert_version != eversion_t()) + out << " reassert_version=" << reassert_version; + out << " e" << osdmap_epoch; + } out << ")"; } }; -- 2.39.5