jar包运维功能测试;

添加GPU监控功能(暂时只支持NVIDIA显卡);

jar包运维功能测试;
添加GPU监控功能(暂时只支持NVIDIA显卡);
Liu Haoyu
1 parent 4ba5b210
Showing 8 changed files with 149 additions and 26 deletions
src/main/java/com/objecteye/controller/BackGroundController.java
src/main/java/com/objecteye/controller/OccupationOfBasicResourcesController.java
src/main/java/com/objecteye/mapper/SyBasicResourceHistoryMapper.java
src/main/java/com/objecteye/service/IBackGroundService.java
src/main/java/com/objecteye/service/IOccupationOfBasicResourcesService.java
src/main/java/com/objecteye/service/impl/BackGroundServiceImpl.java
src/main/java/com/objecteye/service/impl/OccupationOfBasicResourcesServiceImpl.java
src/main/resources/com.objecteye.mapper/SyBasicResourceHistoryMapper.xml
@@ -2,12 +2,14 @@ package com.objecteye.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.objecteye.common.CommonResult;
+import com.objecteye.entity.SyBasicResourceHistory;
 import com.objecteye.service.IBackGroundService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import java.util.List;
 import java.util.Map;
 @RestController
@@ -47,4 +49,14 @@ public class BackGroundController {
         }
         return CommonResult.success(resultObj);
     }
+
+    @ApiOperation("获取module对应的内容")
+    @RequestMapping(value = "/getModuleInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public CommonResult getModuleInfo(@RequestBody Map<String, Object> requestMap) {
+        List<SyBasicResourceHistory> syBasicResourceHistories = iBackGroundService.getModuleInfo(requestMap);
+        if (syBasicResourceHistories == null || syBasicResourceHistories.size() == 0) {
+            return CommonResult.success(201, "没有找到符合要求的数据", null);
+        }
+        return CommonResult.success(syBasicResourceHistories);
+    }
 }
@@ -49,4 +49,14 @@ public class OccupationOfBasicResourcesController {
         }
         return CommonResult.success(resultObj);
     }
+
+    @ApiOperation("停止jar包进程")
+    @RequestMapping(value = "/killJarTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public CommonResult killJarTask(@RequestBody Map<String, Object> requestMap) {
+        JSONObject resultObj = iOccupationOfBasicResourcesService.killJarTask(requestMap);
+        if (resultObj.containsKey("error")) {
+            return CommonResult.success(201, resultObj.getString("error"), null);
+        }
+        return CommonResult.success(resultObj);
+    }
 }
@@ -2,6 +2,9 @@ package com.objecteye.mapper;
 import com.objecteye.entity.SyBasicResourceHistory;
+import java.util.List;
+import java.util.Map;
+
 public interface SyBasicResourceHistoryMapper {
     int deleteByPrimaryKey(String id);
@@ -22,4 +25,12 @@ public interface SyBasicResourceHistoryMapper {
      * @return 操作数量
      */
     int deleteLteTime(long time);
+
+    /**
+     * 获取过滤后的指定module的信息
+     *
+     * @param requestMap 请求参数
+     * @return 结果集
+     */
+    List<SyBasicResourceHistory> getModuleInfoQueryByCondition(Map<String, Object> requestMap);
 }
 \ No newline at end of file
 package com.objecteye.service;
 import com.alibaba.fastjson.JSONObject;
+import com.objecteye.entity.SyBasicResourceHistory;
+import java.util.List;
 import java.util.Map;
 public interface IBackGroundService {
@@ -38,4 +40,12 @@ public interface IBackGroundService {
      * @return 返回信息
      */
     JSONObject removeWorkingListener(Map<String, Object> requestMap);
+
+    /**
+     * 获取module对应的内容
+     *
+     * @param requestMap 请求参数
+     * @return 结果集
+     */
+    List<SyBasicResourceHistory> getModuleInfo(Map<String, Object> requestMap);
 }
@@ -3,6 +3,7 @@ package com.objecteye.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import java.util.List;
 import java.util.Map;
 /**
@@ -40,4 +41,12 @@ public interface IOccupationOfBasicResourcesService {
      * @return 进行中的jar包信息
      */
     JSONObject getJpsInfo();
+
+    /**
+     * 执行Linux语句并获取返回值
+     *
+     * @param cmd     linux语句
+     * @param outList 输出参数
+     */
+    void executeLinuxCmd(String cmd, List<String> outList);
 }
@@ -49,6 +49,9 @@ public class BackGroundServiceImpl implements IBackGroundService {
                 case "memory_info":
                     doMemoryInfo(requestMap);
                     break;
+                case "GPU":
+                    doGpuUtilization();
+                    break;
             }
         }
     }
