From: Ian Jackson Date: Thu, 20 May 2021 02:10:30 +0000 (+0100) Subject: cmdlistener: Add a command about timeouts and bundle processing X-Git-Tag: otter-0.6.0~115 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c7e47d9109a831d97a26bc55dba354fb10468620;p=otter.git cmdlistener: Add a command about timeouts and bundle processing Signed-off-by: Ian Jackson --- diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index 363ab057..309ca628 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -266,6 +266,11 @@ fn execute_and_respond(cs: &mut CommandStreamData, cmd: MgmtCommand, )? }; bulk_upload.inner_mut().set_timeout(Some(UPLOAD_TIMEOUT)); + // If the timeout fires after the bulk data has all arrived, it + // won't take effect, because: it only takes effect when we try + // to read from the stresm, and after we have the data, we + // won't read again until we go on to the next command - which + // will have its own timeout. let uploaded = upload.bulk(bulk_upload, size, &hash, progress, &mut for_response)?; let bundle = {