Merge pull request #30 from humpback/develop-0.0.1

Develop 0.0.1

Author: JamesYYang

Dockerfile

@@ -12,4 +12,6 @@ COPY ./backend/humpback /workspace/
 
 WORKDIR /workspace
 
+RUN mkdir data
+
 CMD ["./humpback"]

backend/scheduler/nodeController.go

@@ -77,13 +77,14 @@ func (nc *NodeController) CheckNodesCore() {
 	defer nc.Unlock()
 
 	currentTime := time.Now().Unix()
+	statusChanged := false
 	for nodeId, nodeInfo := range nc.NodesInfo {
-
+		statusChanged = false
 		if nodeInfo.Status == types.NodeStatusOnline {
 			if currentTime-nodeInfo.LastHeartbeat > nc.ThresholdInvterval {
 				slog.Info("[Node Controller] Node is not responding.", "nodeId", nodeId, "Last heartbeat", nodeInfo.LastHeartbeat)
 				nodeInfo.Status = types.NodeStatusOffline
-				nc.NodeHeartbeatChan <- *nodeInfo
+				statusChanged = true
 			}
 		}
 
@@ -92,14 +93,18 @@ func (nc *NodeController) CheckNodesCore() {
 				nodeInfo.OnlineThreshold >= nc.CheckThreshold {
 				slog.Info("[Node Controller] need report online node", "nodeId", nodeId)
 				nodeInfo.Status = types.NodeStatusOnline
-				nc.NodeHeartbeatChan <- *nodeInfo
+				statusChanged = true
 			}
 		}
 
 		err := db.NodeUpdateStatus(nodeInfo)
 		if err != nil {
 			slog.Info("[Node Controller] update node status to DB failed", "error", err)
 		}
+
+		if statusChanged {
+			nc.NodeHeartbeatChan <- *nodeInfo
+		}
 	}
 }
 

deploy/deploy.md

@@ -5,7 +5,7 @@ docker run -d \
 --net=host \
 --restart=always \
 -v /etc/localtime:/etc/localtime \
--v /workspace/data/humpback.db:/var/lib/humpback/humpback.db \
+-v /var/lib/humpback/humpback.db:/workspace/data/humpback.db \
 -e LOCATION=dev \
 -e SITE_PORT=8300 \
 -e BACKEND_PORT=8301 \

front/projects/web/src/components/business/v-label/VLabelTableView.vue

@@ -14,24 +14,38 @@ const labelMapping = computed(() => {
 </script>
 
 <template>
-  <div v-for="(item, index) in labelMapping.slice(0, props.line)" :key="index" class="line">
-    <el-text size="small">-- {{ item }}</el-text>
-  </div>
-  <div v-if="labelMapping.length > props.line">
-    <el-popover :width="300" placement="bottom-start" trigger="hover">
-      <template #reference>
-        <el-button link size="small" type="primary"> {{ t("btn.more") }}</el-button>
-      </template>
-      <div v-for="(item, index) in labelMapping.slice(props.line)" :key="index" class="line">
+  <div class="custom-column">
+    <div style="width: 100%">
+      <div v-for="(item, index) in labelMapping.slice(0, props.line)" :key="index" class="line">
         <el-text size="small">-- {{ item }}</el-text>
       </div>
-    </el-popover>
+      <div v-if="labelMapping.length > props.line">
+        <el-popover :width="300" placement="bottom-start" trigger="hover">
+          <template #reference>
+            <el-button link size="small" type="primary"> {{ t("btn.more") }}</el-button>
+          </template>
+          <div v-for="(item, index) in labelMapping.slice(props.line)" :key="index" class="line">
+            <el-text size="small">-- {{ item }}</el-text>
+          </div>
+        </el-popover>
+      </div>
+    </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
+.custom-column {
+  min-height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+
 .line {
   font-size: 12px;
   line-height: 18px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 </style>

front/projects/web/src/views/service-management/node/node-add.vue

@@ -125,7 +125,7 @@ defineExpose({ open })
       <el-table-column :label="t('label.cpu')" fixed="left" width="100">
         <template #default="scope">
           <div v-if="scope.row.cpu">{{ `${scope.row.cpu} ${t("label.core")}` }}</div>
-          <span>--</span>
+          <span v-else>--</span>
         </template>
       </el-table-column>
       <el-table-column :label="t('label.memory')" width="160">

front/projects/web/src/views/service-management/node/nodes.vue

@@ -150,9 +150,7 @@ onMounted(async () => {
     </el-table-column>
     <el-table-column :label="t('label.labels')" min-width="240">
       <template #default="scope">
-        <div class="custom-column">
-          <v-label-table-view :labels="scope.row.labels" :line="4" />
-        </div>
+        <v-label-table-view :labels="scope.row.labels" :line="4" />
       </template>
     </el-table-column>
     <el-table-column :label="t('label.action')" align="center" fixed="right" header-align="center" width="130">
@@ -170,10 +168,6 @@ onMounted(async () => {
 </template>
 
 <style lang="scss" scoped>
-.custom-column {
-  min-height: 60px;
-}
-
 .status {
   display: flex;
   align-items: start;