feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #2469 from jtlayton/wip-mgr-config

Browse Source 
ceph: add --force to mgr settings
This commit is contained in:
Travis Nielsen authored and GitHub committed 2019-01-09 12:17:02 -07:00
2 parents b5b48e8a76 efefc871d2
commit 7101ef923b
2 files changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/daemon/ceph/client/mgr.go
+5 -2
View File
@@ -20,11 +20,11 @@ func MgrDisableModule(context *clusterd.Context, clusterName, name string) error
// MgrSetAllConfig applies a setting for all mgr daemons
func MgrSetAllConfig(context *clusterd.Context, clusterName, cephVersionName, key, val string) (bool, error) {
return MgrSetConfig(context, clusterName, "", cephVersionName, key, val)
return MgrSetConfig(context, clusterName, "", cephVersionName, key, val, false)
}
// MgrSetConfig applies a setting for a single mgr daemon
func MgrSetConfig(context *clusterd.Context, clusterName, mgrName, cephVersionName, key, val string) (bool, error) {
func MgrSetConfig(context *clusterd.Context, clusterName, mgrName, cephVersionName, key, val string, force bool) (bool, error) {
var getArgs, setArgs []string
mgrID := fmt.Sprintf("mgr.%s", mgrName)
if cephVersionName == cephv1.Luminous || cephVersionName == "" {
@@ -41,6 +41,9 @@ func MgrSetConfig(context *clusterd.Context, clusterName, mgrName, cephVersionNa
} else {
setArgs = append(setArgs, "config", "set", mgrID, key, val)
}
if force && cephv1.VersionAtLeast(cephVersionName, cephv1.Nautilus) {
setArgs = append(setArgs, "--force")
}
}
// Retrieve previous value to monitor changes
pkg/daemon/ceph/mgr/init.go
+1 -1
View File
@@ -86,7 +86,7 @@ func setServerAddr(context *clusterd.Context, config *Config) error {
modules := []string{"prometheus", "dashboard"}
for _, module := range modules {
settingPath := fmt.Sprintf("mgr/%s/server_addr", module)
if _, err := client.MgrSetConfig(context, clusterName, config.Name, config.CephVersionName, settingPath, config.ModuleServerAddr); err != nil {
if _, err := client.MgrSetConfig(context, clusterName, config.Name, config.CephVersionName, settingPath, config.ModuleServerAddr, true); err != nil {
return fmt.Errorf("setting %s server_addr failed. %+v", module, err)
}
}