You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2021/08/31 11:08:13 UTC
[servicecomb-java-chassis] branch master updated:
[SCB-2327]discovery first pull not properly synchronized and may result in
empty instance (#2536)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 7d8a71b [SCB-2327]discovery first pull not properly synchronized and may result in empty instance (#2536)
7d8a71b is described below
commit 7d8a71b8768e5c1257b81e5277c762884edda8a0
Author: liubao68 <bi...@qq.com>
AuthorDate: Tue Aug 31 19:08:07 2021 +0800
[SCB-2327]discovery first pull not properly synchronized and may result in empty instance (#2536)
---
.../service/center/client/ServiceCenterDiscovery.java | 19 ++++++++++++-------
.../multiServiceCenterClient/RegistryClientTest.java | 2 +-
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
index 625db29..43a9f9a 100644
--- a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
+++ b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
@@ -98,6 +98,8 @@ public class ServiceCenterDiscovery extends AbstractTask {
private boolean started = false;
+ private final Object lock = new Object();
+
public ServiceCenterDiscovery(ServiceCenterClient serviceCenterClient, EventBus eventBus) {
super("service-center-discovery-task");
this.serviceCenterClient = serviceCenterClient;
@@ -124,19 +126,22 @@ public class ServiceCenterDiscovery extends AbstractTask {
}
}
- public void register(SubscriptionKey subscriptionKey) {
- this.instancesCache.computeIfAbsent(subscriptionKey, (key) -> new SubscriptionValue());
- pullInstance(subscriptionKey, this.instancesCache.get(subscriptionKey));
+ public void registerIfNotPresent(SubscriptionKey subscriptionKey) {
+ if (this.instancesCache.get(subscriptionKey) == null) {
+ synchronized (lock) {
+ if (this.instancesCache.get(subscriptionKey) == null) {
+ SubscriptionValue value = new SubscriptionValue();
+ pullInstance(subscriptionKey, value);
+ this.instancesCache.put(subscriptionKey, value);
+ }
+ }
+ }
}
public List<MicroserviceInstance> getInstanceCache(SubscriptionKey key) {
return this.instancesCache.get(key).instancesCache;
}
- public boolean isRegistered(SubscriptionKey key) {
- return this.instancesCache.get(key) != null;
- }
-
@Subscribe
public void onPullInstanceEvent(PullInstanceEvent event) {
pullAllInstance();
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/RegistryClientTest.java b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/RegistryClientTest.java
index d64dc24..ef523b2 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/RegistryClientTest.java
+++ b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/RegistryClientTest.java
@@ -133,7 +133,7 @@ public class RegistryClientTest implements CategorizedTestCase {
ServiceCenterDiscovery discovery = new ServiceCenterDiscovery(serviceCenterClient, eventBus);
discovery.updateMyselfServiceId(microservice.getServiceId());
discovery.startDiscovery();
- discovery.register(new SubscriptionKey(microservice.getAppId(), microservice.getServiceName()));
+ discovery.registerIfNotPresent(new SubscriptionKey(microservice.getAppId(), microservice.getServiceName()));
discoveryCounter.await(30000, TimeUnit.MILLISECONDS);
TestMgr.check(instances != null, true);
TestMgr.check(instances.size(), 1);