zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 09:22:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

skip pending delete nodes

Browse Source
This commit is contained in:
Abhishek Kondur
2023-01-19 15:19:05 +05:30
parent 8ad87f5a81
commit 0da99d8437
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logic/hosts.go
View File

@@ -161,7 +161,7 @@ func RemoveHostByID(hostID string) error {
func UpdateHostNetwork(h *models.Host, network string, add bool) (*models.Node, error) { func UpdateHostNetwork(h *models.Host, network string, add bool) (*models.Node, error) {
for _, nodeID := range h.Nodes { for _, nodeID := range h.Nodes {
node, err := GetNodeByID(nodeID) node, err := GetNodeByID(nodeID)
if err != nil { if err != nil || node.PendingDelete {
continue continue
} }
if node.Network == network { if node.Network == network {
@@ -175,9 +175,7 @@ func UpdateHostNetwork(h *models.Host, network string, add bool) (*models.Node,
} }
if !add { if !add {
return nil, errors.New("host not part of the network " + network) return nil, errors.New("host not part of the network " + network)
} } else {
if add {
newNode := models.Node{} newNode := models.Node{}
newNode.Server = servercfg.GetServer() newNode.Server = servercfg.GetServer()
newNode.Network = network newNode.Network = network
@@ -186,8 +184,6 @@ func UpdateHostNetwork(h *models.Host, network string, add bool) (*models.Node,
} }
return &newNode, nil return &newNode, nil
} }
return nil, errors.New("failed to update host networks")
} }
// AssociateNodeToHost - associates and creates a node with a given host // AssociateNodeToHost - associates and creates a node with a given host