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

add debug logs to removing host from network

Browse Source
This commit is contained in:
abhishek9686
2024-03-04 12:06:36 +07:00
parent b4f788f557
commit e3b6b060c3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/hosts.go
View File

@@ -452,19 +452,20 @@ func deleteHostFromNetwork(w http.ResponseWriter, r *http.Request) {
if node.IsIngressGateway { if node.IsIngressGateway {
gwClients = logic.GetGwExtclients(node.ID.String(), node.Network) gwClients = logic.GetGwExtclients(node.ID.String(), node.Network)
} }
logger.Log(0, "Hereeeee-----> 4")
logger.Log(1, "deleting node", node.ID.String(), "from host", currHost.Name) logger.Log(1, "deleting node", node.ID.String(), "from host", currHost.Name)
if err := logic.DeleteNode(node, forceDelete); err != nil { if err := logic.DeleteNode(node, forceDelete); err != nil {
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to delete node"), "internal")) logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to delete node"), "internal"))
return return
} }
logger.Log(0, "Hereeeee-----> 4") logger.Log(0, "Hereeeee-----> 5")
go func() { go func() {
mq.PublishMqUpdatesForDeletedNode(*node, true, gwClients) mq.PublishMqUpdatesForDeletedNode(*node, true, gwClients)
if servercfg.IsDNSMode() { if servercfg.IsDNSMode() {
logic.SetDNS() logic.SetDNS()
} }
}() }()
logger.Log(0, "Hereeeee-----> 5") logger.Log(0, "Hereeeee-----> 6")
logger.Log(2, r.Header.Get("user"), fmt.Sprintf("removed host %s from network %s", currHost.Name, network)) logger.Log(2, r.Header.Get("user"), fmt.Sprintf("removed host %s from network %s", currHost.Name, network))
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
} }

10
logic/nodes.go
View File

@@ -189,13 +189,14 @@ func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
func DeleteNode(node *models.Node, purge bool) error { func DeleteNode(node *models.Node, purge bool) error {
alreadyDeleted := node.PendingDelete || node.Action == models.NODE_DELETE alreadyDeleted := node.PendingDelete || node.Action == models.NODE_DELETE
node.Action = models.NODE_DELETE node.Action = models.NODE_DELETE
logger.Log(0, "Hereeeee-----> 4.1")
//delete ext clients if node is ingress gw //delete ext clients if node is ingress gw
if node.IsIngressGateway { if node.IsIngressGateway {
if err := DeleteGatewayExtClients(node.ID.String(), node.Network); err != nil { if err := DeleteGatewayExtClients(node.ID.String(), node.Network); err != nil {
slog.Error("failed to delete ext clients", "nodeid", node.ID.String(), "error", err.Error()) slog.Error("failed to delete ext clients", "nodeid", node.ID.String(), "error", err.Error())
} }
} }
logger.Log(0, "Hereeeee-----> 4.2")
if node.IsRelayed { if node.IsRelayed {
// cleanup node from relayednodes on relay node // cleanup node from relayednodes on relay node
relayNode, err := GetNodeByID(node.RelayedBy) relayNode, err := GetNodeByID(node.RelayedBy)
@@ -211,6 +212,7 @@ func DeleteNode(node *models.Node, purge bool) error {
UpsertNode(&relayNode) UpsertNode(&relayNode)
} }
} }
logger.Log(0, "Hereeeee-----> 4.3")
if node.FailedOverBy != uuid.Nil { if node.FailedOverBy != uuid.Nil {
ResetFailedOverPeer(node) ResetFailedOverPeer(node)
} }
@@ -218,6 +220,7 @@ func DeleteNode(node *models.Node, purge bool) error {
// unset all the relayed nodes // unset all the relayed nodes
SetRelayedNodes(false, node.ID.String(), node.RelayedNodes) SetRelayedNodes(false, node.ID.String(), node.RelayedNodes)
} }
logger.Log(0, "Hereeeee-----> 4.4")
if node.InternetGwID != "" { if node.InternetGwID != "" {
inetNode, err := GetNodeByID(node.InternetGwID) inetNode, err := GetNodeByID(node.InternetGwID)
if err == nil { if err == nil {
@@ -232,10 +235,11 @@ func DeleteNode(node *models.Node, purge bool) error {
UpsertNode(&inetNode) UpsertNode(&inetNode)
} }
} }
logger.Log(0, "Hereeeee-----> 4.5")
if node.IsInternetGateway { if node.IsInternetGateway {
UnsetInternetGw(node) UnsetInternetGw(node)
} }
logger.Log(0, "Hereeeee-----> 4.6")
if !purge && !alreadyDeleted { if !purge && !alreadyDeleted {
newnode := *node newnode := *node
newnode.PendingDelete = true newnode.PendingDelete = true
@@ -256,9 +260,11 @@ func DeleteNode(node *models.Node, purge bool) error {
} }
return err return err
} }
logger.Log(0, "Hereeeee-----> 4.7")
if err := DissasociateNodeFromHost(node, host); err != nil { if err := DissasociateNodeFromHost(node, host); err != nil {
return err return err
} }
logger.Log(0, "Hereeeee-----> 4.8")
return nil return nil
} }