From: Sage Weil <sage@newdream.net>
Date: Sat, 27 Feb 2021 20:45:47 +0000 (-0500)
Subject: msg/Messenger: use random nonce if CEPH_USE_RANDOM_NONCE or pid == 1
X-Git-Tag: v16.2.0~119^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6fa4c37041583ccd790a7739abdf327501cd098;p=ceph.git

msg/Messenger: use random nonce if CEPH_USE_RANDOM_NONCE or pid == 1

If we are in a container, then we do not have a unique pid, and need to
use a random nonce.  We normally detect this if our pid is 1, but that
doesn't work when we have a init process--we'll (probably?) have a small
pid (in my tests, the OSDs were getting pid 7).

To be safe, also check for an environment variable set by cephadm.

This avoids problems that arise when we don't have a unique address.

Fixes: https://tracker.ceph.com/issues/49534
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d18f60854e68d2060c1a3841299466f165f6552d)
---

diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc
index 8064a10a0d9b..eab2f2909c80 100644
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -21,7 +21,7 @@ Messenger *Messenger::create_client_messenger(CephContext *cct, std::string lnam
 uint64_t Messenger::get_pid_nonce()
 {
   uint64_t nonce = getpid();
-  if (nonce == 1) {
+  if (nonce == 1 || getenv("CEPH_USE_RANDOM_NONCE")) {
     // we're running in a container; use a random number instead!
     nonce = ceph::util::generate_random_number<uint64_t>();
   }