From c13447b7300816b4f7cd83dad92b75a19b7e915f Mon Sep 17 00:00:00 2001 From: Vivek Patidar Date: Wed, 10 Jul 2024 15:25:33 +0000 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20fail=20if=20node=20osdconfig=20?= =?UTF-8?q?doesn=E2=80=99t=20exist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vivek Patidar --- cluster/manager/manager.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cluster/manager/manager.go b/cluster/manager/manager.go index 84ab7cedb..c3c56b9ca 100644 --- a/cluster/manager/manager.go +++ b/cluster/manager/manager.go @@ -92,10 +92,10 @@ type ClusterManager struct { clusterDomainManager clusterdomain.ClusterDomainProvider storagePoolProvider api.OpenStoragePoolServer jobProvider job.Provider - scheduleProvider schedule.Provider + scheduleProvider schedule.Provider nodeDrainProvider nodedrain.Provider diagsProvider diags.Provider - defragProvider defrag.Provider + defragProvider defrag.Provider snapshotPrefixes []string selfClusterDomain string // kvdbWatchIndex stores the kvdb index to start the watch @@ -1921,7 +1921,8 @@ func (c *ClusterManager) NodeRemoveDone(nodeID string, result error) error { logrus.Infof("Cluster manager node remove done: node ID %s", nodeID) // Remove osdconfig data from etcd - if err := c.configManager.DeleteNodeConf(nodeID); err != nil { + err := c.configManager.DeleteNodeConf(nodeID) + if err != nil && !strings.Contains(err.Error(), "Key not found") { logrus.Warn("error removing node from osdconfig:", err) return err }