From a027e868816b41224a0ff4ccbc5fcb4a48cfda1e Mon Sep 17 00:00:00 2001 From: Pil0tXia Date: Sun, 14 Apr 2024 20:13:06 +0800 Subject: [PATCH] Remove misconfigured & not-used `registerIntervalInMills`, `fetchRegistryAddrIntervalInMills` --- .../apache/eventmesh/common/config/CommonConfiguration.java | 6 ------ .../eventmesh/common/config/CommonConfigurationTest.java | 3 --- .../src/test/resources/configuration.properties | 2 -- eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml | 5 ----- eventmesh-runtime/conf/eventmesh.properties | 3 --- .../src/test/resources/configuration.properties | 2 -- 6 files changed, 21 deletions(-) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java index 2c1aba4c10..2f38a372ce 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java @@ -67,12 +67,6 @@ public class CommonConfiguration { @ConfigField(field = "metaStorage.plugin.password") private String eventMeshMetaStoragePluginPassword = ""; - @ConfigField(field = "metaStorage.plugin.metaStorageIntervalInMills") - private Integer eventMeshMetaStorageIntervalInMills = 10 * 1000; - - @ConfigField(field = "metaStorage.plugin.fetchMetaStorageAddrIntervalInMills") - private Integer eventMeshFetchMetaStorageAddrInterval = 10 * 1000; - @ConfigField(field = "metaStorage.plugin.enabled") private boolean eventMeshServerMetaStorageEnable = false; diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java index 0730eafab8..fb1ebc1635 100644 --- a/eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java +++ b/eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java @@ -54,9 +54,6 @@ public void testGetCommonConfiguration() { Assertions.assertEquals("username-succeed!!!", config.getEventMeshMetaStoragePluginUsername()); Assertions.assertEquals("password-succeed!!!", config.getEventMeshMetaStoragePluginPassword()); - Assertions.assertEquals(Integer.valueOf(816), config.getEventMeshMetaStorageIntervalInMills()); - Assertions.assertEquals(Integer.valueOf(1816), config.getEventMeshFetchMetaStorageAddrInterval()); - List list = new ArrayList<>(); list.add("metrics-succeed1!!!"); list.add("metrics-succeed2!!!"); diff --git a/eventmesh-common/src/test/resources/configuration.properties b/eventmesh-common/src/test/resources/configuration.properties index bf8ad290b6..f53a7680f0 100644 --- a/eventmesh-common/src/test/resources/configuration.properties +++ b/eventmesh-common/src/test/resources/configuration.properties @@ -24,8 +24,6 @@ eventMesh.storage.plugin.type=storage-succeed!!! eventMesh.security.plugin.type=security-succeed!!! eventMesh.metaStorage.plugin.type=metaStorage-succeed!!! eventMesh.trace.plugin=trace-succeed!!! -eventMesh.metaStorage.plugin.metaStorageIntervalInMills=816 -eventMesh.metaStorage.plugin.fetchMetaStorageAddrIntervalInMills=1816 eventMesh.metrics.plugin=metrics-succeed1!!!,metrics-succeed2!!!,metrics-succeed3!!! eventMesh.metaStorage.plugin.server-addr=server-addr-succeed1!!! diff --git a/eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml b/eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml index 82f4a46ab2..c2900777c1 100644 --- a/eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml +++ b/eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml @@ -71,11 +71,6 @@ data: eventMesh.server.retry.async.pushRetryDelayInMills=500 eventMesh.server.retry.sync.pushRetryDelayInMills=500 eventMesh.server.retry.pushRetryQueueSize=10000 - #admin - eventMesh.server.admin.http.port=10106 - #metaStorage - eventMesh.server.metaStorage.metaStorageIntervalInMills=10000 - eventMesh.server.metaStorage.fetchMetaStorageAddrIntervalInMills=20000 #auto-ack #eventMesh.server.defibus.client.comsumeTimeoutInMin=5 diff --git a/eventmesh-runtime/conf/eventmesh.properties b/eventmesh-runtime/conf/eventmesh.properties index 134b46f048..b19370a105 100644 --- a/eventmesh-runtime/conf/eventmesh.properties +++ b/eventmesh-runtime/conf/eventmesh.properties @@ -60,9 +60,6 @@ eventMesh.server.retry.sync.pushRetryDelayInMills=500 eventMesh.server.retry.pushRetryQueueSize=10000 eventMesh.server.retry.plugin.type=default -# metaStorage -eventMesh.server.metaStorage.metaStorageIntervalInMills=10000 -eventMesh.server.metaStorage.fetchMetaStorageAddrIntervalInMills=20000 # auto-ack #eventMesh.server.defibus.client.comsumeTimeoutInMin=5 diff --git a/eventmesh-runtime/src/test/resources/configuration.properties b/eventmesh-runtime/src/test/resources/configuration.properties index 0d79ef35d0..70ff82e05c 100644 --- a/eventmesh-runtime/src/test/resources/configuration.properties +++ b/eventmesh-runtime/src/test/resources/configuration.properties @@ -32,8 +32,6 @@ eventMesh.metaStorage.plugin.server-addr=server-addr-succeed1!!! eventMesh.metaStorage.plugin.enabled=true eventMesh.metaStorage.plugin.username=username-succeed!!! eventMesh.metaStorage.plugin.password=password-succeed!!! -eventMesh.metaStorage.plugin.registerIntervalInMills=816 -eventMesh.metaStorage.plugin.fetchRegistryAddrIntervalInMills=1816 eventMesh.server.security.enabled=true eventMesh.server.trace.enabled=true