From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Dec 2018 00:06:27 +0000 (-0600)
Subject: common/options: make runtime vs not runtime explicit, not type-dependent
X-Git-Tag: v14.1.0~532^2~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7cedfcd9b1809eb90a53a03b85111fa80e30006a;p=ceph-ci.git

common/options: make runtime vs not runtime explicit, not type-dependent

For built-in types, we have a kludge that non-string types all appear to
be runtime-updateable.  There's no such distinction for module options.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/options.h b/src/common/options.h
index 7c58856a50f..60b5fd7ac35 100644
--- a/src/common/options.h
+++ b/src/common/options.h
@@ -376,9 +376,10 @@ struct Option {
   {
     return
       (has_flag(FLAG_RUNTIME)
-       || type == TYPE_BOOL || type == TYPE_INT
-       || type == TYPE_UINT || type == TYPE_FLOAT
-       || type == TYPE_SIZE || type == TYPE_SECS)
+       || (!has_flag(FLAG_MGR)
+	   && (type == TYPE_BOOL || type == TYPE_INT
+	       || type == TYPE_UINT || type == TYPE_FLOAT
+	       || type == TYPE_SIZE || type == TYPE_SECS)))
       && !has_flag(FLAG_STARTUP)
       && !has_flag(FLAG_CLUSTER_CREATE)
       && !has_flag(FLAG_CREATE);