From b7c549db3e851f20d4db863274e03b234b0bc934 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 10 Jul 2013 18:37:14 -0700 Subject: [PATCH] msgr: add 'ms die on old message' to help catch reconnect seq issues Signed-off-by: Sage Weil --- src/common/config_opts.h | 1 + src/msg/Pipe.cc | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 016c08204c491..a959b4db40144 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -108,6 +108,7 @@ OPTION(ms_max_backoff, OPT_DOUBLE, 15.0) OPTION(ms_nocrc, OPT_BOOL, false) OPTION(ms_die_on_bad_msg, OPT_BOOL, false) OPTION(ms_die_on_unhandled_msg, OPT_BOOL, false) +OPTION(ms_die_on_old_message, OPT_BOOL, false) // assert if we get a dup incoming message and shouldn't have (may be triggered by pre-541cd3c64be0dfa04e8a2df39422e0eb9541a428 code) OPTION(ms_dispatch_throttle_bytes, OPT_U64, 100 << 20) OPTION(ms_bind_ipv6, OPT_BOOL, false) OPTION(ms_bind_port_min, OPT_INT, 6800) diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc index 884f01d0c1b4d..db5f709dddab9 100644 --- a/src/msg/Pipe.cc +++ b/src/msg/Pipe.cc @@ -1378,6 +1378,9 @@ void Pipe::reader() << ", discarding" << dendl; msgr->dispatch_throttle_release(m->get_dispatch_throttle_size()); m->put(); + if (connection_state->has_feature(CEPH_FEATURE_RECONNECT_SEQ) && + msgr->cct->_conf->ms_die_on_old_message) + assert(0 == "old msgs despite reconnect_seq feature"); continue; } -- 2.39.5