diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-07-03 11:18:33 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-08 16:11:50 -0700 |
| commit | 926f723c12428a034545c6c4ff6641e1d5e05d24 (patch) | |
| tree | eb80f30feb25fac4910df70a671004cdd7252b6b | |
| parent | c2b38291e706c9d1d4d337cee3a944f34bf66525 (diff) | |
| download | ceph-926f723c12428a034545c6c4ff6641e1d5e05d24.tar.gz | |
Elector.h: features are 64 bit
Fixes: #5497
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Luis <joao.luis@inktank.com>
(cherry picked from commit 3564e304e3f50642e4d9ff25e529d5fc60629093)
| -rw-r--r-- | src/mon/Elector.cc | 5 | ||||
| -rw-r--r-- | src/mon/Elector.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index 7172510d807..4b1221d2c31 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -152,9 +152,10 @@ void Elector::victory() leader_acked = -1; electing_me = false; - unsigned features = CEPH_FEATURES_ALL; + uint64_t features = CEPH_FEATURES_ALL; set<int> quorum; - for (map<int,unsigned>::iterator p = acked_me.begin(); p != acked_me.end(); ++p) { + for (map<int, uint64_t>::iterator p = acked_me.begin(); p != acked_me.end(); + ++p) { quorum.insert(p->first); features &= p->second; } diff --git a/src/mon/Elector.h b/src/mon/Elector.h index d81eb239763..f1f19b49bec 100644 --- a/src/mon/Elector.h +++ b/src/mon/Elector.h @@ -113,7 +113,7 @@ class Elector { * If we are acked by everyone in the MonMap, we will declare * victory. Also note each peer's feature set. */ - map<int, unsigned> acked_me; + map<int, uint64_t> acked_me; /** * @} */ |