wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bulkload valgrind issue (#11527)

This commit is contained in:
Zhe Wang 2024-07-25 00:29:33 -07:00 committed by GitHub
parent 1eaf861c3a
commit 81dde9216e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdbclient/include/fdbclient/BulkLoading.h
View File

@ -186,7 +186,7 @@ struct BulkLoadState {
}
// Updated by DD
BulkLoadPhase phase;
BulkLoadPhase phase = BulkLoadPhase::Invalid;
double submitTime = 0;
double triggerTime = 0;
double startTime = 0;
@ -198,9 +198,9 @@ private:
UID taskId; // Unique ID of the task
KeyRange range; // Load the key-value within this range "[begin, end)" from data file
// File inject config
BulkLoadType loadType;
BulkLoadTransportMethod transportMethod;
BulkLoadInjectMethod injectMethod;
BulkLoadType loadType = BulkLoadType::Invalid;
BulkLoadTransportMethod transportMethod = BulkLoadTransportMethod::Invalid;
BulkLoadInjectMethod injectMethod = BulkLoadInjectMethod::Invalid;
// Folder includes all files to be injected
std::string folder;
// Files to inject

2
fdbserver/include/fdbserver/DataDistribution.actor.h
View File

@ -532,7 +532,7 @@ struct TeamCollectionInterface {
struct DDBulkLoadTask {
BulkLoadState coreState;
Version commitVersion;
Version commitVersion = invalidVersion;
Promise<Void> completeAck; // satisfied when a data move for this task completes for the first time, where the task
// metadata phase has been complete

2
fdbserver/include/fdbserver/RocksDBCheckpointUtils.actor.h
View File

@ -66,7 +66,7 @@ struct CheckpointFile {
constexpr static FileIdentifier file_identifier = 13804348;
std::string path;
KeyRange range;
int64_t size; // Logical bytes of the checkpoint.
int64_t size = 0; // Logical bytes of the checkpoint.
CheckpointFile() = default;
CheckpointFile(std::string path, KeyRange range, int64_t size) : path(path), range(range), size(size) {}

5
fdbserver/storageserver.actor.cpp
View File

@ -9201,8 +9201,6 @@ ACTOR Future<Void> fetchShardFetchBulkLoadSSTFiles(StorageServer* data,
localRecord.ranges = moveInShard->ranges();
RocksDBCheckpointKeyValues rcp({ bulkLoadState.getRange() });
for (const auto& filePath : fileSetToLoad.dataFileList) {
CheckpointFile cpFile;
cpFile.path = abspath(filePath);
std::vector<KeyRange> coalesceRanges = coalesceRangeList(moveInShard->ranges());
if (coalesceRanges.size() != 1) {
TraceEvent(SevError, "SSBulkLoadTaskFetchSSTFileError", data->thisServerID)
@ -9212,8 +9210,7 @@ ACTOR Future<Void> fetchShardFetchBulkLoadSSTFiles(StorageServer* data,
.detail("FileSetToLoad", fileSetToLoad.toString());
}
// TODO(BulkLoad): set loading file size --- logging purpose
cpFile.range = coalesceRanges[0];
rcp.fetchedFiles.push_back(cpFile);
rcp.fetchedFiles.emplace_back(abspath(filePath), coalesceRanges[0], 0);
}
localRecord.serializedCheckpoint = ObjectWriter::toValue(rcp, IncludeVersion());
localRecord.version = 0;