dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor refactor with printing stdout in blackbox tests (#12350) 

Summary:
As title. Adding a missing stdout printing in `blackbox_crash_main()`

# Test

**Blackbox**
```
$> python3 tools/db_crashtest.py blackbox --simple --max_key=25000000 --write_buffer_size=4194304
```
```
...
stdout:
 Choosing random keys with no overwrite
DB path: [/tmp/jewoongh/rocksdb_crashtest_blackbox34jwn9of]
(Re-)verified 0 unique IDs
2024/02/13-12:27:33  Initializing worker threads
Crash-recovery verification passed :)
2024/02/13-12:27:36  Starting database operations
...
jewoongh stdout test
jewoongh stdout test
...
jewoongh stdout test
stderr:
 jewoongh injected error
```

**Whitebox**
```
$> python3 tools/db_crashtest.py whitebox --simple --max_key=25000000 --write_buffer_size=4194304
```
```
...
stdout:
 Choosing random keys with no overwrite
Creating 24415 locks
...
2024/02/13-12:31:51  Initializing worker threads
Crash-recovery verification passed :)
2024/02/13-12:31:54  Starting database operations
jewoongh stdout test
jewoongh stdout test
jewoongh stdout test
...
stderr:
 jewoongh injected error
...
```

Pull Request resolved: https://github.com/facebook/rocksdb/pull/12350

Reviewed By: akankshamahajan15, cbi42

Differential Revision: D53728910

Pulled By: jaykorean

fbshipit-source-id: ec90ed3b5e6a1102d1fb55d357d0371e5072a173
This commit is contained in:
Jay Huh 2024-02-13 14:15:52 -08:00 committed by Facebook GitHub Bot
parent 10d02456b6
commit 8c7c0a38f1
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/db_crashtest.py
View File

@ -836,15 +836,15 @@ def execute_cmd(cmd, timeout=None):
return hit_timeout, child.returncode, outs.decode("utf-8"), errs.decode("utf-8")
def exit_if_stderr_has_errors(stderr, print_stderr_separately=False):
def print_output_and_exit_on_error(stdout, stderr, print_stderr_separately=False):
print("stdout:\n", stdout)
if len(stderr) == 0:
return
if print_stderr_separately:
print("stderr has error message: \n", file=sys.stderr)
print(stderr, file=sys.stderr)
print("stderr:\n", stderr, file=sys.stderr)
else:
print("stderr has error message: \n" + stderr)
print("stderr:\n", stderr)
sys.exit(2)
@ -883,12 +883,10 @@ def blackbox_crash_main(args, unknown_args):
if not hit_timeout:
print("Exit Before Killing")
print("stdout:")
print(outs)
exit_if_stderr_has_errors(errs, args.print_stderr_separately)
print_output_and_exit_on_error(outs, errs, args.print_stderr_separately)
sys.exit(2)
exit_if_stderr_has_errors(errs, args.print_stderr_separately)
print_output_and_exit_on_error(outs, errs, args.print_stderr_separately)
time.sleep(1) # time to stabilize before the next run
@ -905,11 +903,8 @@ def blackbox_crash_main(args, unknown_args):
)
hit_timeout, retcode, outs, errs = execute_cmd(cmd)
# Print stats of the final run
print("stdout:", outs)
# Print stderr of the final run
exit_if_stderr_has_errors(errs, args.print_stderr_separately)
# For the final run
print_output_and_exit_on_error(outs, errs, args.print_stderr_separately)
# we need to clean up after ourselves -- only do this on test success
cleanup_after_success(dbname)
@ -1053,8 +1048,7 @@ def whitebox_crash_main(args, unknown_args):
)
print(msg)
print(stdoutdata)
exit_if_stderr_has_errors(stderrdata, args.print_stderr_separately)
print_output_and_exit_on_error(stdoutdata, stderrdata, args.print_stderr_separately)
if hit_timeout:
print("Killing the run for running too long")