Merge pull request #397 from kingdomrushing/dev_v2.5.0

Dev v2.5.0

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/MineTopicSummary.java

@@ -25,6 +25,8 @@ public class MineTopicSummary {
 
     private Integer access;
 
+    private String description;
+
     public Long getLogicalClusterId() {
         return logicalClusterId;
     }
@@ -105,6 +107,14 @@ public class MineTopicSummary {
         this.access = access;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     @Override
     public String toString() {
         return "MineTopicSummary{" +

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/order/OrderVO.java

@@ -27,8 +27,11 @@ public class OrderVO {
     @ApiModelProperty(value = "工单状态, 0:待审批, 1:通过, 2:拒绝, 3:取消")
     private Integer status;
 
-    @ApiModelProperty(value = "申请/审核时间")
+    @ApiModelProperty(value = "申请时间")
-    private Date gmtTime;
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "审核时间")
+    private Date gmtHandle;
 
     public Long getId() {
         return id;
@@ -70,12 +73,20 @@ public class OrderVO {
         this.status = status;
     }
 
-    public Date getGmtTime() {
+    public Date getGmtCreate() {
-        return gmtTime;
+        return gmtCreate;
     }
 
-    public void setGmtTime(Date gmtTime) {
+    public void setGmtCreate(Date gmtCreate) {
-        this.gmtTime = gmtTime;
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtHandle() {
+        return gmtHandle;
+    }
+
+    public void setGmtHandle(Date gmtHandle) {
+        this.gmtHandle = gmtHandle;
     }
 
     public String getApplicant() {
@@ -95,7 +106,7 @@ public class OrderVO {
                 ", applicant='" + applicant + '\'' +
                 ", description='" + description + '\'' +
                 ", status=" + status +
-                ", gmtTime=" + gmtTime +
+                ", gmtTime=" + gmtCreate +
                 '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicMineVO.java

@@ -36,6 +36,9 @@ public class TopicMineVO {
     @ApiModelProperty(value = "状态, 0:无权限, 1:可消费 2:可发送 3:可消费发送 4:可管理")
     private Integer access;
 
+    @ApiModelProperty(value = "备注")
+    private String description;
+
     public Long getClusterId() {
         return clusterId;
     }
@@ -108,6 +111,14 @@ public class TopicMineVO {
         this.access = access;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     @Override
     public String toString() {
         return "TopicMineVO{" +

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/BackoffUtils.java

@@ -0,0 +1,20 @@
+package com.xiaojukeji.kafka.manager.common.utils;
+
+public class BackoffUtils {
+    private BackoffUtils() {
+    }
+
+    public static void backoff(long timeUnitMs) {
+        if (timeUnitMs <= 0) {
+            return;
+        }
+
+        try {
+            Thread.sleep(timeUnitMs);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        } catch (Exception e) {
+            // ignore
+        }
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/jmx/JmxConnectorWrap.java

@@ -1,5 +1,6 @@
 package com.xiaojukeji.kafka.manager.common.utils.jmx;
 
+import com.xiaojukeji.kafka.manager.common.utils.BackoffUtils;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -146,18 +147,16 @@ public class JmxConnectorWrap {
         long now = System.currentTimeMillis();
         while (true) {
             try {
-                if (System.currentTimeMillis() - now > 60000) {
-                    break;
-                }
                 int num = atomicInteger.get();
                 if (num <= 0) {
-                    Thread.sleep(2);
+                    BackoffUtils.backoff(2);
-                    continue;
                 }
-                if (atomicInteger.compareAndSet(num, num - 1)) {
+
+                if (atomicInteger.compareAndSet(num, num - 1) || System.currentTimeMillis() - now > 6000) {
                     break;
                 }
             } catch (Exception e) {
+                // ignore
             }
         }
     }

kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/TopicManagerServiceImpl.java

@@ -210,7 +210,7 @@ public class TopicManagerServiceImpl implements TopicManagerService {
             }
         }
 
-        // 增加流量信息
+        // 增加流量和描述信息
         Map<Long, Map<String, TopicMetrics>> metricMap = KafkaMetricsCache.getAllTopicMetricsFromCache();
         for (MineTopicSummary mineTopicSummary : summaryList) {
             TopicMetrics topicMetrics = getTopicMetricsFromCacheOrJmx(
@@ -219,6 +219,10 @@ public class TopicManagerServiceImpl implements TopicManagerService {
                     metricMap);
             mineTopicSummary.setBytesIn(topicMetrics.getSpecifiedMetrics("BytesInPerSecOneMinuteRate"));
             mineTopicSummary.setBytesOut(topicMetrics.getSpecifiedMetrics("BytesOutPerSecOneMinuteRate"));
+
+            // 增加topic描述信息
+            TopicDO topicDO = topicDao.getByTopicName(mineTopicSummary.getPhysicalClusterId(), mineTopicSummary.getTopicName());
+            mineTopicSummary.setDescription(topicDO.getDescription());
         }
         return summaryList;
     }

kafka-manager-web/pom.xml

@@ -19,7 +19,7 @@
         <springframework.boot.version>2.1.1.RELEASE</springframework.boot.version>
         <spring-version>5.1.3.RELEASE</spring-version>
         <failOnMissingWebXml>false</failOnMissingWebXml>
-        <tomcat.version>8.5.66</tomcat.version>
+        <tomcat.version>8.5.72</tomcat.version>
     </properties>
 
     <dependencies>

kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java

@@ -41,7 +41,8 @@ public class OrderConverter {
         }
         OrderVO orderVO = new OrderVO();
         CopyUtils.copyProperties(orderVO, orderDO);
-        orderVO.setGmtTime(orderDO.getGmtCreate());
+        orderVO.setGmtCreate(orderDO.getGmtCreate());
+        orderVO.setGmtHandle(orderDO.getGmtHandle());
         return orderVO;
     }
 

kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicMineConverter.java

@@ -29,6 +29,7 @@ public class TopicMineConverter {
             vo.setClusterName(data.getLogicalClusterName());
             vo.setBytesIn(data.getBytesIn());
             vo.setBytesOut(data.getBytesOut());
+            vo.setDescription(data.getDescription());
             voList.add(vo);
         }
         return voList;

pom.xml

@@ -26,7 +26,7 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-        <tomcat.version>8.5.66</tomcat.version>
+        <tomcat.version>8.5.72</tomcat.version>
         <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
 
     </properties>