From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 2 Mar 2023 11:40:09 +0000 (+0000)
Subject: crimson/osd: always use random number for msgr's nonce
X-Git-Tag: v18.2.5~435^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=481fd8915ab20197e55a8eb81c537e5026ed2fa5;p=ceph.git

crimson/osd: always use random number for msgr's nonce

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 9654095bdbf7fc9815eace951e98290d2eeb451c)
---

diff --git a/src/crimson/osd/main_config_bootstrap_helpers.h b/src/crimson/osd/main_config_bootstrap_helpers.h
index 7c6131d172c..880e8007a02 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<uint64_t>{}(rng);
-  } else {
-    return pid;
-  }
+  return ceph::util::generate_random_number<uint64_t>();
 }
 
 seastar::future<> populate_config_from_mon();