diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2019-12-04 15:53:16 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2019-12-05 15:09:17 +0000 |
| commit | 0c9a1f0cb98c5256a0ec1dec83b7c94d3bb39170 (patch) | |
| tree | 718919ef0c18a0326535757ff2ce5593256c9480 | |
| parent | e4ece6569221f1833d3fb621c26f19c23662b329 (diff) | |
| download | sos-0c9a1f0cb98c5256a0ec1dec83b7c94d3bb39170.tar.gz | |
[ovn_central] call podman exec without a timeout
This is a workaround fix of a podman bug (see rhbz1732525) where
"podman ps" can hang when "podman exec .." is invoked in detached
mode under "timeout".
Calling it without timeout works fine.
This commit can be reverted once the podman bug is fixed.
Resolves: #1875
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/plugins/ovn_central.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sos/plugins/ovn_central.py b/sos/plugins/ovn_central.py index c74bf403..32a5e1cb 100644 --- a/sos/plugins/ovn_central.py +++ b/sos/plugins/ovn_central.py @@ -26,7 +26,8 @@ class OVNCentral(Plugin): if self._container_name: cmd = "%s exec %s cat %s" % ( self._container_runtime, self._container_name, filename) - res = self.exec_cmd(cmd) + # the timeout=None is just a workaround for "podman ps" hung bug + res = self.exec_cmd(cmd, timeout=None) if res['status'] != 0: self._log_error("Could not retrieve DB schema file from " "container %s" % self._container_name) @@ -118,7 +119,8 @@ class OVNCentral(Plugin): self._container_name, cmd) for cmd in cmds] - self.add_cmd_output(cmds) + # the timeout=None is just a workaround for "podman ps" hung bug + self.add_cmd_output(cmds, timeout=None) self.add_copy_spec("/etc/sysconfig/ovn-northd") |