You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@servicecomb.apache.org by GitBox <gi...@apache.org> on 2018/01/04 12:47:09 UTC
[GitHub] weichao666 closed pull request #472: [JAV-558] pullTask,use rev to ensure data consistency and reduce service center work load
weichao666 closed pull request #472: [JAV-558] pullTask,use rev to ensure data consistency and reduce service center work load
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/472
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/RegistryUtils.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/RegistryUtils.java
index 598e7ef28..9e8ea01d3 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/RegistryUtils.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/RegistryUtils.java
@@ -20,7 +20,6 @@
import java.net.InetSocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.List;
import java.util.Map;
import org.apache.http.client.utils.URIBuilder;
@@ -38,6 +37,7 @@
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import io.servicecomb.serviceregistry.cache.InstanceCacheManager;
import io.servicecomb.serviceregistry.client.ServiceRegistryClient;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import io.servicecomb.serviceregistry.definition.MicroserviceDefinition;
import io.servicecomb.serviceregistry.registry.ServiceRegistryFactory;
@@ -202,9 +202,9 @@ private static IpPort genPublishIpPort(String schema, IpPort ipPort) {
return new IpPort(publicAddressSetting, publishPort);
}
- public static List<MicroserviceInstance> findServiceInstance(String appId, String serviceName,
- String versionRule) {
- return serviceRegistry.findServiceInstance(appId, serviceName, versionRule);
+ public static MicroserviceInstances findServiceInstance(String appId, String serviceName,
+ String versionRule, String revision) {
+ return serviceRegistry.findServiceInstance(appId, serviceName, versionRule, revision);
}
// update microservice instance properties
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/ServiceRegistry.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/ServiceRegistry.java
index 0dd0224ea..0928c65ec 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/ServiceRegistry.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/ServiceRegistry.java
@@ -16,7 +16,6 @@
*/
package io.servicecomb.serviceregistry;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -24,6 +23,7 @@
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import io.servicecomb.serviceregistry.cache.InstanceCacheManager;
import io.servicecomb.serviceregistry.client.ServiceRegistryClient;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.consumer.AppManager;
public interface ServiceRegistry {
@@ -45,8 +45,8 @@
InstanceCacheManager getInstanceCacheManager();
- List<MicroserviceInstance> findServiceInstance(String appId, String microserviceName,
- String microserviceVersionRule);
+ MicroserviceInstances findServiceInstance(String appId, String microserviceName,
+ String microserviceVersionRule, String revision);
boolean updateMicroserviceProperties(Map<String, String> properties);
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java
index 0691af14d..713498530 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java
@@ -38,8 +38,11 @@
import io.servicecomb.foundation.vertx.AsyncResultCallback;
import io.servicecomb.serviceregistry.api.registry.Microservice;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
+import io.servicecomb.serviceregistry.api.response.FindInstancesResponse;
import io.servicecomb.serviceregistry.api.response.HeartbeatResponse;
import io.servicecomb.serviceregistry.api.response.MicroserviceInstanceChangedEvent;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
+import io.servicecomb.serviceregistry.definition.DefinitionConst;
import io.servicecomb.serviceregistry.version.Version;
import io.servicecomb.serviceregistry.version.VersionRule;
import io.servicecomb.serviceregistry.version.VersionRuleUtils;
@@ -238,14 +241,19 @@ protected Microservice findLatest(String appId, String serviceName, VersionRule
}
@Override
- public List<MicroserviceInstance> findServiceInstance(String selfMicroserviceId, String appId, String serviceName,
- String strVersionRule) {
+ public MicroserviceInstances findServiceInstance(String selfMicroserviceId, String appId, String serviceName,
+ String strVersionRule, String revision) {
List<MicroserviceInstance> allInstances = new ArrayList<>();
+ MicroserviceInstances microserviceInstances = new MicroserviceInstances();
+ FindInstancesResponse response = new FindInstancesResponse();
VersionRule versionRule = VersionRuleUtils.getOrCreate(strVersionRule);
Microservice latestMicroservice = findLatest(appId, serviceName, versionRule);
if (latestMicroservice == null) {
- return allInstances;
+ response.setInstances(allInstances);
+ microserviceInstances.setInstancesResponse(response);
+ microserviceInstances.setRevision(DefinitionConst.DEFAULT_REVISION);
+ return microserviceInstances;
}
Version latestVersion = VersionUtils.getOrCreate(latestMicroservice.getVersion());
@@ -263,8 +271,10 @@ protected Microservice findLatest(String appId, String serviceName, VersionRule
Map<String, MicroserviceInstance> instances = microserviceInstanceMap.get(entry.getValue().getServiceId());
allInstances.addAll(instances.values());
}
+ response.setInstances(allInstances);
+ microserviceInstances.setInstancesResponse(response);
- return allInstances;
+ return microserviceInstances;
}
@Override
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/client/ServiceRegistryClient.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/client/ServiceRegistryClient.java
index 1c9b750b8..28573376c 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/client/ServiceRegistryClient.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/client/ServiceRegistryClient.java
@@ -25,6 +25,7 @@
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import io.servicecomb.serviceregistry.api.response.HeartbeatResponse;
import io.servicecomb.serviceregistry.api.response.MicroserviceInstanceChangedEvent;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
public interface ServiceRegistryClient {
void init();
@@ -120,10 +121,10 @@ void watch(String selfMicroserviceId, AsyncResultCallback<MicroserviceInstanceCh
/**
*
- * ??app+interface+version????endpoints??
+ * ??app+interface+version+revision????endpoints??
*/
- List<MicroserviceInstance> findServiceInstance(String consumerId, String appId, String serviceName,
- String versionRule);
+ MicroserviceInstances findServiceInstance(String consumerId, String appId, String serviceName,
+ String versionRule, String revision);
/**
* ??serviceId? instanceId ??instance???
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/client/http/MicroserviceInstances.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/client/http/MicroserviceInstances.java
new file mode 100644
index 000000000..bba165db1
--- /dev/null
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/client/http/MicroserviceInstances.java
@@ -0,0 +1,56 @@
+/*
+ * 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 io.servicecomb.serviceregistry.client.http;
+
+import io.servicecomb.serviceregistry.api.response.FindInstancesResponse;
+
+/**
+ * Created by on 2017/12/28.
+ */
+public class MicroserviceInstances {
+ private boolean needRefresh = true;
+
+ private String revision;
+
+ private FindInstancesResponse instancesResponse;
+
+ public boolean isNeedRefresh() {
+ return needRefresh;
+ }
+
+ public void setNeedRefresh(boolean needRefresh) {
+ this.needRefresh = needRefresh;
+ }
+
+ public String getRevision() {
+ return revision;
+ }
+
+ public void setRevision(String revision) {
+ this.revision = revision;
+ }
+
+ public FindInstancesResponse getInstancesResponse() {
+ return instancesResponse;
+ }
+
+ public void setInstancesResponse(FindInstancesResponse instancesResponse) {
+ this.instancesResponse = instancesResponse;
+ }
+
+}
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java
index 53ffe5c10..601027774 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java
@@ -111,7 +111,7 @@ private void retry(RequestContext requestContext, Handler<RestResponse> response
holder.value =
JsonUtils.readValue(bodyBuffer.getBytes(), cls);
} catch (Exception e) {
- LOGGER.warn(bodyBuffer.toString());
+ LOGGER.warn(bodyBuffer.toString(), e);
}
countDownLatch.countDown();
});
@@ -151,6 +151,36 @@ private void retry(RequestContext requestContext, Handler<RestResponse> response
};
}
+ private <T> Handler<RestResponse> syncHandlerForInstances(CountDownLatch countDownLatch, MicroserviceInstances mInstances) {
+ return restResponse -> {
+ RequestContext requestContext = restResponse.getRequestContext();
+ HttpClientResponse response = restResponse.getResponse();
+ if (response == null) {
+ // ?????????SC?????
+ if (!requestContext.isRetry()) {
+ retry(requestContext, syncHandlerForInstances(countDownLatch, mInstances));
+ } else {
+ countDownLatch.countDown();
+ }
+ return;
+ }
+ response.bodyHandler(
+ bodyBuffer -> {
+ try {
+ mInstances.setRevision(response.getHeader("X-Resource-Revision"));
+ if (response.statusCode() == 304) {
+ mInstances.setNeedRefresh(false);
+ } else {
+ mInstances.setInstancesResponse(JsonUtils.readValue(bodyBuffer.getBytes(), FindInstancesResponse.class));
+ }
+ } catch (Exception e) {
+ LOGGER.warn(bodyBuffer.toString(), e);
+ }
+ countDownLatch.countDown();
+ });
+ };
+ }
+
@Override
public List<Microservice> getAllMicroservices() {
Holder<GetAllServicesResponse> holder = new Holder<>();
@@ -516,9 +546,9 @@ public void watch(String selfMicroserviceId, AsyncResultCallback<MicroserviceIns
}
@Override
- public List<MicroserviceInstance> findServiceInstance(String consumerId, String appId, String serviceName,
- String versionRule) {
- Holder<FindInstancesResponse> holder = new Holder<>();
+ public MicroserviceInstances findServiceInstance(String consumerId, String appId, String serviceName,
+ String versionRule, String revision) {
+ MicroserviceInstances microserviceInstances = new MicroserviceInstances();
IpPort ipPort = ipPortManager.getAvailableAddress(false);
CountDownLatch countDownLatch = new CountDownLatch(1);
@@ -527,18 +557,22 @@ public void watch(String selfMicroserviceId, AsyncResultCallback<MicroserviceIns
new RequestParam().addQueryParam("appId", appId)
.addQueryParam("serviceName", serviceName)
.addQueryParam("version", versionRule)
+ .addQueryParam("rev", revision)
.addHeader("X-ConsumerId", consumerId),
- syncHandler(countDownLatch, FindInstancesResponse.class, holder));
+ syncHandlerForInstances(countDownLatch, microserviceInstances));
try {
countDownLatch.await();
- if (holder.value == null) {
+ if (!microserviceInstances.isNeedRefresh()) {
+ return microserviceInstances;
+ }
+ if (microserviceInstances.getInstancesResponse() == null) {
return null; // error
}
- List<MicroserviceInstance> list = holder.value.getInstances();
+ List<MicroserviceInstance> list = microserviceInstances.getInstancesResponse().getInstances();
if (list == null) {
- return new ArrayList<>();
+ microserviceInstances.getInstancesResponse().setInstances(new ArrayList<>());
}
- return list;
+ return microserviceInstances;
} catch (Exception e) {
LOGGER.error("find microservice instance {}/{}/{} failed",
appId,
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java
index 48bcfaa31..4c6fcd66b 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java
@@ -33,6 +33,7 @@
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstanceStatus;
import io.servicecomb.serviceregistry.api.response.MicroserviceInstanceChangedEvent;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.definition.DefinitionConst;
import io.servicecomb.serviceregistry.task.event.PullMicroserviceVersionsInstancesEvent;
@@ -45,6 +46,8 @@
private String microserviceName;
+ private String revision = DefinitionConst.DEFAULT_REVISION;
+
private List<MicroserviceInstance> instances;
// key is service id
@@ -90,6 +93,14 @@ public String getMicroserviceName() {
return (T) versions.get(serviceId);
}
+ public String getRevision() {
+ return revision;
+ }
+
+ public void setRevision(String revision) {
+ this.revision = revision;
+ }
+
public void submitPull() {
pendingPullCount.incrementAndGet();
pullInstances();
@@ -100,17 +111,23 @@ public void pullInstances() {
return;
}
- List<MicroserviceInstance> pulledInstances = RegistryUtils.findServiceInstance(appId,
+ MicroserviceInstances microserviceInstances = RegistryUtils.findServiceInstance(appId,
microserviceName,
- DefinitionConst.VERSION_RULE_ALL);
- if (pulledInstances == null) {
+ DefinitionConst.VERSION_RULE_ALL,
+ revision);
+ if (microserviceInstances == null) {
+ return;
+ }
+ if (!microserviceInstances.isNeedRefresh()) {
return;
}
+ List<MicroserviceInstance> pulledInstances = microserviceInstances.getInstancesResponse().getInstances();
+ String rev = microserviceInstances.getRevision();
- setInstances(pulledInstances);
+ setInstances(pulledInstances, rev);
}
- private void setInstances(List<MicroserviceInstance> pulledInstances) {
+ private void setInstances(List<MicroserviceInstance> pulledInstances, String rev) {
synchronized (lock) {
instances = pulledInstances
.stream()
@@ -133,6 +150,7 @@ private void setInstances(List<MicroserviceInstance> pulledInstances) {
for (MicroserviceVersionRule microserviceVersionRule : versionRules.values()) {
microserviceVersionRule.setInstances(instances);
}
+ revision = rev;
}
}
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/definition/DefinitionConst.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/definition/DefinitionConst.java
index a030a3b18..3f154c0eb 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/definition/DefinitionConst.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/definition/DefinitionConst.java
@@ -34,4 +34,6 @@
String VERSION_RULE_LATEST = "latest";
String VERSION_RULE_ALL = "0.0.0+";
+
+ String DEFAULT_REVISION = "0";
}
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/registry/AbstractServiceRegistry.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/registry/AbstractServiceRegistry.java
index 27e4d4dd7..a237fcb7a 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/registry/AbstractServiceRegistry.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/registry/AbstractServiceRegistry.java
@@ -37,6 +37,7 @@
import io.servicecomb.serviceregistry.cache.InstanceCacheManagerNew;
import io.servicecomb.serviceregistry.client.IpPortManager;
import io.servicecomb.serviceregistry.client.ServiceRegistryClient;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import io.servicecomb.serviceregistry.consumer.AppManager;
import io.servicecomb.serviceregistry.consumer.MicroserviceVersionFactory;
@@ -200,17 +201,25 @@ public boolean unregisterInstance() {
return true;
}
- public List<MicroserviceInstance> findServiceInstance(String appId, String serviceName,
- String versionRule) {
- List<MicroserviceInstance> instances = srClient.findServiceInstance(microservice.getServiceId(),
+ public MicroserviceInstances findServiceInstance(String appId, String serviceName,
+ String versionRule, String revision) {
+ MicroserviceInstances microserviceInstances = srClient.findServiceInstance(microservice.getServiceId(),
appId,
serviceName,
- versionRule);
- if (instances == null) {
+ versionRule,
+ revision);
+
+ if (microserviceInstances == null) {
LOGGER.error("find empty instances from service center. service={}/{}/{}", appId, serviceName, versionRule);
return null;
}
+ if (!microserviceInstances.isNeedRefresh()) {
+ LOGGER.info("instances revision is not changed, service={}/{}/{}", appId, serviceName, versionRule);
+ return microserviceInstances;
+ }
+
+ List<MicroserviceInstance> instances = microserviceInstances.getInstancesResponse().getInstances();
LOGGER.info("find instances[{}] from service center success. service={}/{}/{}",
instances.size(),
appId,
@@ -222,7 +231,7 @@ public boolean unregisterInstance() {
instance.getInstanceId(),
instance.getEndpoints());
}
- return instances;
+ return microserviceInstances;
}
@Override
diff --git a/service-registry/src/test/java/io/servicecomb/serviceregistry/TestRegistry.java b/service-registry/src/test/java/io/servicecomb/serviceregistry/TestRegistry.java
index dbdc4fdf1..9c0b3cecd 100644
--- a/service-registry/src/test/java/io/servicecomb/serviceregistry/TestRegistry.java
+++ b/service-registry/src/test/java/io/servicecomb/serviceregistry/TestRegistry.java
@@ -47,6 +47,7 @@
import io.servicecomb.foundation.common.net.NetUtils;
import io.servicecomb.serviceregistry.api.registry.Microservice;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.registry.ServiceRegistryFactory;
import mockit.Deencapsulation;
import mockit.Expectations;
@@ -94,7 +95,8 @@ public void testDelegate() {
Assert.assertEquals(serviceRegistry.getMicroservice(), microservice);
Assert.assertEquals(serviceRegistry.getMicroserviceInstance(), RegistryUtils.getMicroserviceInstance());
- List<MicroserviceInstance> instanceList = RegistryUtils.findServiceInstance("default", "default", "0.0.1");
+ MicroserviceInstances microserviceInstances = RegistryUtils.findServiceInstance("default", "default", "0.0.1", "0");
+ List<MicroserviceInstance> instanceList = microserviceInstances.getInstancesResponse().getInstances();
Assert.assertEquals(1, instanceList.size());
Assert.assertEquals(RegistryUtils.getMicroservice().getServiceId(), instanceList.get(0).getServiceId());
diff --git a/service-registry/src/test/java/io/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java b/service-registry/src/test/java/io/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
index cde6179d0..c1a08ac69 100644
--- a/service-registry/src/test/java/io/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
+++ b/service-registry/src/test/java/io/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
@@ -30,6 +30,7 @@
import io.servicecomb.serviceregistry.api.registry.Microservice;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.definition.DefinitionConst;
public class LocalServiceRegistryClientImplTest {
@@ -53,8 +54,9 @@ public void loadRegistryFile() {
public void testLoadRegistryFile() {
Assert.assertNotNull(registryClient);
Assert.assertThat(registryClient.getAllMicroservices().size(), Is.is(1));
- List<MicroserviceInstance> m =
- registryClient.findServiceInstance("", "myapp", "springmvctest", DefinitionConst.VERSION_RULE_ALL);
+ MicroserviceInstances microserviceInstances =
+ registryClient.findServiceInstance("", "myapp", "springmvctest", DefinitionConst.VERSION_RULE_ALL, DefinitionConst.DEFAULT_REVISION);
+ List<MicroserviceInstance> m = microserviceInstances.getInstancesResponse().getInstances();
Assert.assertEquals(1, m.size());
}
@@ -109,8 +111,9 @@ public void getMicroserviceId_fixVersion() {
@Test
public void findServiceInstance_noInstances() {
- List<MicroserviceInstance> result =
- registryClient.findServiceInstance("self", appId, microserviceName, DefinitionConst.VERSION_RULE_ALL);
+ MicroserviceInstances microserviceInstances =
+ registryClient.findServiceInstance("self", appId, microserviceName, DefinitionConst.VERSION_RULE_ALL, DefinitionConst.DEFAULT_REVISION);
+ List<MicroserviceInstance> result = microserviceInstances.getInstancesResponse().getInstances();
Assert.assertThat(result, Matchers.empty());
}
@@ -124,8 +127,9 @@ public void findServiceInstance_twoSelectOne() {
instance.setServiceId(v1.getServiceId());
registryClient.registerMicroserviceInstance(instance);
- List<MicroserviceInstance> result =
- registryClient.findServiceInstance("self", appId, microserviceName, "1.0.0");
+ MicroserviceInstances microserviceInstances =
+ registryClient.findServiceInstance("self", appId, microserviceName, "1.0.0", "0");
+ List<MicroserviceInstance> result = microserviceInstances.getInstancesResponse().getInstances();
Assert.assertThat(result, Matchers.contains(instance));
}
diff --git a/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestClientHttp.java b/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestClientHttp.java
index 29f2c989c..6e0547b11 100644
--- a/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestClientHttp.java
+++ b/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestClientHttp.java
@@ -82,7 +82,8 @@ void open(IpPort ipPort, String url, Handler<Void> onOpen, Handler<Void> onClose
oClient.findServiceInstance(microservice.getServiceId(),
microservice.getAppId(),
microservice.getServiceName(),
- microservice.getVersion()));
+ microservice.getVersion(),
+ "0"));
Assert.assertEquals(null,
oClient.getMicroserviceId(microservice.getAppId(),
microservice.getServiceName(),
diff --git a/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestMicroserviceInstances.java b/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestMicroserviceInstances.java
new file mode 100644
index 000000000..7b8b1d0a5
--- /dev/null
+++ b/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestMicroserviceInstances.java
@@ -0,0 +1,78 @@
+/*
+ * 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 io.servicecomb.serviceregistry.client.http;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
+import io.servicecomb.serviceregistry.api.response.FindInstancesResponse;
+
+public class TestMicroserviceInstances {
+
+ MicroserviceInstances microserviceInstances = null;
+
+ FindInstancesResponse findInstancesResponse = null;
+
+ List<MicroserviceInstance> instances = null;
+
+ @Before
+ public void setUp() throws Exception {
+ microserviceInstances = new MicroserviceInstances();
+ findInstancesResponse = new FindInstancesResponse();
+ instances = new ArrayList<>();
+ instances.add(Mockito.mock(MicroserviceInstance.class));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ instances = null;
+ microserviceInstances = null;
+ findInstancesResponse = null;
+ }
+
+ @Test
+ public void testDefaultValues() {
+ Assert.assertNull(microserviceInstances.getInstancesResponse());
+ Assert.assertTrue(microserviceInstances.isNeedRefresh());
+ Assert.assertNull(microserviceInstances.getRevision());
+ Assert.assertNull(findInstancesResponse.getInstances());
+ }
+
+ @Test
+ public void testInitializedValues() {
+ initFields(); //Initialize the Object
+ Assert.assertEquals(1, microserviceInstances.getInstancesResponse().getInstances().size());
+ Assert.assertFalse(microserviceInstances.isNeedRefresh());
+ Assert.assertEquals("1", microserviceInstances.getRevision());
+ }
+
+ private void initFields() {
+ findInstancesResponse.setInstances(instances);
+ microserviceInstances.setInstancesResponse(findInstancesResponse);
+ microserviceInstances.setNeedRefresh(false);
+ microserviceInstances.setRevision("1");
+ }
+
+}
diff --git a/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java b/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
index 364cc031c..4826714d9 100644
--- a/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
+++ b/service-registry/src/test/java/io/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
@@ -124,7 +124,7 @@ public void testException() {
oClient.unregisterMicroserviceInstance("microserviceId", "microserviceInstanceId"));
Assert.assertEquals(null, oClient.heartbeat("microserviceId", "microserviceInstanceId"));
Assert.assertEquals(null,
- oClient.findServiceInstance("selfMicroserviceId", "appId", "serviceName", "versionRule"));
+ oClient.findServiceInstance("selfMicroserviceId", "appId", "serviceName", "versionRule", "0"));
Assert.assertEquals("a", new ClientException("a").getMessage());
}
diff --git a/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestAppManager.java b/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestAppManager.java
index 342f329ef..ae47bed91 100644
--- a/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestAppManager.java
+++ b/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestAppManager.java
@@ -19,12 +19,16 @@
import java.util.Collections;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import com.google.common.eventbus.EventBus;
import io.servicecomb.serviceregistry.RegistryUtils;
+import io.servicecomb.serviceregistry.api.response.FindInstancesResponse;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.definition.DefinitionConst;
import mockit.Expectations;
import mockit.Mocked;
@@ -40,12 +44,30 @@
String versionRule = "0+";
+ MicroserviceInstances microserviceInstances = null;
+
+ FindInstancesResponse findInstancesResponse = null;
+
+ @Before
+ public void setUp() throws Exception {
+ microserviceInstances = new MicroserviceInstances();
+ findInstancesResponse = new FindInstancesResponse();
+ findInstancesResponse.setInstances(Collections.emptyList());
+ microserviceInstances.setInstancesResponse(findInstancesResponse);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ findInstancesResponse = null;
+ microserviceInstances = null;
+ }
+
@Test
public void getOrCreateMicroserviceVersionRule() {
new Expectations(RegistryUtils.class) {
{
- RegistryUtils.findServiceInstance(appId, serviceName, DefinitionConst.VERSION_RULE_ALL);
- result = Collections.emptyList();
+ RegistryUtils.findServiceInstance(appId, serviceName, DefinitionConst.VERSION_RULE_ALL, DefinitionConst.DEFAULT_REVISION);
+ result = microserviceInstances;
}
};
@@ -59,8 +81,8 @@ public void getOrCreateMicroserviceVersionRule() {
public void getOrCreateMicroserviceVersions() {
new Expectations(RegistryUtils.class) {
{
- RegistryUtils.findServiceInstance(appId, serviceName, DefinitionConst.VERSION_RULE_ALL);
- result = Collections.emptyList();
+ RegistryUtils.findServiceInstance(appId, serviceName, DefinitionConst.VERSION_RULE_ALL, DefinitionConst.DEFAULT_REVISION);
+ result = microserviceInstances;
}
};
diff --git a/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceManager.java b/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceManager.java
index 2cc9062fb..24785579d 100644
--- a/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceManager.java
+++ b/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceManager.java
@@ -22,12 +22,16 @@
import javax.xml.ws.Holder;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import com.google.common.eventbus.EventBus;
import io.servicecomb.serviceregistry.RegistryUtils;
+import io.servicecomb.serviceregistry.api.response.FindInstancesResponse;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.definition.DefinitionConst;
import io.servicecomb.serviceregistry.task.event.PeriodicPullEvent;
import io.servicecomb.serviceregistry.task.event.RecoveryEvent;
@@ -49,12 +53,30 @@
MicroserviceManager microserviceManager = new MicroserviceManager(appManager, appId);
+ MicroserviceInstances microserviceInstances = null;
+
+ FindInstancesResponse findInstancesResponse = null;
+
+ @Before
+ public void setUp() throws Exception {
+ microserviceInstances = new MicroserviceInstances();
+ findInstancesResponse = new FindInstancesResponse();
+ findInstancesResponse.setInstances(Collections.emptyList());
+ microserviceInstances.setInstancesResponse(findInstancesResponse);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ findInstancesResponse = null;
+ microserviceInstances = null;
+ }
+
@Test
public void getOrCreateMicroserviceVersionRule() {
new Expectations(RegistryUtils.class) {
{
- RegistryUtils.findServiceInstance(appId, serviceName, DefinitionConst.VERSION_RULE_ALL);
- result = Collections.emptyList();
+ RegistryUtils.findServiceInstance(appId, serviceName, DefinitionConst.VERSION_RULE_ALL, DefinitionConst.DEFAULT_REVISION);
+ result = microserviceInstances;
}
};
diff --git a/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java b/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java
index eda0f564d..19c2f7cce 100644
--- a/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java
+++ b/service-registry/src/test/java/io/servicecomb/serviceregistry/consumer/TestMicroserviceVersions.java
@@ -23,7 +23,9 @@
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import com.google.common.eventbus.EventBus;
@@ -34,7 +36,9 @@
import io.servicecomb.serviceregistry.api.registry.Microservice;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstanceStatus;
+import io.servicecomb.serviceregistry.api.response.FindInstancesResponse;
import io.servicecomb.serviceregistry.api.response.MicroserviceInstanceChangedEvent;
+import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import io.servicecomb.serviceregistry.task.event.PullMicroserviceVersionsInstancesEvent;
import io.servicecomb.serviceregistry.version.Version;
import mockit.Deencapsulation;
@@ -60,6 +64,22 @@
AtomicInteger pendingPullCount;
+ MicroserviceInstances microserviceInstances = null;
+
+ FindInstancesResponse findInstancesResponse = null;
+
+ @Before
+ public void setUp() throws Exception {
+ microserviceInstances = new MicroserviceInstances();
+ findInstancesResponse = new FindInstancesResponse();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ findInstancesResponse = null;
+ microserviceInstances = null;
+ }
+
public TestMicroserviceVersions() {
microserviceVersions = new MicroserviceVersions(appManager, appId, microserviceName);
pendingPullCount = Deencapsulation.getField(microserviceVersions, "pendingPullCount");
@@ -81,15 +101,23 @@ private void createInstance(String microserviceId) {
instances.add(instance);
}
+ private void createMicroserviceInstances() {
+ findInstancesResponse.setInstances(instances);
+ microserviceInstances.setInstancesResponse(findInstancesResponse);
+ microserviceInstances.setRevision("1");
+ microserviceInstances.setNeedRefresh(true);
+ }
+
private void setup(String microserviceId) {
createMicroservice(microserviceId);
createInstance(microserviceId);
+ createMicroserviceInstances();
new MockUp<RegistryUtils>() {
@Mock
- List<MicroserviceInstance> findServiceInstance(String appId, String serviceName,
- String versionRule) {
- return instances;
+ MicroserviceInstances findServiceInstance(String appId, String serviceName,
+ String versionRule, String revision) {
+ return microserviceInstances;
}
@Mock
@@ -123,8 +151,8 @@ public void submitPull() {
public void pullInstancesCancel() {
new MockUp<RegistryUtils>() {
@Mock
- List<MicroserviceInstance> findServiceInstance(String appId, String serviceName,
- String versionRule) {
+ MicroserviceInstances findServiceInstance(String appId, String serviceName,
+ String versionRule, String revision) {
throw new Error("must not pull");
}
};
@@ -139,8 +167,8 @@ public void pullInstancesCancel() {
public void pullInstancesNull() {
new MockUp<RegistryUtils>() {
@Mock
- List<MicroserviceInstance> findServiceInstance(String appId, String serviceName,
- String versionRule) {
+ MicroserviceInstances findServiceInstance(String appId, String serviceName,
+ String versionRule, String revision) {
return null;
}
};
@@ -169,7 +197,7 @@ public void setInstances_selectUp() {
setup(microserviceId);
instances.get(0).setStatus(MicroserviceInstanceStatus.DOWN);
- Deencapsulation.invoke(microserviceVersions, "setInstances", instances);
+ Deencapsulation.invoke(microserviceVersions, "setInstances", instances, "0");
List<?> resultInstances = Deencapsulation.getField(microserviceVersions, "instances");
Assert.assertTrue(resultInstances.isEmpty());
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services