[
https://issues.apache.org/jira/browse/SCB-546?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16471393#comment-16471393
]
ASF GitHub Bot commented on SCB-546:
------------------------------------
liubao68 closed pull request #698: [SCB-546] bug fix
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/698
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/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
index d0aed66fe..8036baf15 100644
---
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
+++
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
@@ -145,7 +145,7 @@ private boolean registerSchemas() {
String schemaId = entry.getKey();
String content = entry.getValue();
GetSchemaResponse existSchema = extractSchema(schemaId, existSchemas);
- boolean exists = existSchema != null;
+ boolean exists = existSchema != null && existSchema.getSummary() != null;
LOGGER.info("schemaId [{}] exists {}", schemaId, exists);
if (!exists) {
if (!srClient.registerSchema(microservice.getServiceId(), schemaId,
content)) {
diff --git
a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
index 2afbe482a..7932d6893 100644
---
a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
+++
b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
@@ -265,6 +265,43 @@ public void testReRegisteredSetForDev(@Mocked
ServiceRegistryClient srClient) {
Assert.assertEquals(1, taskList.size());
}
+ @Test
+ public void testFirstRegisterForProd(@Mocked ServiceRegistryClient srClient)
{
+ Microservice otherMicroservice = new Microservice();
+ otherMicroservice.setAppId(microservice.getAppId());
+ otherMicroservice.setServiceName("ms1");
+ otherMicroservice.addSchema("s1", "");
+
+ List<GetSchemaResponse> list = new ArrayList<>();
+ GetSchemaResponse resp = new GetSchemaResponse();
+ resp.setSchemaId("s1");
+ resp.setSummary(null);
+ list.add(resp);
+
+ new Expectations() {
+ {
+ srClient.getMicroserviceId(anyString, anyString, anyString, anyString);
+ result = "serviceId";
+ srClient.getMicroservice(anyString);
+ result = otherMicroservice;
+ srClient.getSchemas(anyString);
+ result = list;
+ srClient.registerSchema(microservice.getServiceId(), anyString,
anyString);
+ result = true;
+ }
+ };
+
+ microservice.addSchema("s1", "");
+ microservice.getInstance().setEnvironment("production");
+ MicroserviceRegisterTask registerTask = new
MicroserviceRegisterTask(eventBus, srClient, microservice);
+ registerTask.run();
+
+ Assert.assertEquals(true, registerTask.isRegistered());
+ Assert.assertEquals(true, registerTask.isSchemaIdSetMatch());
+ Assert.assertEquals("serviceId", microservice.getServiceId());
+ Assert.assertEquals(1, taskList.size());
+ }
+
@Test(expected = IllegalStateException.class)
public void testReRegisteredSetForProd(@Mocked ServiceRegistryClient
srClient) {
Microservice otherMicroservice = new Microservice();
----------------------------------------------------------------
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:
us...@infra.apache.org
> As a developer, want to reregistry schemas in the dev environment
> -----------------------------------------------------------------
>
> Key: SCB-546
> URL: https://issues.apache.org/jira/browse/SCB-546
> Project: Apache ServiceComb
> Issue Type: Improvement
> Components: Java-Chassis
> Affects Versions: java-chassis-1.0.0-m1
> Reporter: jeho0815
> Assignee: jeho0815
> Priority: Major
> Fix For: java-chassis-1.0.0-m2
>
>
> 1、the servicecenter has a new rest interface which return all schemas with
> signature, so we can compare the summary to know whether to update the schema
> 2、if the instance enviroment is dev, we reregistry the schemas, otherwize
> throw a RuntimeException to avoid make some potential exception in production
> environment
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