@@ -126,6 +129,17 @@ public class BackGroundServiceImpl implements IBackGroundService {
     }
     /**
+     * 获取module对应的内容
+     *
+     * @param requestMap 请求参数
+     * @return 结果集
+     */
+    @Override
+    public List<SyBasicResourceHistory> getModuleInfo(Map<String, Object> requestMap) {
+        return syBasicResourceHistoryMapper.getModuleInfoQueryByCondition(requestMap);
+    }
+
+    /**
      * cpu信息记录
      *
      * @param requestMap 请求参数
@@ -159,4 +173,35 @@ public class BackGroundServiceImpl implements IBackGroundService {
             syBasicResourceHistoryMapper.insertSelective(syBasicResourceHistory);
         }
     }
+
+    /**
+     * NVIDIA GPU信息记录(多卡就会有多条记录)
+     */
+    @Async("taskExecutor")
+    public void doGpuUtilization() {
+        String cmd = "nvidia-smi -q -d UTILIZATION";
+        List<String> outList = new ArrayList<>();
+        iOccupationOfBasicResourcesService.executeLinuxCmd(cmd, outList);
+        long occurrenceTime = System.currentTimeMillis();
+        if (outList.size() > 0) {
+            boolean nextLevelRecord = false;
+            String lastLine = "";
+            for (String s : outList) {
+                String nowLine = s.trim();
+                if (nextLevelRecord) {
+                    String moduleId = "GPU" + lastLine.split(" ")[1].trim();
+                    String occupancy = nowLine.split(":")[1].replaceAll(" ", "").replaceAll("%", "");
+                    SyBasicResourceHistory syBasicResourceHistory = new SyBasicResourceHistory(UUID.randomUUID().toString(), moduleId,
+                            occurrenceTime, Double.parseDouble(occupancy));
+                    syBasicResourceHistoryMapper.insertSelective(syBasicResourceHistory);
+                }
+                nextLevelRecord = "Utilization".equals(nowLine);
+                if (!nextLevelRecord) {
+                    lastLine = nowLine;
+                }
+            }
+        }
+    }
+
+
 }
@@ -68,12 +68,13 @@ public class OccupationOfBasicResourcesServiceImpl implements IOccupationOfBasic
         String logPath = (String) requestMap.get("logPath");
         String owner = (String) requestMap.getOrDefault("user", "-1");
         if (logPath == null || "".equals(logPath)) {
-            logPath = jarPath.substring(0, jarPath.lastIndexOf("//")) + jarPath.substring(jarPath.lastIndexOf("//")).replaceAll("jar", "log");
+            logPath = jarPath.substring(0, jarPath.lastIndexOf("/")) + jarPath.substring(jarPath.lastIndexOf("/")).replaceAll("jar", "log");
+            log.info("OccupationOfBasicResourcesServiceImpl|deployJarFile|logPath: {}", logPath);
         }
         JSONObject resultObj = new JSONObject();
