Skip to content

Commit

Permalink
PWX-38030: Don’t fail if node osdconfig doesn’t exist (#2456)
Browse files Browse the repository at this point in the history
Signed-off-by: Vivek Patidar <[email protected]>
  • Loading branch information
vivekpx authored Jul 17, 2024
1 parent e4b050e commit e514fde
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions cluster/manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit e514fde

Please sign in to comment.