diff options
| author | Sage Weil <sage@inktank.com> | 2013-02-12 14:10:51 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-02-12 14:14:39 -0800 |
| commit | cbf63b633e7a59456f503af487fd4ad2607bbd76 (patch) | |
| tree | 0c4d6f77d604a678974700362ea6a3f9c6e2f22a | |
| parent | 102a519632f1b7a0fede9a3fbd4a5c1df0e732a5 (diff) | |
| download | ceph-cbf63b633e7a59456f503af487fd4ad2607bbd76.tar.gz | |
osd: tolerate unexpected messages on the heartbeat interface
We should note but not crash on unexpected messages. Announce this awesome
new "capability" via a feature bit.
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit afda30aeaae0a65f83c6886658354ad2b57c4c43)
Conflicts:
src/include/ceph_features.h
| -rw-r--r-- | src/include/ceph_features.h | 4 | ||||
| -rw-r--r-- | src/osd/OSD.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index e8a043f5280..034a7b8506e 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -30,6 +30,7 @@ #define CEPH_FEATURE_MSG_AUTH (1<<23) #define CEPH_FEATURE_RECOVERY_RESERVATION (1<<24) #define CEPH_FEATURE_CRUSH_TUNABLES2 (1<<25) +#define CEPH_FEATURE_OSD_HBMSGS (1<<28) /* * Features supported. Should be everything above. @@ -60,7 +61,8 @@ CEPH_FEATURE_BACKFILL_RESERVATION | \ CEPH_FEATURE_MSG_AUTH | \ CEPH_FEATURE_RECOVERY_RESERVATION | \ - CEPH_FEATURE_CRUSH_TUNABLES2) + CEPH_FEATURE_CRUSH_TUNABLES2 | \ + CEPH_FEATURE_OSD_HBMSGS) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 661947b4fdf..181b5c00003 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3236,7 +3236,8 @@ bool OSD::heartbeat_dispatch(Message *m) break; default: - return false; + dout(0) << "dropping unexpected message " << *m << " from " << m->get_source_inst() << dendl; + m->put(); } return true; |