From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 1 Aug 2017 01:51:47 +0000 (-0400)
Subject: mon/OSDMonitor: make setting require-osd-release idempotent
X-Git-Tag: v12.1.3~158^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=886971b58b93b97386b7344631b1f58097e066e6;p=ceph-ci.git

mon/OSDMonitor: make setting require-osd-release idempotent

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index b0c1f107c69..994f184c194 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -8720,6 +8720,11 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = -EINVAL;
       goto reply;
     }
+    if (rel == osdmap.require_osd_release) {
+      // idempotent
+      err = 0;
+      goto reply;
+    }
     if (rel == CEPH_RELEASE_LUMINOUS) {
       if (!HAVE_FEATURE(osdmap.get_up_osd_features(), SERVER_LUMINOUS)) {
 	ss << "not all up OSDs have CEPH_FEATURE_SERVER_LUMINOUS feature";