]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
common/options: make runtime vs not runtime explicit, not type-dependent
authorSage Weil <sage@redhat.com>
Wed, 19 Dec 2018 00:06:27 +0000 (18:06 -0600)
committerSage Weil <sage@redhat.com>
Fri, 21 Dec 2018 04:11:40 +0000 (22:11 -0600)
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>
src/common/options.h

index 7c58856a50f6d18852bc58665d9d2ace95890164..60b5fd7ac35fd6a63a98aca90390c0d833b0200a 100644 (file)
@@ -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);