add manual exec

Author: JamesYYang

backend/internal/node/agentHelper.go

@@ -50,6 +50,7 @@ func StartNewContainer(nodeId, containerName string, svc *types.Service) error {
 			ServiceName:       svc.ServiceName,
 			ServiceId:         svc.ServiceId,
 			GroupId:           svc.GroupId,
+			ManualExec:        svc.Deployment.ManualExec,
 			ServiceMetaDocker: svc.Meta,
 			ScheduleInfo:      svc.Deployment.Schedule,
 		}

backend/internal/node/nodeCache.go

@@ -57,3 +57,14 @@ func GetNodeInfo(nodeId string) *types.Node {
 
 	return n
 }
+
+func ClearNodeCache(nodeInfo types.NodeSimpleInfo) {
+
+	n, err := db.GetDataById[types.Node](db.BucketNodes, nodeInfo.NodeId)
+	if err == nil && n != nil {
+		nodeCache.Remove(n.NodeId)
+		ip := n.IpAddress
+		cache.Remove(ip)
+	}
+
+}

backend/scheduler/serviceController.go

@@ -84,6 +84,9 @@ func (sc *ServiceController) HandleNodeChanged() {
 
 // 机器上下线时需要通知该机器所属的Group，去检查Group中所有service的状态
 func (sc *ServiceController) HandleNodeStatusChanged(nodeInfo types.NodeSimpleInfo) {
+
+	node.ClearNodeCache(nodeInfo)
+
 	groups, _ := db.GroupsGetByNodeId(nodeInfo.NodeId)
 	for _, g := range groups {
 		for _, serviceManager := range sc.ServiceCtrls {

backend/scheduler/serviceManager.go

@@ -125,13 +125,13 @@ func (sm *ServiceManager) Reconcile() {
 	if sm.ServiceInfo.Status == types.ServiceStatusNotReady {
 
 		// 如果有容器正在启动，就不再继续
-		if sm.ServiceInfo.Deployment.Type != types.DeployTypeSchedule && sm.HasPendingContainer() {
+		if !sm.IsRunningWithSchedule() && sm.HasPendingContainer() {
 			slog.Info("[Service Manager] Wait pending container......", "ServiceId", sm.ServiceInfo.ServiceId)
 			return
 		}
 
 		// 如果有容器失败，就不再继续
-		if sm.ServiceInfo.Deployment.Type != types.DeployTypeSchedule && sm.HasFailedContainer() {
+		if !sm.IsRunningWithSchedule() && sm.HasFailedContainer() {
 			slog.Info("[Service Manager] container failed, stop dispatch......", "ServiceId", sm.ServiceInfo.ServiceId)
 			sm.ServiceInfo.Status = types.ServiceStatusFailed
 			sm.ServiceInfo.Memo = types.MemoCreateContainerFailed
@@ -270,12 +270,11 @@ func (sm *ServiceManager) IsContainerAllReady() bool {
 		version := parseVersionByContainerId(c.ContainerName)
 		if version == sm.ServiceInfo.Version {
 			if isContainerExited(c.State) &&
-				(sm.ServiceInfo.Deployment.Type == types.DeployTypeSchedule ||
-					strings.EqualFold(sm.ServiceInfo.Action, types.ServiceActionStop)) {
+				(sm.IsRunningWithSchedule() || strings.EqualFold(sm.ServiceInfo.Action, types.ServiceActionStop)) {
 				continue
 			}
 
-			if isContainerStarting(c.State) && sm.ServiceInfo.Deployment.Type == types.DeployTypeSchedule {
+			if isContainerStarting(c.State) && sm.IsRunningWithSchedule() {
 				continue
 			}
 
@@ -321,6 +320,10 @@ func (sm *ServiceManager) HasFailedContainer() bool {
 	return false
 }
 
+func (sm *ServiceManager) IsRunningWithSchedule() bool {
+	return sm.ServiceInfo.Deployment.Type == types.DeployTypeSchedule || sm.ServiceInfo.Deployment.ManualExec
+}
+
 func (sm *ServiceManager) TryToDeleteOne() (*types.ContainerStatus, bool) {
 
 	nodeDeployed := make(map[string]bool)
@@ -330,10 +333,8 @@ func (sm *ServiceManager) TryToDeleteOne() (*types.ContainerStatus, bool) {
 		if version != sm.ServiceInfo.Version {
 			return c, true
 		}
-		if isContainerExited(c.State) {
-			if sm.ServiceInfo.Deployment.Type == types.DeployTypeBackground {
-				return c, true
-			}
+		if isContainerExited(c.State) && !sm.IsRunningWithSchedule() {
+			return c, true
 		}
 		if isContainerWarning(c.State) || isContainerRemoved(c.State) {
 			return c, true

backend/types/service.go

@@ -56,6 +56,7 @@ type AgentTask struct {
 	ServiceName   string `json:"serviceName"`
 	ServiceId     string `json:"serviceId"`
 	GroupId       string `json:"groupId"`
+	ManualExec    bool   `json:"manualExec"`
 	*ServiceMetaDocker
 	*ScheduleInfo
 }