Merge pull request #149 from ngbdf/develop

Develop
ngbdf · Jan 8, 2021 · 9dccdce · 9dccdce
2 parents 55d4820 + 1724fa5
commit 9dccdce
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...r-dashboard/src/main/java/com/newegg/ec/redis/plugin/rct/report/impl/TTLDataConverse.java b/...r-dashboard/src/main/java/com/newegg/ec/redis/plugin/rct/report/impl/TTLDataConverse.java
@@ -65,7 +65,7 @@ private Map<String, List<ExcelData>> getSheetBodyData(Map<String, ReportData> re
         }
         ExcelData excelData = new ExcelData();
         excelData.setStartColumn(0);
-        List<List<String>> orderSheet =  sheetData.stream().sorted((o1, o2) -> Integer.parseInt(o2.get(2))-Integer.parseInt(o1.get(2))).collect(Collectors.toList());
+        List<List<String>> orderSheet =  sheetData.stream().sorted((o1, o2) -> Integer.parseInt(o2.get(1))-Integer.parseInt(o1.get(1))).collect(Collectors.toList());
         excelData.setTableData(orderSheet);
         List<ExcelData> excelListData = new ArrayList<>();
 

diff --git a/...r-dashboard/src/main/java/com/newegg/ec/redis/plugin/rct/thread/AnalyzerStatusThread.java b/...r-dashboard/src/main/java/com/newegg/ec/redis/plugin/rct/thread/AnalyzerStatusThread.java
@@ -46,17 +46,17 @@ public AnalyzerStatusThread(RdbAnalyzeService rdbAnalyzeService, RestTemplate re
 	@Override
 	public void run() {
 		JSONObject res = rdbAnalyzeService.assignAnalyzeJob(rdbAnalyze);
-
-		if(res.containsKey("status") && !res.getBoolean("status")){
+		Long scheduleID =  res.getLongValue("scheduleID");
+		if(!res.getBoolean("status")){
 			LOG.warn("Assign job fail.");
+			// 执行失败，删除任务
+			AppCache.scheduleDetailMap.remove(rdbAnalyze.getId());
+			if(scheduleID != 0L){
+				rdbAnalyzeService.deleteResult(rdbAnalyze, scheduleID);
+			}
 			return;
 		}
 		this.analyzeInstances = (List<AnalyzeInstance>)res.get("needAnalyzeInstances");
-		if(analyzeInstances == null || analyzeInstances.isEmpty()){
-			LOG.warn("Analyze instances is empty.");
-			return;
-		}
-		Long scheduleID = res.containsKey("scheduleID") ? res.getLongValue("scheduleID") : 0L;
 		scheduleDetails = AppCache.scheduleDetailMap.get(rdbAnalyze.getId());
 		// 获取所有analyzer运行状态
 		while (AppCache.isNeedAnalyzeStastus(rdbAnalyze.getId())) {

diff --git a/...s-manager-dashboard/src/main/java/com/newegg/ec/redis/service/impl/RdbAnalyzeService.java b/...s-manager-dashboard/src/main/java/com/newegg/ec/redis/service/impl/RdbAnalyzeService.java
@@ -94,6 +94,7 @@ public JSONObject allocationRDBAnalyzeJob(RDBAnalyze rdbAnalyze) {
     // 执行RCT任务分发
     public JSONObject assignAnalyzeJob(RDBAnalyze rdbAnalyze){
         JSONObject responseResult = new JSONObject();
+        responseResult.put("status", Boolean.TRUE);
         int[] analyzer = null;
         if (rdbAnalyze.getAnalyzer().contains(",")) {
             String[] str = rdbAnalyze.getAnalyzer().split(",");

diff --git a/redis-manager-dashboard/template/RCT_Report_Template.xlsx b/redis-manager-dashboard/template/RCT_Report_Template.xlsx