Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PWX-38030: Don’t fail if node osdconfig doesn’t exist #2456

Merged
merged 1 commit into from
Jul 17, 2024
Merged

PWX-38030: Don’t fail if node osdconfig doesn’t exist #2456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cluster/manager/manager.go
View file
Open in desktop
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
Loading