ruanwenjun commented on code in PR #10979:
URL: https://github.com/apache/dolphinscheduler/pull/10979#discussion_r921789321
##########
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java:
##########
@@ -139,37 +137,24 @@ public void run() {
}
public void close(String cause) {
- try {
- // execute only once
- // set stop signal is true
- if (!Stopper.stop()) {
- logger.warn("WorkerServer is already stopped, current cause:
{}", cause);
- return;
- }
+ if (!Stopper.stop()) {
+ logger.warn("WorkerServer is already stopped, current cause: {}",
cause);
+ return;
+ }
+ ThreadUtils.sleep(Constants.SERVER_CLOSE_WAIT_TIME.toMillis());
+ try (WorkerRpcServer closedWorkerRpcServer = workerRpcServer;
+ WorkerRegistryClient closedRegistryClient = workerRegistryClient;
+ AlertClientService closedAlertClientService = alertClientService;
+ SpringApplicationContext closedSpringContext =
springApplicationContext;) {
logger.info("Worker server is stopping, current cause : {}",
cause);
-
- try {
- // thread sleep 3 seconds for thread quitely stop
- Thread.sleep(Constants.SERVER_CLOSE_WAIT_TIME.toMillis());
- } catch (Exception e) {
- logger.warn("Worker server close wait error", e);
- }
-
- // close
- this.workerRpcServer.close();
- this.workerRegistryClient.unRegistry();
- this.alertClientService.close();
-
// kill running tasks
this.killAllRunningTasks();
Review Comment:
The close order is not changed. KillAllRunningTasks doesn't rely on other
component.
##########
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java:
##########
@@ -139,37 +137,24 @@ public void run() {
}
public void close(String cause) {
- try {
- // execute only once
- // set stop signal is true
- if (!Stopper.stop()) {
- logger.warn("WorkerServer is already stopped, current cause:
{}", cause);
- return;
- }
+ if (!Stopper.stop()) {
+ logger.warn("WorkerServer is already stopped, current cause: {}",
cause);
+ return;
+ }
+ ThreadUtils.sleep(Constants.SERVER_CLOSE_WAIT_TIME.toMillis());
+ try (WorkerRpcServer closedWorkerRpcServer = workerRpcServer;
+ WorkerRegistryClient closedRegistryClient = workerRegistryClient;
+ AlertClientService closedAlertClientService = alertClientService;
+ SpringApplicationContext closedSpringContext =
springApplicationContext;) {
logger.info("Worker server is stopping, current cause : {}",
cause);
-
- try {
- // thread sleep 3 seconds for thread quitely stop
- Thread.sleep(Constants.SERVER_CLOSE_WAIT_TIME.toMillis());
- } catch (Exception e) {
- logger.warn("Worker server close wait error", e);
- }
-
- // close
- this.workerRpcServer.close();
- this.workerRegistryClient.unRegistry();
- this.alertClientService.close();
-
// kill running tasks
this.killAllRunningTasks();
Review Comment:
The close order is not changed, `KillAllRunningTasks` doesn't rely on other
component.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
