Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tools 2624 dev build (DO NOT MERGE, TESTING) #64

Closed
wants to merge 2 commits into from
Closed

Tools 2624 dev build (DO NOT MERGE, TESTING) #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9229c7
fix: tools-2624 correctly set bin-list for each thread
dwelch-spike Jul 31, 2023
3ad6d16
fix test name
dwelch-spike Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/backup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2255,12 +2255,12 @@ init_scan_bins(char *bin_list, as_scan *scan)
as_vector bin_vec;
as_vector_inita(&bin_vec, sizeof (void *), 25);

if (bin_list[0] == 0) {
if (clone[0] == 0) {
err("Empty bin list");
goto cleanup1;
}

split_string(bin_list, ',', true, &bin_vec);
split_string(clone, ',', true, &bin_vec);

as_scan_select_init(scan, (uint16_t)bin_vec.size);

Expand Down
18 changes: 18 additions & 0 deletions test/integration/test_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,24 @@ def test_restore_bin_list():
restore_delay=1
)

def test_backup_bin_list_parallel():
"""
Tests the --bin-list backup option with --parallel.
Regression for tools-2624.
"""
backup_and_restore(
put_data,
None,
lambda context: check_data(context,
True, True, True,
True, True,
True, True, True,
True),
backup_opts=["--bin-list", "%s,%s" % (BIN_NAME_1, BIN_NAME_2)],
restore_opts=["--wait"],
restore_delay=1
)

def test_backup_no_records():
"""
Tests the --no-records backup option.
Expand Down
Loading