Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
kafka-manager
提交
327e0252
K
kafka-manager
项目概览
DiDi
/
kafka-manager
9 个月 前同步成功
通知
58
Star
6372
Fork
1229
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kafka-manager
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
327e0252
编写于
11月 19, 2021
作者:
石
石臻臻的杂货铺
提交者:
GitHub
11月 19, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #397 from kingdomrushing/dev_v2.5.0
Dev v2.5.0
上级
471bcecf
6b1e944b
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
74 addition
and
17 deletion
+74
-17
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/MineTopicSummary.java
...afka/manager/common/entity/ao/topic/MineTopicSummary.java
+10
-0
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/order/OrderVO.java
.../kafka/manager/common/entity/vo/normal/order/OrderVO.java
+18
-7
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicMineVO.java
...ka/manager/common/entity/vo/normal/topic/TopicMineVO.java
+11
-0
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/BackoffUtils.java
...m/xiaojukeji/kafka/manager/common/utils/BackoffUtils.java
+20
-0
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/jmx/JmxConnectorWrap.java
...keji/kafka/manager/common/utils/jmx/JmxConnectorWrap.java
+5
-6
kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/TopicManagerServiceImpl.java
...manager/service/service/impl/TopicManagerServiceImpl.java
+5
-1
kafka-manager-web/pom.xml
kafka-manager-web/pom.xml
+1
-1
kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java
...aojukeji/kafka/manager/web/converters/OrderConverter.java
+2
-1
kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicMineConverter.java
...keji/kafka/manager/web/converters/TopicMineConverter.java
+1
-0
pom.xml
pom.xml
+1
-1
未找到文件。
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/MineTopicSummary.java
浏览文件 @
327e0252
...
...
@@ -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
浏览文件 @
327e0252
...
...
@@ -27,8 +27,11 @@ public class OrderVO {
@ApiModelProperty
(
value
=
"工单状态, 0:待审批, 1:通过, 2:拒绝, 3:取消"
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"申请/审核时间"
)
private
Date
gmtTime
;
@ApiModelProperty
(
value
=
"申请时间"
)
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
()
{
return
gmtTime
;
public
Date
getGmtCreate
()
{
return
gmtCreate
;
}
public
void
setGmtCreate
(
Date
gmtCreate
)
{
this
.
gmtCreate
=
gmtCreate
;
}
public
Date
getGmtHandle
()
{
return
gmtHandle
;
}
public
void
setGmt
Time
(
Date
gmtTim
e
)
{
this
.
gmt
Time
=
gmtTim
e
;
public
void
setGmt
Handle
(
Date
gmtHandl
e
)
{
this
.
gmt
Handle
=
gmtHandl
e
;
}
public
String
getApplicant
()
{
...
...
@@ -95,7 +106,7 @@ public class OrderVO {
", applicant='"
+
applicant
+
'\''
+
", description='"
+
description
+
'\''
+
", status="
+
status
+
", gmtTime="
+
gmt
Tim
e
+
", gmtTime="
+
gmt
Creat
e
+
'}'
;
}
}
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicMineVO.java
浏览文件 @
327e0252
...
...
@@ -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 → 100644
浏览文件 @
327e0252
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
浏览文件 @
327e0252
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
);
continue
;
BackoffUtils
.
backoff
(
2
);
}
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
浏览文件 @
327e0252
...
...
@@ -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
浏览文件 @
327e0252
...
...
@@ -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
浏览文件 @
327e0252
...
...
@@ -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
浏览文件 @
327e0252
...
...
@@ -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
浏览文件 @
327e0252
...
...
@@ -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>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录