openstack/cinder
Code Issues Proposed changes

Cleanup code duplication in cinder.cmd.backup module

Browse Source 
Change-Id: I758d0cf04e434a82beca8637cbe7e18bfdc02fb2
This commit is contained in:
Ivan Kolodyazhny
2018-11-29 12:18:24 +02:00
parent f423626fee
commit f6c60d1d9c
2 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cinder/cmd/backup.py
View File

@@ -69,7 +69,7 @@ def _launch_backup_process(launcher, num_process):
try:
server = service.Service.create(binary='cinder-backup',
coordination=True,
process_number=num_process + 1)
process_number=num_process)
except Exception:
LOG.exception('Backup service %s failed to start.', CONF.host)
sys.exit(1)
@@ -97,18 +97,10 @@ def main():
global LOG
LOG = logging.getLogger(__name__)
if CONF.backup_workers > 1:
LOG.info('Backup running with %s processes.', CONF.backup_workers)
launcher = service.get_launcher()
LOG.info('Backup running with %s processes.', CONF.backup_workers)
launcher = service.get_launcher()
for i in range(CONF.backup_workers):
_launch_backup_process(launcher, i)
for i in range(1, CONF.backup_workers + 1):
_launch_backup_process(launcher, i)
launcher.wait()
else:
LOG.info('Backup running in single process mode.')
server = service.Service.create(binary='cinder-backup',
coordination=True,
process_number=1)
service.serve(server)
service.wait()
launcher.wait()