Skip to content

optimize for elastic #33895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danleifeng merged 3 commits into from
Jul 1, 2021
Merged

optimize for elastic #33895

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a10f6a
add random and prevent deadlock
kuizhiqing Jun 25, 2021
633463d
add stop for exit
kuizhiqing Jul 1, 2021
ee22258
add stop for exit
kuizhiqing Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions python/paddle/distributed/fleet/elastic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import six
import logging
import signal
import random

logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO').upper())
logger = logging.getLogger("ELASTIC")
Expand Down Expand Up @@ -129,10 +130,14 @@ def __init__(self, args):

# etcd data
self.prefix = "/paddle/" + name
self.node_prefix = self.prefix + '/nodes/'
self.node_prefix = self.prefix + '/nodes'
self.np_path = self.prefix + '/np'
self.endpoints_path = self.prefix + '/endpoints'
self.host_path = '{}{}'.format(self.node_prefix, time.time())

node_tag = ''.join(
random.choice('abcdefghijklmnopqrstuvwxyz') for _ in range(6))
self.host_path = '{}/{}{}'.format(self.node_prefix, node_tag,
time.time())

self.np = np + scale
'''
Expand Down Expand Up @@ -195,10 +200,13 @@ def endpoints_call_back(event):

self.watches = [host_watch, np_watch, endpoints_watch]

self.launcher = None

def exit(self, completed=False):
logger.info('manager exist completed {}'.format(completed))

self.launcher.stop()
if self.launcher:
self.launcher.stop()

if not self.enable:
return
Expand Down Expand Up @@ -264,13 +272,22 @@ def wait(self):
if not self.enable:
return

idx = 1
while not self.stopped:
if self._match():
logger.info('ready with hosts {}'.format(self.hosts))
self._update_hosts()
return
logger.info('not ready for np {} with hosts {}'.format(self.np,
self.hosts))

# reset hosts every 30s to prevent fake deadlock
if idx % 10 == 0:
self.etcd.delete_prefix(self.node_prefix)
logger.info('reset np {} with hosts {}'.format(self.np,
self.hosts))

idx += 1
time.sleep(3)
return

Expand Down Expand Up @@ -304,6 +321,8 @@ def watch(self):

time.sleep(3)

if self.launcher:
self.launcher.stop()
return ElasticStatus.EXIT

def signal_handler(self, sigint, frame):
Expand Down