From d56ad5ec5df1fc739ad33b97dc85e8835dbda63b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E5=8B=87=E5=8D=87=20pengys?= <8082209@qq.com> Date: Sat, 9 Jun 2018 17:34:06 +0800 Subject: [PATCH] #1232 (#1333) RemoteDataMappingIdNotFoundException caused by remote entity did not registered. Some remote entities in alarm module did not registered into remote module. --- .../alarm/provider/AnalysisAlarmModuleProvider.java | 6 ++++++ .../table/alarm/ApplicationReferenceAlarm.java | 13 +++++++++---- .../table/alarm/ApplicationReferenceAlarmList.java | 13 +++++++++---- .../storage/table/alarm/InstanceReferenceAlarm.java | 13 +++++++++---- .../table/alarm/InstanceReferenceAlarmList.java | 13 +++++++++---- .../storage/table/alarm/ServiceReferenceAlarm.java | 13 +++++++++---- .../table/alarm/ServiceReferenceAlarmList.java | 13 +++++++++---- 7 files changed, 60 insertions(+), 24 deletions(-) diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java index 89df172ca..f6725e97b 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java @@ -85,9 +85,15 @@ public class AnalysisAlarmModuleProvider extends ModuleProvider { RemoteDataRegisterService remoteDataRegisterService = getManager().find(RemoteModule.NAME).getService(RemoteDataRegisterService.class); remoteDataRegisterService.register(ApplicationAlarm.class, new ApplicationAlarm.InstanceCreator()); remoteDataRegisterService.register(ApplicationAlarmList.class, new ApplicationAlarmList.InstanceCreator()); + remoteDataRegisterService.register(ApplicationReferenceAlarm.class, new ApplicationReferenceAlarm.InstanceCreator()); + remoteDataRegisterService.register(ApplicationReferenceAlarmList.class, new ApplicationReferenceAlarmList.InstanceCreator()); remoteDataRegisterService.register(InstanceAlarm.class, new InstanceAlarm.InstanceCreator()); remoteDataRegisterService.register(InstanceAlarmList.class, new InstanceAlarmList.InstanceCreator()); + remoteDataRegisterService.register(InstanceReferenceAlarm.class, new InstanceReferenceAlarm.InstanceCreator()); + remoteDataRegisterService.register(InstanceReferenceAlarmList.class, new InstanceReferenceAlarmList.InstanceCreator()); remoteDataRegisterService.register(ServiceAlarm.class, new ServiceAlarm.InstanceCreator()); remoteDataRegisterService.register(ServiceAlarmList.class, new ServiceAlarmList.InstanceCreator()); + remoteDataRegisterService.register(ServiceReferenceAlarm.class, new ServiceReferenceAlarm.InstanceCreator()); + remoteDataRegisterService.register(ServiceReferenceAlarmList.class, new ServiceReferenceAlarmList.InstanceCreator()); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarm.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarm.java index 00705b761..8cdf2bbd4 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarm.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarm.java @@ -18,10 +18,9 @@ package org.apache.skywalking.apm.collector.storage.table.alarm; -import org.apache.skywalking.apm.collector.core.data.Column; -import org.apache.skywalking.apm.collector.core.data.StreamData; -import org.apache.skywalking.apm.collector.core.data.operator.CoverMergeOperation; -import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation; +import org.apache.skywalking.apm.collector.core.data.*; +import org.apache.skywalking.apm.collector.core.data.operator.*; +import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService; /** * @author peng-yongsheng @@ -123,4 +122,10 @@ public class ApplicationReferenceAlarm extends StreamData implements Alarm { public void setAlarmContent(String alarmContent) { setDataString(1, alarmContent); } + + public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator { + @Override public RemoteData createInstance() { + return new ApplicationReferenceAlarm(); + } + } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarmList.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarmList.java index 12f981d74..61ca18168 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarmList.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarmList.java @@ -18,10 +18,9 @@ package org.apache.skywalking.apm.collector.storage.table.alarm; -import org.apache.skywalking.apm.collector.core.data.Column; -import org.apache.skywalking.apm.collector.core.data.StreamData; -import org.apache.skywalking.apm.collector.core.data.operator.CoverMergeOperation; -import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation; +import org.apache.skywalking.apm.collector.core.data.*; +import org.apache.skywalking.apm.collector.core.data.operator.*; +import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService; /** * @author peng-yongsheng @@ -115,4 +114,10 @@ public class ApplicationReferenceAlarmList extends StreamData { public void setAlarmContent(String alarmContent) { setDataString(1, alarmContent); } + + public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator { + @Override public RemoteData createInstance() { + return new ApplicationReferenceAlarmList(); + } + } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarm.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarm.java index ef7f750c0..b8cf1afae 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarm.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarm.java @@ -18,10 +18,9 @@ package org.apache.skywalking.apm.collector.storage.table.alarm; -import org.apache.skywalking.apm.collector.core.data.Column; -import org.apache.skywalking.apm.collector.core.data.StreamData; -import org.apache.skywalking.apm.collector.core.data.operator.CoverMergeOperation; -import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation; +import org.apache.skywalking.apm.collector.core.data.*; +import org.apache.skywalking.apm.collector.core.data.operator.*; +import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService; /** * @author peng-yongsheng @@ -141,4 +140,10 @@ public class InstanceReferenceAlarm extends StreamData implements Alarm { public void setAlarmContent(String alarmContent) { setDataString(1, alarmContent); } + + public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator { + @Override public RemoteData createInstance() { + return new InstanceReferenceAlarm(); + } + } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarmList.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarmList.java index ddce99c5e..599669d05 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarmList.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarmList.java @@ -18,10 +18,9 @@ package org.apache.skywalking.apm.collector.storage.table.alarm; -import org.apache.skywalking.apm.collector.core.data.Column; -import org.apache.skywalking.apm.collector.core.data.StreamData; -import org.apache.skywalking.apm.collector.core.data.operator.CoverMergeOperation; -import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation; +import org.apache.skywalking.apm.collector.core.data.*; +import org.apache.skywalking.apm.collector.core.data.operator.*; +import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService; /** * @author peng-yongsheng @@ -133,4 +132,10 @@ public class InstanceReferenceAlarmList extends StreamData { public void setAlarmContent(String alarmContent) { setDataString(1, alarmContent); } + + public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator { + @Override public RemoteData createInstance() { + return new InstanceReferenceAlarmList(); + } + } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ServiceReferenceAlarm.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ServiceReferenceAlarm.java index 0c3f15dbd..62017fc45 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ServiceReferenceAlarm.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ServiceReferenceAlarm.java @@ -18,10 +18,9 @@ package org.apache.skywalking.apm.collector.storage.table.alarm; -import org.apache.skywalking.apm.collector.core.data.Column; -import org.apache.skywalking.apm.collector.core.data.StreamData; -import org.apache.skywalking.apm.collector.core.data.operator.CoverMergeOperation; -import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation; +import org.apache.skywalking.apm.collector.core.data.*; +import org.apache.skywalking.apm.collector.core.data.operator.*; +import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService; /** * @author peng-yongsheng @@ -159,4 +158,10 @@ public class ServiceReferenceAlarm extends StreamData implements Alarm { public void setAlarmContent(String alarmContent) { setDataString(1, alarmContent); } + + public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator { + @Override public RemoteData createInstance() { + return new ServiceReferenceAlarm(); + } + } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ServiceReferenceAlarmList.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ServiceReferenceAlarmList.java index 586a9eec4..d13633f84 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ServiceReferenceAlarmList.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ServiceReferenceAlarmList.java @@ -18,10 +18,9 @@ package org.apache.skywalking.apm.collector.storage.table.alarm; -import org.apache.skywalking.apm.collector.core.data.Column; -import org.apache.skywalking.apm.collector.core.data.StreamData; -import org.apache.skywalking.apm.collector.core.data.operator.CoverMergeOperation; -import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation; +import org.apache.skywalking.apm.collector.core.data.*; +import org.apache.skywalking.apm.collector.core.data.operator.*; +import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService; /** * @author peng-yongsheng @@ -151,4 +150,10 @@ public class ServiceReferenceAlarmList extends StreamData { public void setAlarmContent(String alarmContent) { setDataString(1, alarmContent); } + + public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator { + @Override public RemoteData createInstance() { + return new ServiceReferenceAlarmList(); + } + } }