fix: agent cmd panic

deepflowio · Jul 31, 2024 · c417601 · c417601
1 parent b4b1d3d
commit c417601
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/server/controller/http/router/agent_cmd.go b/server/controller/http/router/agent_cmd.go
@@ -140,6 +140,7 @@ func forwardToServerConnectedByAgent() gin.HandlerFunc {
 		newHost := common.NodeIP
 		if common.NodeIP == agent.CurControllerIP {
 			if manager := service.GetAgentCMDManager(key); manager != nil {
+				log.Infof("agent(key: %s) command context next, node ip(%s)", key)
 				c.Next()
 				return
 			} else {
@@ -148,6 +149,7 @@ func forwardToServerConnectedByAgent() gin.HandlerFunc {
 			}
 		} else if common.NodeIP == agent.ControllerIP {
 			if manager := service.GetAgentCMDManager(key); manager != nil {
+				log.Infof("agent(key: %s) command context next, node ip(%s)", key)
 				c.Next()
 				return
 			} else {
@@ -177,6 +179,7 @@ func forwardToServerConnectedByAgent() gin.HandlerFunc {
 }
 
 func (a *AgentCMD) getCMDAndNamespaceHandler() gin.HandlerFunc {
+	log.Infof("weiqiang getCMDAndNamespaceHandler")
 	return func(c *gin.Context) {
 		orgID, _ := c.Get(common.HEADER_KEY_X_ORG_ID)
 		db, err := mysql.GetDB(orgID.(int))

diff --git a/server/controller/trisolaris/services/grpc/synchronize/remote_execute.go b/server/controller/trisolaris/services/grpc/synchronize/remote_execute.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"runtime"
+	"sync"
 
 	"github.com/deepflowio/deepflow/message/trident"
 	api "github.com/deepflowio/deepflow/message/trident"
@@ -31,7 +32,10 @@ import (
 
 func (e *VTapEvent) RemoteExecute(stream api.Synchronizer_RemoteExecuteServer) error {
 	key := ""
+	var wg sync.WaitGroup
+	wg.Add(1)
 	defer func() {
+		wg.Wait()
 		service.RemoveAllFromCMDManager(key)
 	}()
 
@@ -43,6 +47,7 @@ func (e *VTapEvent) RemoteExecute(stream api.Synchronizer_RemoteExecuteServer) e
 
 	go func() {
 		defer func() {
+			wg.Done()
 			if r := recover(); r != nil {
 				buf := make([]byte, 2048)
 				n := runtime.Stack(buf, false)