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

[3.2] Fix multithreaded Snapshot test Failure #146

Merged
merged 2 commits into from
Sep 12, 2022
Merged

[3.2] Fix multithreaded Snapshot test Failure #146

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
bdfba67
use pid to avoid collision in snapshot tests when running multithreaded.
ClaytonCalabrese Sep 12, 2022
636c0f5
GH-134 Use file under temp dir.
heifner Sep 12, 2022
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 libraries/testing/include/eosio/testing/snapshot_suites.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ struct json_snapshot_suite {

static std::string temp_file() {
static fc::temp_directory temp_dir;
std::string temp_file = temp_dir.path().string() + "temp.bin.json";
return temp_file;
auto temp_file = temp_dir.path() / "temp.bin.json";
return temp_file.string();
}

struct reader : public reader_t {
Expand Down
23 changes: 14 additions & 9 deletions unittests/snapshot_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,36 +566,41 @@ BOOST_AUTO_TEST_CASE(json_snapshot_validity_test)
chain.produce_blocks(10);
chain.control->abort_block();

auto pid_string = std::to_string(getpid());
auto bin_file = pid_string + "BinSnapshot";
auto json_file = pid_string + "JsonSnapshot";
auto bin_from_json_file = pid_string + "BinFromJsonSnapshot";

// create bin snapshot
auto writer_bin = buffered_snapshot_suite::get_writer();
chain.control->write_snapshot(writer_bin);
auto snapshot_bin = buffered_snapshot_suite::finalize(writer_bin);
buffered_snapshot_suite::write_to_file("BinSnapshot", snapshot_bin);
buffered_snapshot_suite::write_to_file(bin_file, snapshot_bin);

// create json snapshot
auto writer_json = json_snapshot_suite::get_writer();
chain.control->write_snapshot(writer_json);
auto snapshot_json = json_snapshot_suite::finalize(writer_json);
json_snapshot_suite::write_to_file("JsonSnapshot", snapshot_json);
json_snapshot_suite::write_to_file(json_file, snapshot_json);

// load bin snapshot
auto snapshot_bin_read = buffered_snapshot_suite::load_from_file("BinSnapshot");
auto snapshot_bin_read = buffered_snapshot_suite::load_from_file(bin_file);
auto reader_bin = buffered_snapshot_suite::get_reader(snapshot_bin_read);
snapshotted_tester tester_bin(chain.get_config(), reader_bin, ordinal++);

// load json snapshot
auto snapshot_json_read = json_snapshot_suite::load_from_file("JsonSnapshot");
auto snapshot_json_read = json_snapshot_suite::load_from_file(json_file);
auto reader_json = json_snapshot_suite::get_reader(snapshot_json_read);
snapshotted_tester tester_json(chain.get_config(), reader_json, ordinal++);

// create bin snapshot from loaded json snapshot
auto writer_bin_from_json = buffered_snapshot_suite::get_writer();
tester_json.control->write_snapshot(writer_bin_from_json);
auto snapshot_bin_from_json = buffered_snapshot_suite::finalize(writer_bin_from_json);
buffered_snapshot_suite::write_to_file("BinFromJsonSnapshot", snapshot_bin_from_json);
buffered_snapshot_suite::write_to_file(bin_from_json_file, snapshot_bin_from_json);

// load new bin snapshot
auto snapshot_bin_from_json_read = buffered_snapshot_suite::load_from_file("BinFromJsonSnapshot");
auto snapshot_bin_from_json_read = buffered_snapshot_suite::load_from_file(bin_from_json_file);
auto reader_bin_from_json = buffered_snapshot_suite::get_reader(snapshot_bin_from_json_read);
snapshotted_tester tester_bin_from_json(chain.get_config(), reader_bin_from_json, ordinal++);

Expand All @@ -604,9 +609,9 @@ BOOST_AUTO_TEST_CASE(json_snapshot_validity_test)
verify_integrity_hash<buffered_snapshot_suite>(*tester_bin_from_json.control, *tester_json.control);
verify_integrity_hash<buffered_snapshot_suite>(*tester_json.control, *tester_bin.control);

auto bin_snap_path = bfs::path(snapshot_file<snapshot::binary>::base_path) / "BinSnapshot.bin.gz";
auto bin_from_json_snap_path = bfs::path(snapshot_file<snapshot::binary>::base_path) / "BinFromJsonSnapshot.bin.gz";
auto json_snap_path = bfs::path(snapshot_file<snapshot::binary>::base_path) / "JsonSnapshot.bin.json.gz";
auto bin_snap_path = bfs::path(snapshot_file<snapshot::binary>::base_path) / bin_file;
auto bin_from_json_snap_path = bfs::path(snapshot_file<snapshot::binary>::base_path) / bin_from_json_file;
auto json_snap_path = bfs::path(snapshot_file<snapshot::json>::base_path) / json_file;
remove(bin_snap_path);
remove(bin_from_json_snap_path);
remove(json_snap_path);
Expand Down