From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 9 Sep 2021 21:52:25 +0000 (-0400)
Subject: include: unset std::hex after printing CompatSet
X-Git-Tag: v16.2.7~89^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8ab2864b58daa3a507dc0d29df25300eeab0f9b;p=ceph.git

include: unset std::hex after printing CompatSet

Otherwise you see this in debug output:

    $ ceph fs dump
    ...
    standby_count_wanted    0
    [mds.d{0:4375} state up:standby-replay seq 1 addr [v2:127.0.0.1:6830/2171112379,v1:127.0.0.1:6831/2171112379] compat {c=[1],r=[1],i=[7ff]}]

    Standby daemons:

    [mds.b{ffffffff:110a} state up:standby seq 1 addr [v2:127.0.0.1:1aab/d4c5b653,v1:127.0.0.1:1aad/d4c5b653] compat {c=[1],r=[1],i=[7ff]}]

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 9785a3623190b6491f88181ba6b6a876d3949d5e)
---

diff --git a/src/include/CompatSet.h b/src/include/CompatSet.h
index b63e573d3d5..35c7a77381d 100644
--- a/src/include/CompatSet.h
+++ b/src/include/CompatSet.h
@@ -226,6 +226,7 @@ struct CompatSet {
     o << "{c=[" << std::hex << compat.mask << "]";
     o << ",r=[" << std::hex << ro_compat.mask << "]";
     o << ",i=[" << std::hex << incompat.mask << "]}";
+    o << std::dec;
     return o;
   }