From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 24 Oct 2023 15:22:03 +0000 (-0700)
Subject: Merge pull request #53186 from batrick/wip-62611-reef
X-Git-Tag: v18.2.1~67
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1b8c7094daf1fb13d160aed01127795cb5faac78;p=ceph-ci.git

Merge pull request #53186 from batrick/wip-62611-reef

reef: mon/OSDMonitor: do not propose on error in prepare_update

Reviewed-by: Laura Flores <lflores@redhat.com>
---

1b8c7094daf1fb13d160aed01127795cb5faac78
diff --cc src/mon/OSDMonitor.cc
index 1feefa36eb6,9db4832eeb6..360bd036bf9
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@@ -11640,10 -11639,8 +11639,10 @@@ bool OSDMonitor::prepare_command_impl(M
        } else {
  	ss << "not all up OSDs have OSD_PGLOG_HARDLIMIT feature";
  	err = -EPERM;
- 	goto reply;
+ 	goto reply_no_propose;
        }
 +    } else if (key == "noautoscale") {
 +      return prepare_set_flag(op, CEPH_OSDMAP_NOAUTOSCALE);
      } else {
        ss << "unrecognized flag '" << key << "'";
        err = -EINVAL;