From 9654095bdbf7fc9815eace951e98290d2eeb451c Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 2 Mar 2023 11:40:09 +0000 Subject: [PATCH] crimson/osd: always use random number for msgr's nonce Signed-off-by: Radoslaw Zarzynski --- src/crimson/osd/main_config_bootstrap_helpers.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/crimson/osd/main_config_bootstrap_helpers.h b/src/crimson/osd/main_config_bootstrap_helpers.h index 7c6131d172c0..880e8007a02e 100644 --- a/src/crimson/osd/main_config_bootstrap_helpers.h +++ b/src/crimson/osd/main_config_bootstrap_helpers.h @@ -14,6 +14,7 @@ #include "common/ceph_argparse.h" #include "include/expected.hpp" +#include "include/random.h" namespace crimson::osd { @@ -21,14 +22,7 @@ void usage(const char* prog); inline uint64_t get_nonce() { - 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; - } + return ceph::util::generate_random_number(); } seastar::future<> populate_config_from_mon(); -- 2.47.3