Merge pull request #38 from humpback/develop-0.0.1

Develop 0.0.1

Author: JamesYYang

backend/api/handle/models/service.go

@@ -403,6 +403,9 @@ func (s *ServiceUpdateReqInfo) checkDeployment() error {
 	} else {
 		info.Schedule.Timeout = ""
 	}
+	if len(info.Schedule.Rules) > 0 {
+		info.ManualExec = false
+	}
 	s.DeploymentInfo = info
 	return nil
 }

backend/internal/controller/controller.go

@@ -11,13 +11,6 @@ import (
 	"humpback/types"
 )
 
-type ControllerInter interface {
-}
-
-var Controller ControllerInter = &controller{}
-
-type controller struct{}
-
 func Start(stopCh <-chan struct{}) {
 	go SessionGCInterval(stopCh)
 }

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 {
@@ -129,7 +132,7 @@ func getServiceIdByContainerId(containerName string) (string, string) {
 	serviceId := ""
 	version := ""
 	splits := strings.Split(containerName, "-")
-	if len(splits) == 4 && strings.EqualFold(splits[0], "humpback") {
+	if len(splits) == 4 && strings.EqualFold(splits[0], InstanceNamePrefix) {
 		serviceId = splits[1]
 		version = splits[2]
 	}

backend/scheduler/serviceManager.go

@@ -125,15 +125,16 @@ 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
 			db.ServiceUpdate(sm.ServiceInfo)
 			return
 		}
@@ -269,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
 			}
 
@@ -320,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)
@@ -329,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/scheduler/test/heartbeat.http

@@ -39,7 +39,7 @@ Accept: application/json
   "containers": [
     {
       "containerId": "asecfesac3cabd67af7d1ded36c464d6f326c04e80a4bb99a061faca1347f4b2",
-      "containerName": "humpback-kOC3jh7F-PCvTc-n5PLi",
+      "containerName": "Humpback-kOC3jh7F-PCvTc-n5PLi",
       "state": "Running",
       "status": "Up 2 hours",
       "network": "bridge",

backend/scheduler/util.go

@@ -8,6 +8,10 @@ import (
 	"humpback/types"
 )
 
+const (
+	InstanceNamePrefix = "Humpback"
+)
+
 func parseVersionByContainerId(containerId string) string {
 	parts := strings.Split(containerId, "-")
 	if len(parts) < 4 {
@@ -25,7 +29,7 @@ func ParseServiceIdByContainerId(containerId string) string {
 }
 
 func GenerateContainerName(serviceId, version string) string {
-	return "humpback-" + serviceId + "-" + version + "-" + utils.NewVersionId()
+	return InstanceNamePrefix + "-" + serviceId + "-" + version + "-" + utils.NewVersionId()
 }
 
 func isContainerRunning(status string) bool {

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
 }
@@ -99,6 +100,7 @@ type Deployment struct {
 	Replicas   int              `json:"replicas"`
 	Placements []*PlacementInfo `json:"placements"`
 	Schedule   *ScheduleInfo    `json:"schedule"`
+	ManualExec bool             `json:"manualExec"`
 }
 
 type DeployMode string

front/projects/web/auto-imports.d.ts

@@ -17,11 +17,9 @@ declare global {
   const GetUserRole: typeof import('./src/utils/common')['GetUserRole']
   const IconMdiAccount: typeof import('~icons/mdi/account')['default']
   const IconMdiAlphaCBoxOutline: typeof import('~icons/mdi/alpha-c-box-outline')['default']
-  const IconMdiCheckboxMultipleBlankOutline: typeof import('~icons/mdi/checkbox-multiple-blank-outline')['default']
   const IconMdiCogOutline: typeof import('~icons/mdi/cog-outline')['default']
   const IconMdiCompany: typeof import('~icons/mdi/company')['default']
   const IconMdiLogoutVariant: typeof import('~icons/mdi/logout-variant')['default']
-  const IconMdiPauseBoxOutline: typeof import('~icons/mdi/pause-box-outline')['default']
   const IconMdiPlay: typeof import('~icons/mdi/play')['default']
   const IconMdiRestart: typeof import('~icons/mdi/restart')['default']
   const IconMdiSquare: typeof import('~icons/mdi/square')['default']