zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ISSUE #12282]Fix the issue where monitoring data cannot be found through the IP dimension in the ListeningQuery (#12315)

Browse Source
This commit is contained in:
HMYDK 2024-07-15 14:13:43 +08:00 committed by GitHub
parent de5ade75c8
commit 6c05ad5497
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/src/main/java/com/alibaba/nacos/config/server/service/ConfigSubService.java
View File

@ -83,6 +83,11 @@ public class ConfigSubService {
return new ClusterListenerJob(params, completionService, memberManager).runJobs(); return new ClusterListenerJob(params, completionService, memberManager).runJobs();
} }
private List<SampleResult> runConfigListenerByIpCollectionJob(Map<String, String> params,
CompletionService<SampleResult> completionService) {
return new ClusterListenerByIpJob(params, completionService, memberManager).runJobs();
}
static class ClusterListenerJob extends ClusterJob<SampleResult> { static class ClusterListenerJob extends ClusterJob<SampleResult> {
static final String URL = Constants.COMMUNICATION_CONTROLLER_PATH + "/configWatchers"; static final String URL = Constants.COMMUNICATION_CONTROLLER_PATH + "/configWatchers";
@ -93,6 +98,16 @@ public class ConfigSubService {
} }
} }
static class ClusterListenerByIpJob extends ClusterJob<SampleResult> {
static final String URL = Constants.COMMUNICATION_CONTROLLER_PATH + "/watcherConfigs";
ClusterListenerByIpJob(Map<String, String> params, CompletionService<SampleResult> completionService,
ServerMemberManager serverMemberManager) {
super(URL, params, completionService, serverMemberManager);
}
}
private List<ListenerCheckResult> runHasCheckListenerCollectionJob(Map<String, String> params, private List<ListenerCheckResult> runHasCheckListenerCollectionJob(Map<String, String> params,
CompletionService<ListenerCheckResult> completionService) { CompletionService<ListenerCheckResult> completionService) {
return new ClusterCheckHasListenerJob(params, completionService, memberManager).runJobs(); return new ClusterCheckHasListenerJob(params, completionService, memberManager).runJobs();
@ -324,7 +339,7 @@ public class ConfigSubService {
SampleResult sampleCollectResult = new SampleResult(); SampleResult sampleCollectResult = new SampleResult();
for (int i = 0; i < sampleTime; i++) { for (int i = 0; i < sampleTime; i++) {
List<SampleResult> sampleResults = runConfigListenerCollectionJob(params, completionService); List<SampleResult> sampleResults = runConfigListenerByIpCollectionJob(params, completionService);
if (sampleResults != null) { if (sampleResults != null) {
sampleCollectResult = mergeSampleResult(sampleCollectResult, sampleResults); sampleCollectResult = mergeSampleResult(sampleCollectResult, sampleResults);
} }