From 469e3198e5618feb668ca06cc6a7725d288f91ba Mon Sep 17 00:00:00 2001
From: kuizhiqing <kuizhiqing@baidu.com>
Date: Tue, 19 Apr 2022 18:12:02 +0800
Subject: [PATCH] rm distri env (#41961)

---
 python/paddle/distributed/launch/context/__init__.py       | 1 -
 python/paddle/distributed/launch/controllers/controller.py | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/paddle/distributed/launch/context/__init__.py b/python/paddle/distributed/launch/context/__init__.py
index e03d832767e..08c8f0835c5 100644
--- a/python/paddle/distributed/launch/context/__init__.py
+++ b/python/paddle/distributed/launch/context/__init__.py
@@ -51,7 +51,6 @@ class Context(object):
         legacy_env_list = [
             'DISTRIBUTED_TRAINER_ENDPOINTS',
             'PADDLE_ELASTIC_JOB_ID',
-            'PADDLE_DISTRI_BACKEND',
             'FLAGS_START_PORT',
         ]
 
diff --git a/python/paddle/distributed/launch/controllers/controller.py b/python/paddle/distributed/launch/controllers/controller.py
index 9527ae35c4b..69b2237f0ba 100644
--- a/python/paddle/distributed/launch/controllers/controller.py
+++ b/python/paddle/distributed/launch/controllers/controller.py
@@ -128,14 +128,15 @@ class ControllerBase(object):
         self.ctx.logger.info("Terminating with signal {}".format(sigint))
 
         if hasattr(self, 'sigint'):
-            time.sleep(5)
+            self.ctx.logger.info("Force quit in 10 seconds...")
+            time.sleep(11)
             sys.exit(sigint)
 
         self.sigint = sigint
         self.ctx.status.done()
         self.stop(sigint)
         time.sleep(1)
-        self.ctx.logger.debug("Exit with signal {}".format(sigint))
+        self.ctx.logger.info("Exit with signal {}".format(sigint))
         sys.exit(sigint)
 
 
-- 
GitLab