[GitHub] liubao68 closed pull request #692: [SCB-543]optimize registry procedure

[GitBox <gi...@apache.org>]

liubao68 closed pull request #692: [SCB-543]optimize registry procedure
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/692
 
 
   

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/MicroserviceInstanceRegisterTask.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceRegisterTask.java
index 37039b059..f0132b635 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceRegisterTask.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceRegisterTask.java
@@ -69,7 +69,7 @@ protected boolean doRegister() {
 
     String instanceId = srClient.registerMicroserviceInstance(microserviceInstance);
     if (StringUtils.isEmpty(instanceId)) {
-      LOGGER.error("Register microservice instance failed. microserviceId={}",
+      LOGGER.error("Register microservice instance failed,will back to register microservice again. microserviceId={}",
           microserviceInstance.getServiceId());
       return false;
     }
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 b029d6277..905c34bff 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
@@ -52,6 +52,15 @@ public void onMicroserviceInstanceHeartbeatTask(MicroserviceInstanceHeartbeatTas
     }
   }
 
+  @Subscribe
+  public void onInstanceRegistryFailed(MicroserviceInstanceRegisterTask task) {
+    if (task.taskStatus != TaskStatus.FINISHED){
+      LOGGER.info("read MicroserviceInstanceRegisterTask status is {}", task.taskStatus);
+      this.taskStatus = TaskStatus.READY;
+      this.registered = false;
+    }
+  }
+
   @Override
   protected boolean doRegister() {
     LOGGER.info("running microservice register task.");


 

----------------------------------------------------------------
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