8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 03:42:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #29 from ZQKC/master

Browse Source 
fix underReplicatedPartitionCount and add cluster
This commit is contained in:
ZQKC
2020-06-05 17:01:06 +08:00
committed by GitHub
parent 13a90fdd57 b6138afe8b
commit 553fe30662
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/ClusterServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.xiaojukeji.kafka.manager.dao.ClusterDao;
import com.xiaojukeji.kafka.manager.dao.ClusterMetricsDao;
import com.xiaojukeji.kafka.manager.dao.ControllerDao;
import com.xiaojukeji.kafka.manager.service.cache.ClusterMetadataManager;
import com.xiaojukeji.kafka.manager.service.schedule.ScheduleCollectDataManager;
import com.xiaojukeji.kafka.manager.service.service.ClusterService;
import org.apache.zookeeper.ZooKeeper;
import org.slf4j.Logger;
@@ -37,6 +38,9 @@ public class ClusterServiceImpl implements ClusterService {
@Autowired
private ClusterMetadataManager clusterMetadataManager;
@Autowired
private ScheduleCollectDataManager scheduleCollectDataManager;
@Autowired
private ControllerDao controllerDao;
@@ -57,6 +61,7 @@ public class ClusterServiceImpl implements ClusterService {
if (!status) {
return new Result(StatusCode.OPERATION_ERROR, "add zookeeper watch failed");
}
scheduleCollectDataManager.start(clusterDO);
if (clusterDO.getAlarmFlag() == null || clusterDO.getAlarmFlag() <= 0) {
return new Result();

1
web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/BrokerModelConverter.java
View File

@@ -78,6 +78,7 @@ public class BrokerModelConverter {
Double bytesInPerSec = brokerOverallDTO.getBytesInPerSec() / 1024.0 / 1024.0;
brokerOverviewVO.setBytesInPerSec(Math.round(bytesInPerSec * 100) / 100.0);
}
brokerOverviewVO.setUnderReplicatedPartitionCount(brokerOverallDTO.getUnderReplicatedPartitions());
brokerOverviewVO.setLeaderCount(brokerOverallDTO.getLeaderCount());
if (brokerOverallDTO.getPartitionCount() != null && brokerOverallDTO.getUnderReplicatedPartitions() != null) {
brokerOverviewVO.setNotUnderReplicatedPartitionCount(brokerOverallDTO.getPartitionCount() - brokerOverallDTO.getUnderReplicatedPartitions());

15
web/src/main/java/com/xiaojukeji/kafka/manager/web/vo/broker/BrokerOverallVO.java
View File

@@ -30,9 +30,13 @@ public class BrokerOverallVO {
@ApiModelProperty(value = "分区数")
private Integer partitionCount;
@ApiModelProperty(value = "未同步分区数")
@Deprecated
@ApiModelProperty(value = "同步分区数")
private Integer notUnderReplicatedPartitionCount;
@ApiModelProperty(value = "未同步分区数")
private Integer underReplicatedPartitionCount;
@ApiModelProperty(value = "leader数")
private Integer leaderCount;
@@ -103,6 +107,14 @@ public class BrokerOverallVO {
this.notUnderReplicatedPartitionCount = notUnderReplicatedPartitionCount;
}
public Integer getUnderReplicatedPartitionCount() {
return underReplicatedPartitionCount;
}
public void setUnderReplicatedPartitionCount(Integer underReplicatedPartitionCount) {
this.underReplicatedPartitionCount = underReplicatedPartitionCount;
}
public Integer getLeaderCount() {
return leaderCount;
}
@@ -130,6 +142,7 @@ public class BrokerOverallVO {
", bytesInPerSec=" + bytesInPerSec +
", partitionCount=" + partitionCount +
", notUnderReplicatedPartitionCount=" + notUnderReplicatedPartitionCount +
", underReplicatedPartitionCount=" + underReplicatedPartitionCount +
", leaderCount=" + leaderCount +
", regionName='" + regionName + '\'' +
'}';