T handler() {
this.getColonyDOMap();
if (MapUtils.isEmpty(currentColonyDOMap)) {
@@ -399,18 +399,18 @@ public void handlerData(ColonyDO colonyDO) {
public static class QueueCondition {
+ private final ClusterType resultType = ClusterType.CLUSTER;
private Long clusterId;
-
/**
*
*/
private ClusterType clusterType;
-
- private final ClusterType resultType = ClusterType.CLUSTER;
-
private boolean resultId = false;
+ public QueueCondition() {
+ }
+
public QueueCondition clusterId(Long clusterId) {
this.clusterId = clusterId;
return this;
@@ -436,9 +436,6 @@ public QueueCondition runtime() {
return this;
}
- public QueueCondition() {
- }
-
public QueueCondition resultId() {
this.resultId = true;
return this;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/BaseEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/BaseEntity.java
deleted file mode 100644
index 874a48fd..00000000
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/BaseEntity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.eventmesh.dashboard.console.entity;
-
-import org.apache.eventmesh.dashboard.common.enums.ClusterType;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * Base Entity provide some basic fields that every Eventmesh Dashboard Entity would have
- *
- * 12 broker -> 12 queue ， 11 queue ， 1broker 没有 队列。 副本，随机出现在一个 broker
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "BaseEntity", description = "Base entity")
-@Deprecated
-public class BaseEntity implements Serializable {
-
- private static final long serialVersionUID = -2697805837923579585L;
- /**
- * Primary key
- */
- @Schema(name = "id", description = "primary key")
- protected Long id;
-
- /**
- * 集群id，不是 eventmesh集群id。
- */
- protected Long clusterId;
-
- protected ClusterType clusterType;
-
- protected LocalDateTime createTime;
-
- protected LocalDateTime updateTime;
-
- private Integer status;
-}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseRuntimeIdEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseRuntimeIdEntity.java
index 0c89a9d5..dcc2468e 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseRuntimeIdEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseRuntimeIdEntity.java
@@ -25,6 +25,9 @@
@EqualsAndHashCode(callSuper = true)
public class BaseRuntimeIdEntity extends BaseClusterIdEntity {
+ /**
+ * 如果是 runtime 级别的 runtime_id 为零， 比如 topic
+ */
private Long runtimeId;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseSyncEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseSyncEntity.java
index cf12538a..ad72bb33 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseSyncEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/base/BaseSyncEntity.java
@@ -52,6 +52,8 @@ public abstract class BaseSyncEntity extends BaseClusterIdEntity {
private DeployStatusType deployStatusType;
+ private DeployStatusType createMethod;
+
private Long resourcesConfigId;
private Long deployScriptId;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cases/CaseEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cases/CaseEntity.java
index 6b6a233e..1df80f80 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cases/CaseEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cases/CaseEntity.java
@@ -31,7 +31,7 @@ public class CaseEntity extends BaseOrganizationEntity {
private String caseType;
/**
- * cluster , runtime
+ * cluster , runtime
*/
private String objectType;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cases/ResouceEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cases/ResouceEntity.java
index b5d6b3d7..0b4a050a 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cases/ResouceEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cases/ResouceEntity.java
@@ -28,5 +28,4 @@
public class ResouceEntity extends BaseOrganizationEntity {
-
}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/AclEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/AclEntity.java
index b300b6d5..517e4b18 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/AclEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/AclEntity.java
@@ -18,14 +18,16 @@
package org.apache.eventmesh.dashboard.console.entity.cluster;
-import org.apache.eventmesh.dashboard.console.entity.BaseEntity;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseIdEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
+;
+
@Data
@EqualsAndHashCode(callSuper = true, exclude = "status")
-public class AclEntity extends BaseEntity {
+public class AclEntity extends BaseIdEntity {
private static final long serialVersionUID = 6057071983428111947L;
@@ -47,6 +49,5 @@ public class AclEntity extends BaseEntity {
private Integer patternType;
- private Integer status;
}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterAndRelationshipEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterAndRelationshipEntity.java
index c2008142..078f397d 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterAndRelationshipEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterAndRelationshipEntity.java
@@ -36,5 +36,4 @@ public class ClusterAndRelationshipEntity extends ClusterEntity {
private ClusterType relationshipType;
-
}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterRelationshipEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterRelationshipEntity.java
index 2b1baaeb..ea95fa30 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterRelationshipEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterRelationshipEntity.java
@@ -43,4 +43,6 @@ public class ClusterRelationshipEntity extends BaseClusterIdEntity {
private LocalDateTime unRelationshipTime;
+ private String bindType;
+
}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/CollectEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/CollectEntity.java
new file mode 100644
index 00000000..a51c8492
--- /dev/null
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/CollectEntity.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.entity.cluster;
+
+import org.apache.eventmesh.dashboard.common.enums.CollectType;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseClusterIdEntity;
+
+/**
+ *
+ */
+public class CollectEntity extends BaseClusterIdEntity {
+
+
+ private CollectType collectType;
+
+ private Long saveTime;
+
+ private Long collectInterval;
+
+ private Long storageClusterId;
+
+ private Long storageClusterName;
+
+ private Boolean enable;
+
+ private Boolean defaultStorage;
+
+}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/RuntimeEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/RuntimeEntity.java
index 3850d0df..e49cf694 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/RuntimeEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/RuntimeEntity.java
@@ -32,6 +32,8 @@ public class RuntimeEntity extends BaseSyncEntity {
private String host;
+ private String podHost;
+
/**
* 添加的时候只需要 host 与 post eventmesh runtime 是 admin port。通过 runtime admin 获得所有的配置。 meta 需要 host 与 post store host 与 post jmxPort
*/
@@ -52,5 +54,4 @@ public class RuntimeEntity extends BaseSyncEntity {
private String authType;
-
}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/ConfigEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/ConfigEntity.java
index e1c23d2c..43bfb031 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/ConfigEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/ConfigEntity.java
@@ -19,14 +19,14 @@
package org.apache.eventmesh.dashboard.console.entity.function;
import org.apache.eventmesh.dashboard.common.enums.MetadataType;
-import org.apache.eventmesh.dashboard.console.entity.base.BaseClusterIdEntity;
+import org.apache.eventmesh.dashboard.console.entity.base.BaseRuntimeIdEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
-public class ConfigEntity extends BaseClusterIdEntity {
+public class ConfigEntity extends BaseRuntimeIdEntity {
private String businessType;
@@ -46,6 +46,10 @@ public class ConfigEntity extends BaseClusterIdEntity {
private String configValue;
+ private String configValueType;
+
+ private String configValueRange;
+
private String startVersion;
private String eventmeshVersion;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/ConfigGatherEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/ConfigGatherEntity.java
index 3b050285..f1de996c 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/ConfigGatherEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/ConfigGatherEntity.java
@@ -18,9 +18,10 @@
package org.apache.eventmesh.dashboard.console.entity.function;
-import org.apache.eventmesh.dashboard.console.entity.BaseEntity;
-public class ConfigGatherEntity extends BaseEntity {
+import org.apache.eventmesh.dashboard.console.entity.base.BaseIdEntity;
+
+public class ConfigGatherEntity extends BaseIdEntity {
private String name;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/HealthCheckResultEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/HealthCheckResultEntity.java
index 4e22de66..f6b2e447 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/HealthCheckResultEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/HealthCheckResultEntity.java
@@ -37,15 +37,13 @@
@Schema(name = "HealthCheckResultEntity", description = "Health check result entity")
public class HealthCheckResultEntity extends BaseRuntimeIdEntity {
- private static final long serialVersionUID = -7350585209577598040L;
-
private ClusterType clusterType;
private String protocol;
- private String interfaces;
+ private String address;
- private HealthCheckTypeEnum healthCheckTypeEnum;
+ private HealthCheckTypeEnum healthCheckType;
private HealthCheckStatus result;
@@ -56,7 +54,6 @@ public class HealthCheckResultEntity extends BaseRuntimeIdEntity {
private LocalDateTime finishTime;
-
@Schema(description = "Type of Health Check;0:Unknown, 1:Cluster, 2:Runtime, 3:Topic, 4:Storage", defaultValue = "0", allowableValues = {"0",
"1", "2", "3", "4"})
private Integer type;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/MetadataSyncResultEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/MetadataSyncResultEntity.java
index 3baa5660..39f21dd9 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/MetadataSyncResultEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/function/MetadataSyncResultEntity.java
@@ -30,7 +30,6 @@
@EqualsAndHashCode(callSuper = true)
public class MetadataSyncResultEntity extends BaseRuntimeIdEntity {
-
private Long syncId;
private MetadataType metadataType;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/ConsumeOffsetEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/ConsumeOffsetEntity.java
index e7f3dda4..4c2b8418 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/ConsumeOffsetEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/ConsumeOffsetEntity.java
@@ -17,6 +17,11 @@
package org.apache.eventmesh.dashboard.console.entity.message;
+
+import org.apache.eventmesh.dashboard.common.enums.OperationRange.OperationRangeType;
+
+import java.time.LocalDateTime;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -26,14 +31,20 @@ public class ConsumeOffsetEntity extends TopicOffsetEntity {
private Long subscribeId;
- private Long groupId;
+ private OperationRangeType operationRangeType;
- private String groupName;
+ private Long rangeId;
private Long consumeOffset;
+ private Integer queueIndex;
+
private Integer consumeRate;
private Long delayNum;
+ /**
+ *
+ */
+ private LocalDateTime resetTime;
}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/GroupEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/GroupEntity.java
index d4ce306c..dc867507 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/GroupEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/GroupEntity.java
@@ -29,10 +29,8 @@ public class GroupEntity extends BaseRuntimeIdEntity {
private String name;
- private Integer memberCount;
-
- private String members;
-
private Integer type;
+ private String ownType;
+
}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/SubscriptionEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/GroupMemberEntity.java
similarity index 94%
rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/SubscriptionEntity.java
rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/GroupMemberEntity.java
index cfd36cfe..813b43cb 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/SubscriptionEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/GroupMemberEntity.java
@@ -25,7 +25,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
-public class SubscriptionEntity extends BaseRuntimeIdEntity {
+public class GroupMemberEntity extends BaseRuntimeIdEntity {
private String topicName;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/TopicEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/TopicEntity.java
index 699a9700..674cdf64 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/TopicEntity.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/message/TopicEntity.java
@@ -38,7 +38,9 @@ public class TopicEntity extends BaseRuntimeIdEntity {
/**
*
*/
- private Long numQueue;
+ private Integer readQueueNum;
+
+ private Integer writeQueueNum;
/**
* 副本个数
@@ -55,7 +57,7 @@ public class TopicEntity extends BaseRuntimeIdEntity {
*/
private String attributes;
- private String order;
+ private Integer order;
@Schema(description = "time to live in milliseconds, -2 unknown, -1 no limit;", example = "1000")
private Long retentionMs;
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/Health2Service.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/Health2Service.java
index 5c938fcb..d1e55215 100644
--- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/Health2Service.java
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/Health2Service.java
@@ -18,10 +18,12 @@
package org.apache.eventmesh.dashboard.console.function.health;
+import org.apache.eventmesh.dashboard.common.enums.ClusterSyncMetadataEnum;
import org.apache.eventmesh.dashboard.common.enums.ClusterType;
import org.apache.eventmesh.dashboard.common.enums.health.HealthCheckStatus;
import org.apache.eventmesh.dashboard.common.enums.health.HealthCheckTypeEnum;
import org.apache.eventmesh.dashboard.common.model.base.BaseSyncBase;
+import org.apache.eventmesh.dashboard.common.model.metadata.RuntimeMetadata;
import org.apache.eventmesh.dashboard.common.util.ClasspathScanner;
import org.apache.eventmesh.dashboard.console.entity.function.HealthCheckResultEntity;
import org.apache.eventmesh.dashboard.console.function.health.annotation.HealthCheckType;
@@ -31,6 +33,8 @@
import org.apache.eventmesh.dashboard.console.function.health.check.HealthCheckService;
import org.apache.eventmesh.dashboard.console.service.function.HealthDataService;
import org.apache.eventmesh.dashboard.core.function.SDK.SDKManage;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.AbstractCreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.AbstractMultiCreateSDKConfig;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -48,6 +52,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Nullable;
+
import lombok.Data;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@@ -72,47 +78,49 @@ public class Health2Service {
}
}
-
- private static void setClassCache(Class clazz) {
- HealthCheckType checkType = clazz.getAnnotation(HealthCheckType.class);
- if (Objects.isNull(checkType)) {
- return;
- }
- Map> map =
- Objects.equals(checkType.healthType(), HealthCheckTypeEnum.PING) ? HEALTH_PING_CHECK_CLASS_CACHE : HEALTH_TOPIC_CHECK_CLASS_CACHE;
-
- for (ClusterType clusterType : checkType.clusterType()) {
- map.put(clusterType, clazz);
- }
- }
-
-
private final Map checkServiceMap = new ConcurrentHashMap<>();
-
@Deprecated
private final Map clusterHealthCheckServiceMap = new ConcurrentHashMap<>();
-
-
private final ThreadPoolExecutor threadPoolExecutor =
new ThreadPoolExecutor(32, 32, 5, TimeUnit.SECONDS, new LinkedBlockingDeque<>(), new ThreadFactory() {
final AtomicInteger counter = new AtomicInteger(0);
@Override
- public Thread newThread(Runnable r) {
+ public Thread newThread(@Nullable Runnable r) {
return new Thread(r, "health-manager-" + counter.incrementAndGet());
}
});
-
@Setter
private HealthDataService dataService;
+ private LocalDateTime beginTime = LocalDateTime.now();
+
+ private static void setClassCache(Class clazz) {
+ HealthCheckType checkType = clazz.getAnnotation(HealthCheckType.class);
+ if (Objects.isNull(checkType)) {
+ return;
+ }
+ Map> map =
+ Objects.equals(checkType.healthType(), HealthCheckTypeEnum.PING) ? HEALTH_PING_CHECK_CLASS_CACHE : HEALTH_TOPIC_CHECK_CLASS_CACHE;
+ for (ClusterType clusterType : checkType.clusterType()) {
+ log.info("cluster type:{} health class name is {}", clusterType, clazz.getSimpleName());
+ map.put(clusterType, clazz);
+ }
+ }
+ @SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
public void register(BaseSyncBase baseSyncBase) {
try {
- this.createHealthCheckWrapper(baseSyncBase, HealthCheckTypeEnum.PING);
+ HealthCheckWrapper healthCheckWrapper = this.createHealthCheckWrapper(baseSyncBase, HealthCheckTypeEnum.PING);
if (baseSyncBase.getClusterType().isHealthTopic()) {
this.createHealthCheckWrapper(baseSyncBase, HealthCheckTypeEnum.TOPIC);
}
+ if (log.isDebugEnabled()) {
+ AbstractCreateSDKConfig abstractCreateSDKConfig = (AbstractCreateSDKConfig) healthCheckWrapper.getCheckService().getCreateSdkConfig();
+ log.debug("register health check service for {} , metadata type {} , {} ,{}", baseSyncBase.getClusterType(),
+ baseSyncBase.getClass().getSimpleName(), baseSyncBase.getId(),
+ abstractCreateSDKConfig.getUniqueKey());
+ }
} catch (Exception e) {
log.error(e.getMessage(), e);
}
@@ -126,6 +134,11 @@ public void unRegister(BaseSyncBase baseSyncBase) {
}
this.checkServiceMap.remove(getKey(baseSyncBase, HealthCheckTypeEnum.PING));
this.checkServiceMap.remove(getKey(baseSyncBase, HealthCheckTypeEnum.TOPIC));
+ if (log.isDebugEnabled()) {
+ RuntimeMetadata runtimeMetadata = (RuntimeMetadata) baseSyncBase;
+ log.debug("unRegister health check service for {} , {} ,{},{}", baseSyncBase.getClusterType(), baseSyncBase.getId(),
+ runtimeMetadata.getHost(), runtimeMetadata.getPort());
+ }
}
@Deprecated
@@ -134,7 +147,7 @@ public void unRegisterCluster(Long clusterId) {
}
- void createHealthCheckWrapper(BaseSyncBase baseSyncBase, HealthCheckTypeEnum healthCheckTypeEnum) {
+ private HealthCheckWrapper createHealthCheckWrapper(BaseSyncBase baseSyncBase, HealthCheckTypeEnum healthCheckTypeEnum) {
Map> map =
Objects.equals(healthCheckTypeEnum, HealthCheckTypeEnum.PING) ? HEALTH_PING_CHECK_CLASS_CACHE : HEALTH_TOPIC_CHECK_CLASS_CACHE;
Class clazz = map.get(baseSyncBase.getClusterType());
@@ -142,6 +155,7 @@ void createHealthCheckWrapper(BaseSyncBase baseSyncBase, HealthCheckTypeEnum hea
HealthCheckWrapper healthCheckWrapper =
this.createHealthCheckWrapper(baseSyncBase, abstractHealthCheckService, healthCheckTypeEnum);
this.checkServiceMap.put(healthCheckWrapper.getKey(), healthCheckWrapper);
+ return healthCheckWrapper;
}
private HealthCheckWrapper createHealthCheckWrapper(BaseSyncBase baseSyncBase,
@@ -158,15 +172,36 @@ private HealthCheckWrapper createHealthCheckWrapper(BaseSyncBase baseSyncBase,
}
public void executeAll() {
+ try {
+ this.doExecuteAll();
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+
+
+ public void doExecuteAll() {
+ if (checkServiceMap.isEmpty()) {
+ log.info("check service is empty");
+ return;
+ }
long startTime = System.currentTimeMillis();
+ this.beginTime = LocalDateTime.now();
List healthCheckResultEntityList = new ArrayList<>();
CountDownLatch countDownLatch = new CountDownLatch(this.checkServiceMap.size());
this.checkServiceMap.forEach((k, wrapper) -> {
- healthCheckResultEntityList.add(wrapper.createHealthCheckResultEntity());
+
DefaultHealthCheckCallback healthExecutor = new DefaultHealthCheckCallback();
healthExecutor.healthCheckWrapper = wrapper;
healthExecutor.countDownLatch = countDownLatch;
- healthExecutor.healthCheckResultEntity = wrapper.getHealthCheckResultEntity();
+ //
+ if (wrapper.isCap()) {
+ healthExecutor.healthCheckResultEntityMap = wrapper.createHealthCheckResultEntityMap();
+ healthCheckResultEntityList.addAll(healthExecutor.healthCheckResultEntityMap.values());
+ } else {
+ healthCheckResultEntityList.add(wrapper.createHealthCheckResultEntity());
+ healthExecutor.healthCheckResultEntity = wrapper.getHealthCheckResultEntity();
+ }
threadPoolExecutor.execute(() -> {
try {
@@ -183,13 +218,19 @@ public void executeAll() {
}
try {
boolean await = countDownLatch.await(3, TimeUnit.SECONDS);
- log.info("await ia {} downLatch count {}", await, countDownLatch.getCount());
- log.info(" startup cost {} ms", System.currentTimeMillis() - startTime);
+ log.info("await ia {} downLatch count {}, startup cost {} ms", await, countDownLatch.getCount(), System.currentTimeMillis() - startTime);
} catch (Exception e) {
log.error(e.getMessage(), e);
} finally {
try {
- dataService.batchUpdateCheckResultByClusterIdAndTypeAndTypeId(healthCheckResultEntityList);
+ LocalDateTime endTime = LocalDateTime.now();
+ healthCheckResultEntityList.forEach(healthCheckResultEntity -> {
+ if (healthCheckResultEntity.getResult() == HealthCheckStatus.ING) {
+ healthCheckResultEntity.setResult(HealthCheckStatus.TIMEOUT);
+ healthCheckResultEntity.setFinishTime(endTime);
+ }
+ });
+ dataService.batchInsertHealthCheckResult(healthCheckResultEntityList);
} catch (Exception e) {
log.error("batchUpdateCheckResultByClusterIdAndTypeAndTypeId failed", e);
}
@@ -209,6 +250,8 @@ static class DefaultHealthCheckCallback implements HealthCheckCallback {
private HealthCheckResultEntity healthCheckResultEntity;
+ private Map healthCheckResultEntityMap;
+
@Override
public void onSuccess() {
healthCheckResultEntity.setResult(HealthCheckStatus.SUCCESS);
@@ -220,7 +263,6 @@ public void onSuccess() {
public void onFail(Exception e) {
healthCheckResultEntity.setResult(HealthCheckStatus.FAILED);
healthCheckResultEntity.setResultDesc(e.getMessage());
- healthCheckResultEntity.setFinishTime(LocalDateTime.now());
countDownLatch.countDown();
log.error("healthCheckCallback onFail Id: ", e);
}
@@ -233,6 +275,7 @@ class HealthCheckWrapper {
private AbstractHealthCheckService
+ * 1. 两个之间不重提，
+ * 2. 没时间 ，
+ * 3. 不确定，两者时间是否兼容
+ * 4. 没有多少性能损伤
+ */
+ private void createSql() {
+ StringBuilder stringBuilder = new StringBuilder();
+ String sql;
+ sql = this.createSql(MetadataType.CLUSTER, "cluster", "organization_id", "name");
+ stringBuilder.append(sql).append("\r\n union all \r\n");
+ sql = this.createSql(MetadataType.RUNTIME, "runtime", "cluster_id", "name");
+ stringBuilder.append(sql).append("\r\n union all \r\n");
+ sql = this.createSql(MetadataType.RUNTIME, "runtime", "cluster_id", "host");
+ stringBuilder.append(sql).append("\r\n union all \r\n");
+ sql = this.createSql(MetadataType.GROUP, "`group`", "cluster_id", "name");
+ stringBuilder.append(sql).append("\r\n union all \r\n");
+ sql = this.createSql(MetadataType.TOPIC, "topic", "runtime_id", "topicName");
+ stringBuilder.append(sql);
+
+ this.sql = stringBuilder.toString();
+ }
+
+
+ public String createSql(MetadataType metadataType, String table, String superId, String name) {
+ this.selectObjectCount++;
+ String sql = """
+ select '{}' , id , {} , update_time,create_time,is_delete,status from {} where update_time > ?
+ """;
+ return MessageFormatter.arrayFormat(sql, List.of(metadataType, superId, table, name).toArray()).getMessage();
+ }
+
+ public DataMetadataHandler createDataMetadataHandler(MetadataType metadataType) {
+ return new DataMetadataHandler() {
+
+ @Override
+ public List getData() {
+ return List.of();
+ }
+
+ @Override
+ public void handleAll(Collection allData, List addData, List updateData,
+ List deleteData) {
+
+ }
+ };
+ }
+
+ public Long getId(MetadataType metadataType, Long superId, String name) {
+ nameAndId.setMetadataType(metadataType);
+ nameAndId.setSuperId(superId);
+ nameAndId.setName(name);
+ NameAndId nameAndId = this.nameAndIdMap.get(this.nameAndId);
+ return Objects.isNull(nameAndId) ? null : nameAndId.getId();
+ }
+
+
+ @Data
+ private class NameAndId extends BaseClusterIdBase {
+
+ private MetadataType metadataType;
+
+ private Long superId;
+
+ private String name;
+
+ @Override
+ public int hashCode() {
+ return metadataType.hashCode() + superId.hashCode() + name.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof NameAndId nameAndId) {
+ return Objects.equals(metadataType, nameAndId.metadataType)
+ && Objects.equals(superId, nameAndId.superId)
+ && Objects.equals(name, nameAndId.name);
+ }
+ return false;
+ }
+
+ @Override
+ public String nodeUnique() {
+ return "";
+ }
+ }
+
+}
diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/report/collect/active/AbstractCollect.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/report/collect/active/AbstractCollect.java
new file mode 100644
index 00000000..0479cee6
--- /dev/null
+++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/report/collect/active/AbstractCollect.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.function.report.collect.active;
+
+import org.apache.eventmesh.dashboard.common.model.metadata.ClusterMetadata;
+import org.apache.eventmesh.dashboard.common.model.metadata.RuntimeMetadata;
+import org.apache.eventmesh.dashboard.console.function.report.collect.Collect;
+import org.apache.eventmesh.dashboard.console.function.report.model.base.Time;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractClientInfo;
+import org.apache.eventmesh.dashboard.core.function.SDK.SDKTypeEnum;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Setter;
+
+public abstract class AbstractCollect extends AbstractClientInfo implements Collect {
+
+ protected List