starlingx/config
Code Issues Proposed changes

Return tuple in method that resizes filesystems

Browse Source 
All calls of _config_resize_filesystems expect a tuple to be returned,
however, this method has two returns and one of them is returning a
single value instead of a tuple. This commit fix this behavior.

Closes-bug: #1942449
Signed-off-by: Vinicius Lopes da Silva <vinicius.lopesdasilva@windriver.com>
Change-Id: Ic350f678a348eb1ef9ffe49e4ea4391011e5a9eb
This commit is contained in:
Vinicius Lopes da Silva 2021-09-02 10:04:40 -04:00
parent d9e41cddb2
commit 401c5f768f
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:
if standby_host:
if not self._drbd_connected():
return rc
return rc, drbd_fs_resized
if not os.path.isfile(CFS_DRBDADM_RECONFIGURED):
progress = "drbdadm resize all"
@ -9538,7 +9538,7 @@ class ConductorManager(service.PeriodicService):
{"cmd": ex.cmd, "stdout": ex.stdout,
"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
# enough protection in the unlikely case LVM's own locking mechanism