Skip to content

Commit f0ebdb8

Browse files
jzhou77spraza
authored andcommitted
Fix restarting test failures (#12324)
7.4.3 was used as old binary and the error is invalid_tuple_data_type.
1 parent 64e4b01 commit f0ebdb8

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

fdbserver/include/fdbserver/DDTeamCollection.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,11 +681,11 @@ class DDTeamCollection : public ReferenceCounted<DDTeamCollection> {
681681
std::map<Standalone<StringRef>, Reference<TCMachineInfo>> machine_info;
682682
std::vector<Reference<TCMachineTeamInfo>> machineTeams; // all machine teams
683683

684-
// IMPORTANT: teams and teamsByServerIDs MUST be consistency, so any time we
684+
// IMPORTANT: teams and teamsByServerIDs MUST be consistent, so any time we
685685
// mutate teams, we must also mutate teamsByServerIDs
686686
std::vector<Reference<TCTeamInfo>> teams;
687-
// O(1) lookup index for getTeamByServers; key is the sorted server IDs string
688-
// from TCTeamInfo::getServerIDsStr()
687+
// O(1) hash map from server ID string to team information
688+
// Currently used by getTeamByServers
689689
std::unordered_map<std::string, Reference<TCTeamInfo>> teamsByServerIDs;
690690

691691
std::vector<DDTeamCollection*> teamCollections;

tests/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,14 +426,14 @@ if(WITH_PYTHON)
426426
TEST_FILES restarting/from_7.3.50_until_7.4.0/SnapTestRestart-1.toml
427427
restarting/from_7.3.50_until_7.4.0/SnapTestRestart-2.toml)
428428
add_fdb_test(
429-
TEST_FILES restarting/from_7.3.50/ClientTransactionProfilingCorrectness-1.toml
430-
restarting/from_7.3.50/ClientTransactionProfilingCorrectness-2.toml)
429+
TEST_FILES restarting/from_7.3.50_until_7.4.0/ClientTransactionProfilingCorrectness-1.toml
430+
restarting/from_7.3.50_until_7.4.0/ClientTransactionProfilingCorrectness-2.toml)
431431
add_fdb_test(
432432
TEST_FILES restarting/from_7.3.50/CycleTestRestart-1.toml
433433
restarting/from_7.3.50/CycleTestRestart-2.toml)
434434
add_fdb_test(
435-
TEST_FILES restarting/from_7.3.50/StorefrontTestRestart-1.toml
436-
restarting/from_7.3.50/StorefrontTestRestart-2.toml)
435+
TEST_FILES restarting/from_7.3.50_until_7.4.0/StorefrontTestRestart-1.toml
436+
restarting/from_7.3.50_until_7.4.0/StorefrontTestRestart-2.toml)
437437
add_fdb_test(
438438
TEST_FILES restarting/from_7.3.50/ClientMetricRestart-1.toml
439439
restarting/from_7.3.50/ClientMetricRestart-2.toml)

tests/restarting/from_7.3.50/ClientTransactionProfilingCorrectness-1.toml renamed to tests/restarting/from_7.3.50_until_7.4.0/ClientTransactionProfilingCorrectness-1.toml

File renamed without changes.

tests/restarting/from_7.3.50/ClientTransactionProfilingCorrectness-2.toml renamed to tests/restarting/from_7.3.50_until_7.4.0/ClientTransactionProfilingCorrectness-2.toml

File renamed without changes.

tests/restarting/from_7.3.50/StorefrontTestRestart-1.toml renamed to tests/restarting/from_7.3.50_until_7.4.0/StorefrontTestRestart-1.toml

File renamed without changes.

tests/restarting/from_7.3.50/StorefrontTestRestart-2.toml renamed to tests/restarting/from_7.3.50_until_7.4.0/StorefrontTestRestart-2.toml

File renamed without changes.

0 commit comments

Comments
 (0)