Commit f8ae46b
committed
fix(harness): prevent pipe deadlock in LocalFilesystemWithShell.execute
Drain stdout/stderr on daemon threads concurrently with Process.waitFor.
Previously a child writing more than the OS pipe buffer (~4 KB on Windows,
64 KB on Linux) blocked in write() while the parent blocked in waitFor(),
deadlocking until the command was forcibly killed and misreported as a
timeout (exit 124).
Mirrors the fix already applied to ShellCommandTool in agentscope-core.
Adds a regression test that prints ~70 KB from the shell and asserts the
command completes with exit 0 and full output.
Fixes #28381 parent 84e60ac commit f8ae46b
2 files changed
Lines changed: 79 additions & 3 deletions
File tree
- agentscope-harness/src
- main/java/io/agentscope/harness/agent/filesystem/local
- test/java/io/agentscope/harness/agent/filesystem/local
Lines changed: 50 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
| 26 | + | |
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
| |||
335 | 337 | | |
336 | 338 | | |
337 | 339 | | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
338 | 349 | | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
339 | 355 | | |
340 | 356 | | |
341 | | - | |
342 | | - | |
| 357 | + | |
| 358 | + | |
343 | 359 | | |
344 | 360 | | |
345 | | - | |
346 | 361 | | |
347 | 362 | | |
348 | 363 | | |
| |||
432 | 447 | | |
433 | 448 | | |
434 | 449 | | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
435 | 482 | | |
436 | 483 | | |
437 | 484 | | |
| |||
Lines changed: 29 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
| 24 | + | |
22 | 25 | | |
| 26 | + | |
23 | 27 | | |
24 | 28 | | |
25 | 29 | | |
| |||
41 | 45 | | |
42 | 46 | | |
43 | 47 | | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
44 | 73 | | |
0 commit comments