starlingx/config
Code Issues Proposed changes

Merge "Return tuple in method that resizes filesystems"

Browse Source
This commit is contained in:
Zuul 2021-09-03 06:04:28 +00:00 committed by Gerrit Code Review
commit 48d2e43f45
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -9438,7 +9438,7 @@ class ConductorManager(service.PeriodicService):
try: try:
if standby_host: if standby_host:
if not self._drbd_connected(): if not self._drbd_connected():
return rc return rc, drbd_fs_resized
if not os.path.isfile(CFS_DRBDADM_RECONFIGURED): if not os.path.isfile(CFS_DRBDADM_RECONFIGURED):
progress = "drbdadm resize all" progress = "drbdadm resize all"
@ -9538,7 +9538,7 @@ class ConductorManager(service.PeriodicService):
{"cmd": ex.cmd, "stdout": ex.stdout, {"cmd": ex.cmd, "stdout": ex.stdout,
"stderr": ex.stderr, "rc": ex.exit_code}) "stderr": ex.stderr, "rc": ex.exit_code})
return (rc, drbd_fs_resized) return rc, drbd_fs_resized
# Retrying a few times and waiting between each retry should provide # Retrying a few times and waiting between each retry should provide
# enough protection in the unlikely case LVM's own locking mechanism # enough protection in the unlikely case LVM's own locking mechanism