diff --git a/collector/src/main/java/com/usthe/collector/dispatch/CommonDispatcher.java b/collector/src/main/java/com/usthe/collector/dispatch/CommonDispatcher.java index cc2878f..835c934 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/CommonDispatcher.java +++ b/collector/src/main/java/com/usthe/collector/dispatch/CommonDispatcher.java @@ -32,7 +32,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc /** * 指标组采集任务超时时间值 */ - private static final long DURATION_TIME = 120_000L; + private static final long DURATION_TIME = 240_000L; /** * 指标组采集任务优先级队列 */ @@ -94,7 +94,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc Thread.currentThread().setName("metrics-task-monitor"); while (!Thread.currentThread().isInterrupted()) { try { - // 检测每个指标组采集单元是否超时2分钟,超时则丢弃并返回异常 + // 检测每个指标组采集单元是否超时4分钟,超时则丢弃并返回异常 long deadline = System.currentTimeMillis() - DURATION_TIME; for (Map.Entry entry : metricsTimeoutMonitorMap.entrySet()) { MetricsTime metricsTime = entry.getValue(); @@ -165,7 +165,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc metricsSet.forEach(metricItem -> { MetricsCollect metricsCollect = new MetricsCollect(metricItem, timeout, this); jobRequestQueue.addJob(metricsCollect); - metricsTimeoutMonitorMap.put(job.getId() + metrics.getName(), + metricsTimeoutMonitorMap.put(job.getId() + "-" + metrics.getName(), new MetricsTime(System.currentTimeMillis(), metrics, timeout)); }); } else { @@ -185,7 +185,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc metricsSet.forEach(metricItem -> { MetricsCollect metricsCollect = new MetricsCollect(metricItem, timeout, this); jobRequestQueue.addJob(metricsCollect); - metricsTimeoutMonitorMap.put(job.getId() + metrics.getName(), + metricsTimeoutMonitorMap.put(job.getId() + "-" + metrics.getName(), new MetricsTime(System.currentTimeMillis(), metrics, timeout)); }); } else { diff --git a/common/src/main/java/com/usthe/common/entity/job/Job.java b/common/src/main/java/com/usthe/common/entity/job/Job.java index f8a4f5e..fb24870 100644 --- a/common/src/main/java/com/usthe/common/entity/job/Job.java +++ b/common/src/main/java/com/usthe/common/entity/job/Job.java @@ -166,7 +166,7 @@ public class Job { return null; } if (!metricsSet.remove(metrics)) { - log.error("Job {} appId {} app {} metrics {} remove empty error in priorMetrics.", + log.warn("Job {} appId {} app {} metrics {} remove empty error in priorMetrics.", id, monitorId, app, metrics.getName()); } if (metricsSet.isEmpty()) { diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/TdEngineDataStorage.java b/warehouse/src/main/java/com/usthe/warehouse/store/TdEngineDataStorage.java index dc9ad56..002d553 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/TdEngineDataStorage.java +++ b/warehouse/src/main/java/com/usthe/warehouse/store/TdEngineDataStorage.java @@ -183,6 +183,7 @@ public class TdEngineDataStorage implements DisposableBean { String createTableSql = String.format(CREATE_SUPER_TABLE_SQL, superTable, fieldSqlBuilder); try { assert statement != null; + log.info("[tdengine-data]: create {} use sql: {}.", superTable, createTableSql); statement.execute(createTableSql); statement.execute(insertDataSql); } catch (Exception createTableException) {