diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:36:56 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:36:56 +0000 |
| commit | c924af26fdd046d158fd50575583ea6a31e725ea (patch) | |
| tree | 6c1b4f986efda4c195d8001e08813b5c3c6d7162 | |
| parent | be3a14f5f223f7997f3f44bddf5a13fcc44b8c59 (diff) | |
Add missing timeouts in StreamableMemBlock::Set and testbbackupd.
Reduces warnings about network operations with no timeout. May prevent some
hangs that might have occurred waiting forever for network data in the past.
| -rw-r--r-- | lib/common/StreamableMemBlock.cpp | 4 | ||||
| -rw-r--r-- | test/bbackupd/testbbackupd.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/common/StreamableMemBlock.cpp b/lib/common/StreamableMemBlock.cpp index be3d0031..9abf78d3 100644 --- a/lib/common/StreamableMemBlock.cpp +++ b/lib/common/StreamableMemBlock.cpp @@ -125,7 +125,9 @@ void StreamableMemBlock::Set(IOStream &rStream, int Timeout) try { // Read in - if(!rStream.ReadFullBuffer(pblock, size, 0 /* not interested in bytes read if this fails */)) + if(!rStream.ReadFullBuffer(pblock, size, + 0 /* not interested in bytes read if this fails */, + Timeout)) { THROW_EXCEPTION(CommonException, StreamableMemBlockIncompleteRead) } diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index 7dd1b2c5..6834b482 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -87,6 +87,7 @@ // two cycles and a bit #define TIME_TO_WAIT_FOR_BACKUP_OPERATION 12 +#define SHORT_TIMEOUT 5000 std::string current_test_name; std::map<std::string, std::string> s_test_status; @@ -777,7 +778,7 @@ std::auto_ptr<BackupStoreDirectory> ReadDirectory std::auto_ptr<BackupProtocolSuccess> dirreply( rClient.QueryListDirectory(id, false, 0, false)); std::auto_ptr<BackupStoreDirectory> apDir( - new BackupStoreDirectory(rClient.ReceiveStream())); + new BackupStoreDirectory(rClient.ReceiveStream(), SHORT_TIMEOUT)); return apDir; } |