Skip to content

Commit

Permalink
[ovn_central] call podman exec without a timeout
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
pmoravec authored and bmr-cymru committed Dec 5, 2019
1 parent e4ece65 commit 0c9a1f0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions sos/plugins/ovn_central.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ def get_tables_from_schema(self, filename, skip=[]):
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)
Expand Down Expand Up @@ -118,7 +119,8 @@ def setup(self):
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")

Expand Down

0 comments on commit 0c9a1f0

Please sign in to comment.