Commit aed6d64
committed
Improve Docker container timeout and error handling
Improvements:
1. Added intelligent timeout detection based on test-time parameter
- Extracts test-time from command line (both --test-time and -test-time)
- Sets container timeout to test-time + 60s buffer
- Logs timeout information for debugging
2. Enhanced thread timeout management
- Added 5-minute default timeout for thread.join()
- Prevents indefinite hanging when containers don't complete
- Logs timeout errors for better debugging
3. Improved Docker error reporting
- Added specific Docker/container error detection
- Logs full command, image, and tool information on Docker errors
- Includes command in error result for better debugging
4. Fixed Docker API compatibility
- Removed unsupported 'timeout' parameter from containers.run()
- Uses thread-level timeout management instead
Testing Results:
- Timeout issues resolved: Tests complete in reasonable time (142s vs 2+ min hanging)
- Better error reporting: Clear distinction between Docker and tool errors
- pubsub-sub-bench integration working correctly (errors are Redis connection issues, not code issues)
- Both memtier and pubsub-sub-bench tools execute and complete properly
The runner now handles mixed workloads reliably with proper timeout management.1 parent 345ae39 commit aed6d64
1 file changed
+26
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
214 | 227 | | |
215 | 228 | | |
216 | 229 | | |
| |||
239 | 252 | | |
240 | 253 | | |
241 | 254 | | |
242 | | - | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
243 | 261 | | |
244 | 262 | | |
245 | 263 | | |
246 | 264 | | |
247 | 265 | | |
248 | 266 | | |
249 | 267 | | |
| 268 | + | |
250 | 269 | | |
251 | 270 | | |
252 | 271 | | |
| |||
263 | 282 | | |
264 | 283 | | |
265 | 284 | | |
266 | | - | |
| 285 | + | |
| 286 | + | |
267 | 287 | | |
268 | | - | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
269 | 292 | | |
270 | 293 | | |
271 | 294 | | |
| |||
0 commit comments