]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #53186 from batrick/wip-62611-reef
authorYuri Weinstein <yweinste@redhat.com>
Tue, 24 Oct 2023 15:22:03 +0000 (08:22 -0700)
committerGitHub <noreply@github.com>
Tue, 24 Oct 2023 15:22:03 +0000 (08:22 -0700)
reef: mon/OSDMonitor: do not propose on error in prepare_update

Reviewed-by: Laura Flores <lflores@redhat.com>
1  2 
src/mon/OSDMonitor.cc

index 1feefa36eb67daf09f236fe139452d7cbb36cdbc,9db4832eeb650db7aed32af7d355ce5aa9f0aa60..360bd036bf977888786230a018e59167b066de57
@@@ -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;