diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:17 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:44 +0000 |
commit | 17d6a993fc17d533460c5f40f3908c708e057c18 (patch) | |
tree | 1a3bd93e0ecd74fa02f93a528fe2f87e5314c4b5 /src/mon/MgrMap.h | |
parent | Releasing progress-linux version 18.2.2-0progress7.99u1. (diff) | |
download | ceph-17d6a993fc17d533460c5f40f3908c708e057c18.tar.xz ceph-17d6a993fc17d533460c5f40f3908c708e057c18.zip |
Merging upstream version 18.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/mon/MgrMap.h')
-rw-r--r-- | src/mon/MgrMap.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/mon/MgrMap.h b/src/mon/MgrMap.h index f37ed97fd..b36acef5a 100644 --- a/src/mon/MgrMap.h +++ b/src/mon/MgrMap.h @@ -225,6 +225,10 @@ public: epoch_t epoch = 0; epoch_t last_failure_osd_epoch = 0; + + static const uint64_t FLAG_DOWN = (1<<0); + uint64_t flags = 0; + /// global_id of the ceph-mgr instance selected as a leader uint64_t active_gid = 0; /// server address reported by the leader once it is active @@ -401,7 +405,7 @@ public: ENCODE_FINISH(bl); return; } - ENCODE_START(12, 6, bl); + ENCODE_START(13, 6, bl); encode(epoch, bl); encode(active_addrs, bl, features); encode(active_gid, bl); @@ -425,13 +429,14 @@ public: // backwards compatible messsage for older monitors. encode(clients_addrs, bl, features); encode(clients_names, bl, features); + encode(flags, bl); ENCODE_FINISH(bl); return; } void decode(ceph::buffer::list::const_iterator& p) { - DECODE_START(12, p); + DECODE_START(13, p); decode(epoch, p); decode(active_addrs, p); decode(active_gid, p); @@ -498,11 +503,15 @@ public: } } } + if (struct_v >= 13) { + decode(flags, p); + } DECODE_FINISH(p); } void dump(ceph::Formatter *f) const { f->dump_int("epoch", epoch); + f->dump_int("flags", flags); f->dump_int("active_gid", get_active_gid()); f->dump_string("active_name", get_active_name()); f->dump_object("active_addrs", active_addrs); |