-        String jarName = jarPath.substring(jarPath.lastIndexOf("//") + 1);
-        if (!jarName.endsWith("\\.jar")) {
+        String jarName = jarPath.substring(jarPath.lastIndexOf("/") + 1);
+        if (!jarName.endsWith(".jar")) {
             resultObj.put("error", "File type error. Please confirm your jar file is right.");
         }
@@ -81,20 +82,21 @@ public class OccupationOfBasicResourcesServiceImpl implements IOccupationOfBasic
         String cmd = "nohup java -jar " + jarPath + " > " + logPath + " 2>&1 &";
         executeLinuxCmd(cmd, outList);
-        String outStr;
         if (outList.size() > 0) {
-            outStr = outList.get(0);
-            String regex = "^[[0-9]*] [0-9]*$";
-            if (outStr.matches(regex)) {
-                resultObj.put("logPath", logPath);
-                String taskId = outStr.split(" ")[1];
-                resultObj.put("taskId", taskId);
+            resultObj.put("error", outList.get(0));
+            return resultObj;
+        }
+
+        outList = new ArrayList<>();
+        String jpsCommand = "jps -l";
+        executeLinuxCmd(jpsCommand, outList);
+        for (String jpsDetail : outList) {
+            String taskId = jpsDetail.split(" ")[0].trim();
+            String command = jpsDetail.split(" ")[1].trim();
+            if (command.equals(jarPath)) {
                 redisTemplate.opsForHash().put(GeneralContent.REDIS_TASK_ID_OWNER, taskId, owner);
-            } else {
-                resultObj.put("error", "linux error: " + outStr);
+                resultObj.put("taskId", taskId);
             }
-        } else {
-            resultObj.put("error", "There is no response from Linux");
         }
         return resultObj;
@@ -171,23 +173,29 @@ public class OccupationOfBasicResourcesServiceImpl implements IOccupationOfBasic
      * @param cmd     linux语句
      * @param outList 输出参数
      */
-    private void executeLinuxCmd(String cmd, List<String> outList) {
+    @Override
+    public void executeLinuxCmd(String cmd, List<String> outList) {
         Runtime run = Runtime.getRuntime();
         try {
             Process process;
-            if (cmd.endsWith("\\.sh")) {
+            if (cmd.endsWith(".sh")) {
                 ProcessBuilder builder = new ProcessBuilder("/bin/chmod", "755", cmd);
                 Process permission = builder.start();
                 permission.waitFor();
                 process = run.exec("sh " + cmd);
             } else {
-                process = run.exec(cmd);
+                String[] cmdList = {"/bin/sh", "-c", cmd};
+                process = run.exec(cmdList);
             }
-            log.debug("OccupationOfBasicResourcesServiceImpl|executeLinuxCmd|cmd: {}", cmd);
+            log.info("OccupationOfBasicResourcesServiceImpl|executeLinuxCmd|cmd: {}", cmd);
             String line;
             BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
             while ((line = stdoutReader.readLine()) != null) {
-                log.debug("OccupationOfBasicResourcesServiceImpl|executeLinuxCmd|line: {}", line);
+                log.info("OccupationOfBasicResourcesServiceImpl|executeLinuxCmd|line: {}", line);
+                if (line.contains("command not found") && line.contains("-bash")) {
+                    log.error(line);
+                    return;
+                }
                 outList.add(line);
             }
             process.waitFor();
@@ -11,21 +11,39 @@
     id, module_id, occurrence_time, occupancy
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
+    select
+    <include refid="Base_Column_List"/>
     from sy_basic_resource_history
     where id = #{id,jdbcType=VARCHAR}
   </select>
+  <select id="getModuleInfoQueryByCondition" resultType="com.objecteye.entity.SyBasicResourceHistory">
+    select * from sy_basic_resource_history a
+    <where>
+      <if test="module != null and '' != module">
+        and a.module_id like '%' || #{module} || '%'
+      </if>
+      <if test="startTime != null"><![CDATA[
+          and a.occurrence_time >= #{startTime,jdbcType=BIGINT}
+        ]]></if>
+      <if test="endTime != null"><![CDATA[
+          and a.occurrence_time <= #{endTime,jdbcType=BIGINT}
+        ]]></if>
+    </where>
+    order by a.occurrence_time asc
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from sy_basic_resource_history
+    delete
+    from sy_basic_resource_history
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteLteTime"><![CDATA[
-    delete from sy_basic_resource_history where occurrence_time <= #{time,jdbcType=BIGINT}
-  ]]></delete>
+    delete
+    from sy_basic_resource_history
+    where occurrence_time <= #{time,jdbcType=BIGINT}
+    ]]></delete>
   <insert id="insert" parameterType="com.objecteye.entity.SyBasicResourceHistory">
-    insert into sy_basic_resource_history (id, module_id, occurrence_time, 
-      occupancy)
+    insert into sy_basic_resource_history (id, module_id, occurrence_time,
+                                           occupancy)
     values (#{id,jdbcType=VARCHAR}, #{moduleId,jdbcType=VARCHAR}, #{occurrenceTime,jdbcType=BIGINT}, 
       #{occupancy,jdbcType=DOUBLE})
   </insert>