Skip to content

CA-421077: Some small logging cleanups #321

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

Open
rosslagerwall wants to merge 4 commits into
base: master
Choose a base branch
from
Open

CA-421077: Some small logging cleanups #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90dc5d6
Fix text/binary string mismatch
rosslagerwall Jan 9, 2026
9fbf2a1
CA-421077: Silence wait for multipathd
rosslagerwall Jan 9, 2026
6862b94
CA-421077: Drop -B from multipath call
rosslagerwall Jan 9, 2026
57b3d85
Merge branch 'master' into private/rossla/CA-421077
rosslagerwall Mar 9, 2026
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
9 changes: 7 additions & 2 deletions diskutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from constants import MultipathConfig
import fcntl
import glob
import subprocess
import shutil
import util
import netutil
Expand All @@ -23,7 +24,11 @@
def mpath_cli_is_working():
regex = re.compile("switchgroup")
try:
(rc,stdout) = util.runCmd2(["multipathd","-k"], with_stdout=True, inputtext="help")
proc = subprocess.Popen(["multipathd", "-k"],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
stdin=subprocess.PIPE, text=True)
stdout, stderr = proc.communicate(input="help")
m=regex.search(stdout)
return bool(m)
except:
Expand Down Expand Up @@ -60,7 +65,7 @@ def mpath_enable(mpath_config):
assert 0

# launch manually to make possible to wait initialization
util.runCmd2(["/sbin/multipath", "-v0", "-B"])
util.runCmd2(["/sbin/multipath", "-v0"])
time.sleep(1)
util.runCmd2(util.udevsettleCmd())

Expand Down
2 changes: 1 addition & 1 deletion init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def main(args):

try:
installer_version = subprocess.check_output(
['rpm', '-q', '--qf', '%{VERSION}-%{RELEASE}', 'host-installer'])
['rpm', '-q', '--qf', '%{VERSION}-%{RELEASE}', 'host-installer'], text=True)
except Exception:
installer_version = 'unknown'

Expand Down