You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2022/11/16 03:33:25 UTC
[dubbo-samples] branch master updated: Enhance address wait (#573)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new eeb34b6f Enhance address wait (#573)
eeb34b6f is described below
commit eeb34b6f7e54b68156bf397ef4ef25afceadede8
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Wed Nov 16 11:33:19 2022 +0800
Enhance address wait (#573)
---
.../apache/dubbo/samples/merge/Consumer1IT.java | 10 +++++
.../dubbo/samples/merge/MyAddressListener.java | 43 ++++++++++++++++++++++
.../org.apache.dubbo.registry.AddressListener | 1 +
.../apache/dubbo/samples/merge/Consumer1IT.java | 10 +++++
.../dubbo/samples/merge/MyAddressListener.java | 43 ++++++++++++++++++++++
.../org.apache.dubbo.registry.AddressListener | 1 +
.../dubbo/samples/version/MyAddressListener.java | 43 ++++++++++++++++++++++
.../samples/version/VersionServiceStarIT.java | 13 ++++++-
.../org.apache.dubbo.registry.AddressListener | 1 +
.../apache/dubbo/samples/merge/Consumer1IT.java | 13 +++++++
.../dubbo/samples/merge/MyAddressListener.java | 43 ++++++++++++++++++++++
.../org.apache.dubbo.registry.AddressListener | 1 +
.../dubbo/samples/version/MyAddressListener.java | 43 ++++++++++++++++++++++
.../samples/version/VersionServiceStarIT.java | 13 +++++++
.../org.apache.dubbo.registry.AddressListener | 1 +
15 files changed, 278 insertions(+), 1 deletion(-)
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java b/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
index 256a311a..f52bf232 100644
--- a/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
@@ -36,6 +36,16 @@ public class Consumer1IT {
@Test
public void test() throws Exception {
+ for (int i = 0; i < 10; i++) {
+ System.out.println("address received: " + MyAddressListener.getAddressSize());
+ if (3 == MyAddressListener.getAddressSize()) {
+ break;
+ }
+ Thread.sleep(200);
+ }
+ Assert.assertEquals(3, MyAddressListener.getAddressSize());
+ Thread.sleep(100);
+
List<String> result = mergeService.mergeResult();
Assert.assertTrue(result.contains("group-2.1"));
Assert.assertTrue(result.contains("group-2.2"));
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java b/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java
new file mode 100644
index 00000000..056e05db
--- /dev/null
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.samples.merge;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.registry.AddressListener;
+import org.apache.dubbo.registry.client.ServiceDiscoveryRegistryDirectory;
+import org.apache.dubbo.rpc.cluster.Directory;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Activate
+public class MyAddressListener implements AddressListener {
+ private final static AtomicInteger addressSize = new AtomicInteger(0);
+
+ @Override
+ public List<URL> notify(List<URL> addresses, URL consumerUrl, Directory registryDirectory) {
+ if (registryDirectory instanceof ServiceDiscoveryRegistryDirectory) {
+ addressSize.set(addresses.size());
+ }
+ return addresses;
+ }
+
+ public static int getAddressSize() {
+ return addressSize.get();
+ }
+}
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener b/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
new file mode 100644
index 00000000..880863ff
--- /dev/null
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
@@ -0,0 +1 @@
+test=org.apache.dubbo.samples.merge.MyAddressListener
\ No newline at end of file
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java b/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
index 256a311a..f52bf232 100644
--- a/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
@@ -36,6 +36,16 @@ public class Consumer1IT {
@Test
public void test() throws Exception {
+ for (int i = 0; i < 10; i++) {
+ System.out.println("address received: " + MyAddressListener.getAddressSize());
+ if (3 == MyAddressListener.getAddressSize()) {
+ break;
+ }
+ Thread.sleep(200);
+ }
+ Assert.assertEquals(3, MyAddressListener.getAddressSize());
+ Thread.sleep(100);
+
List<String> result = mergeService.mergeResult();
Assert.assertTrue(result.contains("group-2.1"));
Assert.assertTrue(result.contains("group-2.2"));
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java b/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java
new file mode 100644
index 00000000..056e05db
--- /dev/null
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.samples.merge;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.registry.AddressListener;
+import org.apache.dubbo.registry.client.ServiceDiscoveryRegistryDirectory;
+import org.apache.dubbo.rpc.cluster.Directory;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Activate
+public class MyAddressListener implements AddressListener {
+ private final static AtomicInteger addressSize = new AtomicInteger(0);
+
+ @Override
+ public List<URL> notify(List<URL> addresses, URL consumerUrl, Directory registryDirectory) {
+ if (registryDirectory instanceof ServiceDiscoveryRegistryDirectory) {
+ addressSize.set(addresses.size());
+ }
+ return addresses;
+ }
+
+ public static int getAddressSize() {
+ return addressSize.get();
+ }
+}
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener b/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
new file mode 100644
index 00000000..880863ff
--- /dev/null
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
@@ -0,0 +1 @@
+test=org.apache.dubbo.samples.merge.MyAddressListener
\ No newline at end of file
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/java/org/apache/dubbo/samples/version/MyAddressListener.java b/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/java/org/apache/dubbo/samples/version/MyAddressListener.java
new file mode 100644
index 00000000..b5c8c456
--- /dev/null
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/java/org/apache/dubbo/samples/version/MyAddressListener.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.samples.version;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.registry.AddressListener;
+import org.apache.dubbo.registry.client.ServiceDiscoveryRegistryDirectory;
+import org.apache.dubbo.rpc.cluster.Directory;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Activate
+public class MyAddressListener implements AddressListener {
+ private final static AtomicInteger addressSize = new AtomicInteger(0);
+
+ @Override
+ public List<URL> notify(List<URL> addresses, URL consumerUrl, Directory registryDirectory) {
+ if (registryDirectory instanceof ServiceDiscoveryRegistryDirectory) {
+ addressSize.set(addresses.size());
+ }
+ return addresses;
+ }
+
+ public static int getAddressSize() {
+ return addressSize.get();
+ }
+}
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java b/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java
index ba35e3dd..92797501 100644
--- a/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.samples.version;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.samples.version.api.VersionService;
+
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -58,9 +59,19 @@ public class VersionServiceStarIT {
}
Assert.assertEquals(2, MyNettyTransporter.getConnectedCount());
+ for (int i = 0; i < 10; i++) {
+ System.out.println("address received: " + MyAddressListener.getAddressSize());
+ if (2 == MyAddressListener.getAddressSize()) {
+ break;
+ }
+ Thread.sleep(200);
+ }
+ Assert.assertEquals(2, MyAddressListener.getAddressSize());
+ Thread.sleep(100);
+
boolean version1 = false;
boolean version2 = false;
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < 100; i++) {
String result = service.sayHello("dubbo");
System.out.println("result: " + result);
if (result.equals("hello, dubbo")) {
diff --git a/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener b/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
new file mode 100644
index 00000000..c84868d2
--- /dev/null
+++ b/dubbo-samples-boundary-test/dubbo-samples-sd-version/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
@@ -0,0 +1 @@
+test=org.apache.dubbo.samples.version.MyAddressListener
\ No newline at end of file
diff --git a/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
index 256a311a..d1a373f5 100644
--- a/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.samples.merge;
+import org.apache.dubbo.common.Version;
import org.apache.dubbo.samples.merge.api.MergeService;
import org.junit.Assert;
@@ -36,6 +37,18 @@ public class Consumer1IT {
@Test
public void test() throws Exception {
+ if (Version.getVersion().compareTo("3.1.0") > 0) {
+ for (int i = 0; i < 10; i++) {
+ System.out.println("address received: " + MyAddressListener.getAddressSize());
+ if (3 == MyAddressListener.getAddressSize()) {
+ break;
+ }
+ Thread.sleep(200);
+ }
+ Assert.assertEquals(3, MyAddressListener.getAddressSize());
+ Thread.sleep(100);
+ }
+
List<String> result = mergeService.mergeResult();
Assert.assertTrue(result.contains("group-2.1"));
Assert.assertTrue(result.contains("group-2.2"));
diff --git a/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java
new file mode 100644
index 00000000..056e05db
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/java/org/apache/dubbo/samples/merge/MyAddressListener.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.samples.merge;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.registry.AddressListener;
+import org.apache.dubbo.registry.client.ServiceDiscoveryRegistryDirectory;
+import org.apache.dubbo.rpc.cluster.Directory;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Activate
+public class MyAddressListener implements AddressListener {
+ private final static AtomicInteger addressSize = new AtomicInteger(0);
+
+ @Override
+ public List<URL> notify(List<URL> addresses, URL consumerUrl, Directory registryDirectory) {
+ if (registryDirectory instanceof ServiceDiscoveryRegistryDirectory) {
+ addressSize.set(addresses.size());
+ }
+ return addresses;
+ }
+
+ public static int getAddressSize() {
+ return addressSize.get();
+ }
+}
diff --git a/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
new file mode 100644
index 00000000..880863ff
--- /dev/null
+++ b/dubbo-samples-merge/dubbo-samples-merge-consumer/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
@@ -0,0 +1 @@
+test=org.apache.dubbo.samples.merge.MyAddressListener
\ No newline at end of file
diff --git a/dubbo-samples-version/src/test/java/org/apache/dubbo/samples/version/MyAddressListener.java b/dubbo-samples-version/src/test/java/org/apache/dubbo/samples/version/MyAddressListener.java
new file mode 100644
index 00000000..b5c8c456
--- /dev/null
+++ b/dubbo-samples-version/src/test/java/org/apache/dubbo/samples/version/MyAddressListener.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.samples.version;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.registry.AddressListener;
+import org.apache.dubbo.registry.client.ServiceDiscoveryRegistryDirectory;
+import org.apache.dubbo.rpc.cluster.Directory;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Activate
+public class MyAddressListener implements AddressListener {
+ private final static AtomicInteger addressSize = new AtomicInteger(0);
+
+ @Override
+ public List<URL> notify(List<URL> addresses, URL consumerUrl, Directory registryDirectory) {
+ if (registryDirectory instanceof ServiceDiscoveryRegistryDirectory) {
+ addressSize.set(addresses.size());
+ }
+ return addresses;
+ }
+
+ public static int getAddressSize() {
+ return addressSize.get();
+ }
+}
diff --git a/dubbo-samples-version/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java b/dubbo-samples-version/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java
index 81005834..500d1f40 100644
--- a/dubbo-samples-version/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java
+++ b/dubbo-samples-version/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.samples.version;
+import org.apache.dubbo.common.Version;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.samples.version.api.VersionService;
@@ -59,6 +60,18 @@ public class VersionServiceStarIT {
}
Assert.assertEquals(2, MyNettyTransporter.getConnectedCount());
+ if (Version.getVersion().compareTo("3.1.0") > 0) {
+ for (int i = 0; i < 10; i++) {
+ System.out.println("address received: " + MyAddressListener.getAddressSize());
+ if (2 == MyAddressListener.getAddressSize()) {
+ break;
+ }
+ Thread.sleep(200);
+ }
+ Assert.assertEquals(2, MyAddressListener.getAddressSize());
+ Thread.sleep(100);
+ }
+
boolean version1 = false;
boolean version2 = false;
for (int i = 0; i < 100; i++) {
diff --git a/dubbo-samples-version/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener b/dubbo-samples-version/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
new file mode 100644
index 00000000..c84868d2
--- /dev/null
+++ b/dubbo-samples-version/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.AddressListener
@@ -0,0 +1 @@
+test=org.apache.dubbo.samples.version.MyAddressListener
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org