From d0a5dd7e363bd3c6bc799a65358e702a3c4a888b Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 27 Jul 2021 16:24:55 +0000 Subject: [PATCH] crimson/osd: fix misdirecting msgs when an OSD flips at Sepia. For description please refer to: * https://gist.github.com/rzarzynski/6cbc20fb28d7ac096ecc4b68500454bf#gistcomment-3830762, * https://gist.github.com/rzarzynski/6cbc20fb28d7ac096ecc4b68500454bf#gistcomment-3830939. Signed-off-by: Radoslaw Zarzynski --- src/crimson/osd/main.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index 4b47d89b15107..2c6105af8408d 100644 --- a/src/crimson/osd/main.cc +++ b/src/crimson/osd/main.cc @@ -114,13 +114,13 @@ seastar::future<> make_keyring() uint64_t get_nonce() { - if (auto pid = getpid(); pid != 1) { - return pid; - } else { + if (auto pid = getpid(); pid == 1 || std::getenv("CEPH_USE_RANDOM_NONCE")) { // we're running in a container; use a random number instead! std::random_device rd; std::default_random_engine rng{rd()}; return std::uniform_int_distribution{}(rng); + } else { + return pid; } } -- 2.39.5