Merge pull request #34 from humpback/develop-0.0.1

add container name when remove

Author: JamesYYang

backend/internal/node/agentHelper.go

@@ -15,11 +15,11 @@ var (
 	ErrNodeNotExist = errors.New("The node does not exist")
 )
 
-func RemoveNodeContainer(nodeId string, containerId string) error {
+func RemoveNodeContainer(nodeId string, containerId string, containerName string) error {
 	// remove container
 	node := GetNodeInfo(nodeId)
 	if node != nil {
-		url := fmt.Sprintf("http://%s:%d/api/v1/container/%s?force=true", node.IpAddress, node.Port, containerId)
+		url := fmt.Sprintf("http://%s:%d/api/v1/container/%s?force=true&containerName=%s", node.IpAddress, node.Port, containerId, containerName)
 		slog.Info("[Agent Helper] Remove container", "url", url)
 		err := httpx.NewHttpXClient().Delete(url, nil, nil, nil)
 		if err != nil {

backend/scheduler/serviceController.go

@@ -120,7 +120,7 @@ func (sc *ServiceController) HandleContainerChanged() {
 func (sc *ServiceController) HandleContainerRemove() {
 	for containerStatus := range sc.ContainerRemoveChan {
 		if containerStatus.State != types.ContainerStatusRemoved {
-			node.RemoveNodeContainer(containerStatus.NodeId, containerStatus.ContainerId)
+			node.RemoveNodeContainer(containerStatus.NodeId, containerStatus.ContainerId, containerStatus.ContainerName)
 		}
 	}
 }

backend/scheduler/serviceManager.go

@@ -178,7 +178,7 @@ func (sm *ServiceManager) DeleteContainer(nodeId string, containerName string, c
 	if containerId == "" { // 没创建出来的时候没有Id
 		containerId = containerName
 	}
-	node.RemoveNodeContainer(nodeId, containerId)
+	node.RemoveNodeContainer(nodeId, containerId, containerName)
 
 	sm.ServiceInfo.Containers = lo.Filter(sm.ServiceInfo.Containers, func(cs *types.ContainerStatus, index int) bool {
 		return cs.ContainerName != containerName