Commit bd275a93 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

import-export: Improve timeout error reporting



When the source cluster takes too long to create a snapshot, the
destination would time out. Unfortunately no good error message was
written unless debug logging was enabled, not even to the log file. This
will be improved with this patch.

Another patch to be backported from master will hopefully avoid this
situation completely.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 9d199a65
......@@ -271,10 +271,16 @@ def ProcessChildIO(child, socat_stderr_read_fd, dd_stderr_read_fd,
timeout = None
if listen_timeout and not exit_timeout:
assert mode == constants.IEM_IMPORT and options.connect_timeout
if status_file.GetConnected():
listen_timeout = None
elif listen_timeout.Remaining() < 0:
logging.info("Child process didn't establish connection in time")
errmsg = ("Child process didn't establish connection in time"
" (%0.0fs), sending SIGTERM" % options.connect_timeout)
logging.error(errmsg)
status_file.AddRecentOutput(errmsg)
status_file.Update(True)
child.Kill(signal.SIGTERM)
exit_timeout = \
locking.RunningTimeout(CHILD_LINGER_TIMEOUT, True)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment