Skip to content

Improve AuditLocationMetadataPostCheck coverage #11888

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

Merged
kakaiu merged 3 commits into from
Jan 18, 2025
Merged

Improve AuditLocationMetadataPostCheck coverage #11888

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e8159a
improve-auditLocationMetadataPostCheck-coverage
kakaiu Jan 15, 2025
d52f8a0
address comments
kakaiu Jan 17, 2025
6b7ac54
nit
kakaiu Jan 17, 2025
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
38 changes: 19 additions & 19 deletions fdbserver/MoveKeys.actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,11 @@ ACTOR Future<Void> auditLocationMetadataPreCheck(Database occ,

ACTOR Future<Void> auditLocationMetadataPostCheck(Database occ, KeyRange range, std::string context, UID dataMoveId) {
if (range.empty()) {
TraceEvent(SevWarn, "CheckLocationMetadataEmptyInputRange").detail("By", "PostCheck").detail("Range", range);
TraceEvent(g_network->isSimulated() ? SevError : SevWarnAlways, "CheckLocationMetadataEmptyInputRange")
.detail("By", "PostCheck")
.detail("Range", range)
.detail("Context", context)
.detail("DataMoveId", dataMoveId.toString());
return Void();
}
state std::vector<Future<Void>> actors;
Expand Down Expand Up @@ -1927,15 +1931,12 @@ ACTOR static Future<Void> startMoveShards(Database occ,
.detail("DataMove", dataMove.toString())
.detail("BulkLoadTaskState", bulkLoadTaskState.present() ? bulkLoadTaskState.get().toString() : "");

// Post validate consistency of update of keyServers and serverKeys
if (SERVER_KNOBS->AUDIT_DATAMOVE_POST_CHECK) {
if (!currentKeys.empty()) {
wait(auditLocationMetadataPostCheck(occ, currentKeys, "startMoveShards_postcheck", dataMoveId));
}
}

dataMove = DataMoveMetaData();
if (currentKeys.end == keys.end) {
// Post validate consistency of update of keyServers and serverKeys
if (SERVER_KNOBS->AUDIT_DATAMOVE_POST_CHECK) {
wait(auditLocationMetadataPostCheck(occ, keys, "startMoveShards_postcheck", dataMoveId));
}
break;
}
} catch (Error& e) {
Expand Down Expand Up @@ -2355,13 +2356,12 @@ ACTOR static Future<Void> finishMoveShards(Database occ,

wait(tr.commit());

// Post validate consistency of update of keyServers and serverKeys
if (SERVER_KNOBS->AUDIT_DATAMOVE_POST_CHECK) {
wait(auditLocationMetadataPostCheck(
occ, range, "finishMoveShards_postcheck", relocationIntervalId));
}

if (range.end == dataMove.ranges.front().end) {
// Post validate consistency of update of keyServers and serverKeys
if (SERVER_KNOBS->AUDIT_DATAMOVE_POST_CHECK) {
wait(auditLocationMetadataPostCheck(
occ, dataMove.ranges.front(), "finishMoveShards_postcheck", relocationIntervalId));
}
break;
}
} else {
Expand Down Expand Up @@ -3151,12 +3151,12 @@ ACTOR Future<Void> cleanUpDataMoveCore(Database occ,
.detail("DataMoveID", dataMoveId)
.detail("Range", range);

// Post validate consistency of update of keyServers and serverKeys
if (SERVER_KNOBS->AUDIT_DATAMOVE_POST_CHECK) {
wait(auditLocationMetadataPostCheck(occ, range, "cleanUpDataMoveCore_postcheck", dataMoveId));
}

if (range.end == dataMove.ranges.front().end) {
// Post validate consistency of update of keyServers and serverKeys
if (SERVER_KNOBS->AUDIT_DATAMOVE_POST_CHECK) {
wait(auditLocationMetadataPostCheck(
occ, dataMove.ranges.front(), "cleanUpDataMoveCore_postcheck", dataMoveId));
}
break;
}
} catch (Error& e) {
Expand Down