DGNum/netbox-agent
6
0
Fork 0
Code Issues 28 Pull requests 9 Projects Releases 14 Packages Wiki Activity Actions

fix: deadlock storcli inventory

Browse source 
When there is a lot of data return by storcli due to a lot of disk, the inventory was in deadlock
Its a known problem, see:
https://docs.python.org/3/library/subprocess.html#subprocess.Popen.wait
This commit is contained in:
Cyril Levis 2022-11-30 09:49:51 +01:00
parent 5b0df6ca05
commit bf65da0c58
No known key found for this signature in database
GPG key ID: 6DB88737C11F5A48
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
netbox_agent/raid/storcli.py
View file

@ -21,14 +21,17 @@ def storecli(sub_command):
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT stderr=subprocess.STDOUT
) )
p.wait()
stdout = p.stdout.read().decode("utf-8") stdout, stderr = p.communicate()
if p.returncode != 0: if stderr:
mesg = "Failed to execute command '{}':\n{}".format( mesg = "Failed to execute command '{}':\n{}".format(
" ".join(command), stdout " ".join(command), stdout
) )
raise StorcliControllerError(mesg) raise StorcliControllerError(mesg)
stdout = stdout.decode("utf-8")
data = json.loads(stdout) data = json.loads(stdout)
controllers = dict([ controllers = dict([
( (
c['Command Status']['Controller'], c['Command Status']['Controller'],