From: Prashant D <pdhange@redhat.com>
Date: Tue, 27 Sep 2022 02:40:45 +0000 (-0400)
Subject: mon: Fix condition to check for ceph version mismatch
X-Git-Tag: v16.2.13~198^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F49988%2Fhead;p=ceph.git

mon: Fix condition to check for ceph version mismatch

MON fails to send MMgrUpdate to the MGR to update
DaemonState with correct metadata information due to
incorrect conditional check. Send MMgrUpdate to MGR
if we observe ceph version mismatch after an election
is over.

Fixes: https://tracker.ceph.com/issues/57678

Signed-off-by: Prashant D <pdhange@redhat.com>
(cherry picked from commit 5dc0d6f7f299cc7af0c243ba67036b075f4b72af)
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index ce7ec37d9cff..dd665d599bd5 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2988,7 +2988,7 @@ void Monitor::update_pending_metadata()
   const std::string current_version = mon_metadata[rank]["ceph_version_short"];
   const std::string pending_version = metadata["ceph_version_short"];
 
-  if (current_version.compare(0, version_size, pending_version) < 0) {
+  if (current_version.compare(0, version_size, pending_version) != 0) {
     mgr_client.update_daemon_metadata("mon", name, metadata);
   }
 }