This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit e9587662144a8e43c8c6a1de98219292aa27d386
Author: zhengyangyong <yangyong.zh...@huawei.com>
AuthorDate: Fri May 18 09:25:38 2018 +0800
SCB-548 fix pr comment
Signed-off-by: zhengyangyong <yangyong.zh...@huawei.com>
---
.../main/java/org/apache/servicecomb/core/SCBEngine.java | 10 +++++-----
integration-tests/spring-zuul-tracing-tests/pom.xml | 13 -------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
index 17a4fce..e0a17b8 100644
--- a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
+++ b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
@@ -235,26 +235,26 @@ public class SCBEngine {
//Step 1: notify all component stop invoke via BEFORE_CLOSE Event
safeTriggerEvent(EventType.BEFORE_CLOSE);
+ //Step 2: forbid create new consumer invocation
status = SCBStatus.STOPPING;
- //Step 2: Unregister microservice instance from Service Center and close
vertx
+ //Step 3: Unregister microservice instance from Service Center and close
vertx
// Forbidden other consumers find me
RegistryUtils.destroy();
VertxUtils.blockCloseVertxByName("registry");
- //Step 3: wait all invocation finished
- // forbit create new consumer invocation
+ //Step 4: wait all invocation finished
try {
validAllInvocationFinished();
} catch (InterruptedException e) {
LOGGER.error("wait all invocation finished interrupted", e);
}
- //Step 4: Stop vertx to prevent blocking exit
+ //Step 5: Stop vertx to prevent blocking exit
VertxUtils.blockCloseVertxByName("config-center");
VertxUtils.blockCloseVertxByName("transport");
- //Step 5: notify all component do clean works via AFTER_CLOSE Event
+ //Step 6: notify all component do clean works via AFTER_CLOSE Event
safeTriggerEvent(EventType.AFTER_CLOSE);
}
diff --git a/integration-tests/spring-zuul-tracing-tests/pom.xml
b/integration-tests/spring-zuul-tracing-tests/pom.xml
index f414368..27b27aa 100644
--- a/integration-tests/spring-zuul-tracing-tests/pom.xml
+++ b/integration-tests/spring-zuul-tracing-tests/pom.xml
@@ -93,17 +93,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
--
To stop receiving notification emails like this one, please contact
wuji...@apache.org.
