From ceb76bad9fdc7cd1268041921443f1f841c61b3c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 17 Mar 2011 11:36:54 -0700 Subject: [PATCH] msgr: temp hack to keep nonce unique Temp hack for: #877 Signed-off-by: Sage Weil --- src/msg/SimpleMessenger.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 6f746d444b841..0041d8c484805 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -2418,8 +2418,12 @@ int SimpleMessenger::start(bool nodaemon) return 0; } - if (!did_bind) - ms_addr.nonce = getpid(); + if (!did_bind) { + // NOTE: this is a racy temp fix. it's fixed for real in v0.26 + static uint64_t instance = 0; + ms_addr.nonce = (uint64_t)getpid() + (instance * 1000000ull); + instance++; + } dout(1) << "messenger.start" << dendl; started = true; -- 2.39.5