RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-07 19:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

features: deprecate CEPH_FEATURE_MONCLOCKCHECK

Browse Source 
Signed-off-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2016-03-14 14:58:31 -07:00
parent 599d4eaaaf
commit f3813906bb
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ceph_mon.cc
View File

@ -674,7 +674,7 @@ int main(int argc, const char **argv)
uint64_t supported =
CEPH_FEATURE_UID |
CEPH_FEATURE_NOSRCADDR |
CEPH_FEATURE_MONCLOCKCHECK |
DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK |
CEPH_FEATURE_PGID64 |
CEPH_FEATURE_MSG_AUTH;
msgr->set_default_policy(Messenger::Policy::stateless_server(supported, 0));

10
src/include/ceph_features.h
View File

@ -3,10 +3,16 @@
/*
* feature bits
*
* Feature reuse:
* Features marked DEPRECATED: <release> are advertized, but not checked in
* <release>
* Feature bit values marked as UNUSED are not referenced or checked by any
* versions we could be talking to and can be reused.
*/
#define CEPH_FEATURE_UID (1ULL<<0)
#define CEPH_FEATURE_NOSRCADDR (1ULL<<1)
#define CEPH_FEATURE_MONCLOCKCHECK (1ULL<<2)
#define DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK (1ULL<<2) // DEPRECATED: JEWEL
#define CEPH_FEATURE_FLOCK (1ULL<<3)
#define CEPH_FEATURE_SUBSCRIBE2 (1ULL<<4)
#define CEPH_FEATURE_MONNAMES (1ULL<<5)
@ -111,7 +117,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
#define CEPH_FEATURES_ALL \
(CEPH_FEATURE_UID | \
CEPH_FEATURE_NOSRCADDR | \
CEPH_FEATURE_MONCLOCKCHECK | \
DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK | \
CEPH_FEATURE_FLOCK | \
CEPH_FEATURE_SUBSCRIBE2 | \
CEPH_FEATURE_MONNAMES | \

8
src/messages/MMonPaxos.h
View File

@ -90,10 +90,7 @@ public:
}
void encode_payload(uint64_t features) {
if ((features & CEPH_FEATURE_MONCLOCKCHECK) == 0)
header.version = 0;
else
header.version = HEAD_VERSION;
header.version = HEAD_VERSION;
::encode(epoch, payload);
::encode(op, payload);
::encode(first_committed, payload);
@ -102,8 +99,7 @@ public:
::encode(pn, payload);
::encode(uncommitted_pn, payload);
::encode(lease_timestamp, payload);
if (features & CEPH_FEATURE_MONCLOCKCHECK)
::encode(sent_timestamp, payload);
::encode(sent_timestamp, payload);
::encode(latest_version, payload);
::encode(latest_value, payload);
::encode(values, payload);