提交 eb59a917 编写于 作者: wu-sheng's avatar wu-sheng

Do some rename works. :) And I think 7 ttl days is more common.

上级 f7700d50
...@@ -37,4 +37,4 @@ storage: ...@@ -37,4 +37,4 @@ storage:
cluster_nodes: {ES_ADDRESSES} cluster_nodes: {ES_ADDRESSES}
index_shards_number: 2 index_shards_number: 2
index_replicas_number: 0 index_replicas_number: 0
history_delete_before_days: 3 ttl: 7
...@@ -37,4 +37,4 @@ ui: ...@@ -37,4 +37,4 @@ ui:
# cluster_nodes: localhost:9300 # cluster_nodes: localhost:9300
# index_shards_number: 2 # index_shards_number: 2
# index_replicas_number: 0 # index_replicas_number: 0
# history_delete_before_days: 3 # ttl: 7
\ No newline at end of file \ No newline at end of file
...@@ -22,7 +22,6 @@ import java.util.Calendar; ...@@ -22,7 +22,6 @@ import java.util.Calendar;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.core.module.ModuleManager;
import org.skywalking.apm.collector.core.util.CollectionUtils;
import org.skywalking.apm.collector.storage.StorageModule; import org.skywalking.apm.collector.storage.StorageModule;
import org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO; import org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO;
import org.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO;
...@@ -40,14 +39,14 @@ import org.skywalking.apm.collector.storage.dao.IServiceReferencePersistenceDAO; ...@@ -40,14 +39,14 @@ import org.skywalking.apm.collector.storage.dao.IServiceReferencePersistenceDAO;
/** /**
* @author peng-yongsheng * @author peng-yongsheng
*/ */
public class HistoryDataDeleteTimer { public class DataTTLKeeperTimer {
private final ModuleManager moduleManager; private final ModuleManager moduleManager;
private final StorageModuleEsNamingListener namingListener; private final StorageModuleEsNamingListener namingListener;
private final String selfAddress; private final String selfAddress;
private final int daysBefore; private final int daysBefore;
public HistoryDataDeleteTimer(ModuleManager moduleManager, public DataTTLKeeperTimer(ModuleManager moduleManager,
StorageModuleEsNamingListener namingListener, String selfAddress, int daysBefore) { StorageModuleEsNamingListener namingListener, String selfAddress, int daysBefore) {
this.moduleManager = moduleManager; this.moduleManager = moduleManager;
this.namingListener = namingListener; this.namingListener = namingListener;
...@@ -59,15 +58,6 @@ public class HistoryDataDeleteTimer { ...@@ -59,15 +58,6 @@ public class HistoryDataDeleteTimer {
Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(this::delete, 1, 8, TimeUnit.HOURS); Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(this::delete, 1, 8, TimeUnit.HOURS);
} }
private void tryDelete() {
if (CollectionUtils.isNotEmpty(namingListener.getAddresses())) {
String firstAddress = namingListener.getAddresses().iterator().next();
if (firstAddress.equals(selfAddress)) {
delete();
}
}
}
private void delete() { private void delete() {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis()); calendar.setTimeInMillis(System.currentTimeMillis());
...@@ -82,11 +72,11 @@ public class HistoryDataDeleteTimer { ...@@ -82,11 +72,11 @@ public class HistoryDataDeleteTimer {
calendar.set(Calendar.SECOND, 59); calendar.set(Calendar.SECOND, 59);
long endTimestamp = calendar.getTimeInMillis(); long endTimestamp = calendar.getTimeInMillis();
deleteJVMMetricData(startTimestamp, endTimestamp); deleteJVMRelatedData(startTimestamp, endTimestamp);
deleteTraceMetricData(startTimestamp, endTimestamp); deleteTraceRelatedData(startTimestamp, endTimestamp);
} }
private void deleteJVMMetricData(long startTimestamp, long endTimestamp) { private void deleteJVMRelatedData(long startTimestamp, long endTimestamp) {
ICpuMetricPersistenceDAO cpuMetricPersistenceDAO = moduleManager.find(StorageModule.NAME).getService(ICpuMetricPersistenceDAO.class); ICpuMetricPersistenceDAO cpuMetricPersistenceDAO = moduleManager.find(StorageModule.NAME).getService(ICpuMetricPersistenceDAO.class);
cpuMetricPersistenceDAO.deleteHistory(startTimestamp, endTimestamp); cpuMetricPersistenceDAO.deleteHistory(startTimestamp, endTimestamp);
...@@ -100,7 +90,7 @@ public class HistoryDataDeleteTimer { ...@@ -100,7 +90,7 @@ public class HistoryDataDeleteTimer {
memoryPoolMetricPersistenceDAO.deleteHistory(startTimestamp, endTimestamp); memoryPoolMetricPersistenceDAO.deleteHistory(startTimestamp, endTimestamp);
} }
private void deleteTraceMetricData(long startTimestamp, long endTimestamp) { private void deleteTraceRelatedData(long startTimestamp, long endTimestamp) {
IGlobalTracePersistenceDAO globalTracePersistenceDAO = moduleManager.find(StorageModule.NAME).getService(IGlobalTracePersistenceDAO.class); IGlobalTracePersistenceDAO globalTracePersistenceDAO = moduleManager.find(StorageModule.NAME).getService(IGlobalTracePersistenceDAO.class);
globalTracePersistenceDAO.deleteHistory(startTimestamp, endTimestamp); globalTracePersistenceDAO.deleteHistory(startTimestamp, endTimestamp);
......
...@@ -117,10 +117,10 @@ public class StorageModuleEsProvider extends ModuleProvider { ...@@ -117,10 +117,10 @@ public class StorageModuleEsProvider extends ModuleProvider {
private static final String CLUSTER_NODES = "cluster_nodes"; private static final String CLUSTER_NODES = "cluster_nodes";
private static final String INDEX_SHARDS_NUMBER = "index_shards_number"; private static final String INDEX_SHARDS_NUMBER = "index_shards_number";
private static final String INDEX_REPLICAS_NUMBER = "index_replicas_number"; private static final String INDEX_REPLICAS_NUMBER = "index_replicas_number";
private static final String HISTORY_DELETE_BEFORE_DAYS = "history_delete_before_days"; private static final String TIME_TO_LIVE_OF_DATA = "ttl";
private ElasticSearchClient elasticSearchClient; private ElasticSearchClient elasticSearchClient;
private HistoryDataDeleteTimer deleteTimer; private DataTTLKeeperTimer deleteTimer;
@Override public String name() { @Override public String name() {
return NAME; return NAME;
...@@ -163,8 +163,8 @@ public class StorageModuleEsProvider extends ModuleProvider { ...@@ -163,8 +163,8 @@ public class StorageModuleEsProvider extends ModuleProvider {
ModuleListenerService moduleListenerService = getManager().find(ClusterModule.NAME).getService(ModuleListenerService.class); ModuleListenerService moduleListenerService = getManager().find(ClusterModule.NAME).getService(ModuleListenerService.class);
moduleListenerService.addListener(namingListener); moduleListenerService.addListener(namingListener);
Integer beforeDay = (Integer)config.getOrDefault(HISTORY_DELETE_BEFORE_DAYS, 3); Integer beforeDay = (Integer)config.getOrDefault(TIME_TO_LIVE_OF_DATA, 3);
deleteTimer = new HistoryDataDeleteTimer(getManager(), namingListener, uuId + 0, beforeDay); deleteTimer = new DataTTLKeeperTimer(getManager(), namingListener, uuId + 0, beforeDay);
} }
@Override public void notifyAfterCompleted() throws ServiceNotProvidedException { @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册