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

Fix warning on -Wformat

This commit is contained in:
Meng Xu 2019-04-09 15:00:12 -07:00
parent 3ffdd115e7
commit aac90c81c7
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fdbserver/QuietDatabase.actor.cpp
View File

@ -96,7 +96,7 @@ ACTOR Future<int64_t> getDataInFlight( Database cx, WorkerInterface distributorW
TraceEventFields md = wait( timeoutError(distributorWorker.eventLogRequest.getReply(
EventLogRequest( LiteralStringRef("TotalDataInFlight") ) ), 1.0 ) );
int64_t dataInFlight;
sscanf(md.getValue("TotalBytes").c_str(), "%lld", &dataInFlight);
sscanf(md.getValue("TotalBytes").c_str(), "%ld", &dataInFlight);
return dataInFlight;
} catch( Error &e ) {
TraceEvent("QuietDatabaseFailure", distributorWorker.id()).error(e).detail("Reason", "Failed to extract DataInFlight");
@ -118,8 +118,8 @@ int64_t getQueueSize( const TraceEventFields& md ) {
double inputRoughness, durableRoughness;
int64_t inputBytes, durableBytes;
sscanf(md.getValue("BytesInput").c_str(), "%lf %lf %lld", &inputRate, &inputRoughness, &inputBytes);
sscanf(md.getValue("BytesDurable").c_str(), "%lf %lf %lld", &durableRate, &durableRoughness, &durableBytes);
sscanf(md.getValue("BytesInput").c_str(), "%lf %lf %ld", &inputRate, &inputRoughness, &inputBytes);
sscanf(md.getValue("BytesDurable").c_str(), "%lf %lf %ld", &durableRate, &durableRoughness, &durableBytes);
return inputBytes - durableBytes;
}
@ -239,11 +239,11 @@ ACTOR Future<int64_t> getDataDistributionQueueSize( Database cx, WorkerInterface
TraceEvent("DataDistributionQueueSize").detail("Stage", "GotString");
int64_t inQueue;
sscanf(movingDataMessage.getValue("InQueue").c_str(), "%lld", &inQueue);
sscanf(movingDataMessage.getValue("InQueue").c_str(), "%ld", &inQueue);
if(reportInFlight) {
int64_t inFlight;
sscanf(movingDataMessage.getValue("InFlight").c_str(), "%lld", &inFlight);
sscanf(movingDataMessage.getValue("InFlight").c_str(), "%ld", &inFlight);
inQueue += inFlight;
}
@ -281,16 +281,16 @@ ACTOR Future<bool> getTeamCollectionValid(Database cx, WorkerInterface dataDistr
int64_t healthyMachineTeamCount;
int64_t desiredMachineTeamNumber;
int64_t maxMachineTeamNumber;
sscanf(teamCollectionInfoMessage.getValue("CurrentTeamNumber").c_str(), "%lld", &currentTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("DesiredTeamNumber").c_str(), "%lld", &desiredTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("MaxTeamNumber").c_str(), "%lld", &maxTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("CurrentMachineTeamNumber").c_str(), "%lld",
sscanf(teamCollectionInfoMessage.getValue("CurrentTeamNumber").c_str(), "%ld", &currentTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("DesiredTeamNumber").c_str(), "%ld", &desiredTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("MaxTeamNumber").c_str(), "%ld", &maxTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("CurrentMachineTeamNumber").c_str(), "%ld",
&currentMachineTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("CurrentHealthyMachineTeamNumber").c_str(), "%lld",
sscanf(teamCollectionInfoMessage.getValue("CurrentHealthyMachineTeamNumber").c_str(), "%ld",
&healthyMachineTeamCount);
sscanf(teamCollectionInfoMessage.getValue("DesiredMachineTeams").c_str(), "%lld",
sscanf(teamCollectionInfoMessage.getValue("DesiredMachineTeams").c_str(), "%ld",
&desiredMachineTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("MaxMachineTeams").c_str(), "%lld", &maxMachineTeamNumber);
sscanf(teamCollectionInfoMessage.getValue("MaxMachineTeams").c_str(), "%ld", &maxMachineTeamNumber);
// Team number is always valid when we disable teamRemover. This avoids false positive in simulation test
if (SERVER_KNOBS->TR_FLAG_DISABLE_TEAM_REMOVER) {

19
fdbserver/Restore.actor.cpp
View File

@ -1931,7 +1931,7 @@ ACTOR static Future<Void> collectBackupFiles(Reference<RestoreData> rd, Database
}
if (!rd->files.empty()) {
printf("[WARNING] global files are not empty! files.size()=%d. We forcely clear files\n", rd->files.size());
printf("[WARNING] global files are not empty! files.size() is %d. We forcely clear files\n", rd->files.size());
rd->files.clear();
}
@ -2069,13 +2069,13 @@ ACTOR static Future<Void> sampleWorkload(Reference<RestoreData> rd, RestoreReque
param.removePrefix = removePrefix;
param.mutationLogPrefix = mutationLogPrefix;
if ( !(param.length > 0 && param.offset >= 0 && param.offset < rd->files[curFileIndex].fileSize) ) {
printf("[ERROR] param: length:%d offset:%d fileSize:%d for %dth file:%s\n",
printf("[ERROR] param: length:%ld offset:%ld fileSize:%ld for %dlth file:%s\n",
param.length, param.offset, rd->files[curFileIndex].fileSize, curFileIndex,
rd->files[curFileIndex].toString().c_str());
}
printf("[Sampling][File:%d] filename:%s offset:%d blockSize:%d filesize:%d loadSize:%dB sampleIndex:%d\n",
printf("[Sampling][File:%ld] filename:%s offset:%ld blockSize:%ld filesize:%ld loadSize:%dB sampleIndex:%ld\n",
curFileIndex, rd->files[curFileIndex].fileName.c_str(), curFileOffset,
rd->files[curFileIndex].blockSize, rd->files[curFileIndex].fileSize,
loadSizeB, sampleIndex);
@ -2149,7 +2149,7 @@ ACTOR static Future<Void> sampleWorkload(Reference<RestoreData> rd, RestoreReque
rd->cmdID = checkpointCMDUID;
curFileIndex = checkpointCurFileIndex;
curFileOffset = checkpointCurFileOffset;
printf("[Sampling][Waring] Retry at CMDID:%s curFileIndex:%d\n", rd->cmdID.toString().c_str(), curFileIndex);
printf("[Sampling][Waring] Retry at CMDID:%s curFileIndex:%ld\n", rd->cmdID.toString().c_str(), curFileIndex);
}
}
@ -2346,7 +2346,7 @@ ACTOR static Future<Void> distributeWorkloadPerVersionBatch(RestoreInterface int
for (auto &loaderID : loaderIDs) {
while ( rd->files[curFileIndex].fileSize == 0 && curFileIndex < rd->files.size()) {
// NOTE: && rd->files[curFileIndex].cursor >= rd->files[curFileIndex].fileSize
printf("[INFO] File %d:%s filesize:%d skip the file\n", curFileIndex,
printf("[INFO] File %ld:%s filesize:%ld skip the file\n", curFileIndex,
rd->files[curFileIndex].fileName.c_str(), rd->files[curFileIndex].fileSize);
curFileIndex++;
}
@ -2369,7 +2369,7 @@ ACTOR static Future<Void> distributeWorkloadPerVersionBatch(RestoreInterface int
param.removePrefix = removePrefix;
param.mutationLogPrefix = mutationLogPrefix;
if ( !(param.length > 0 && param.offset >= 0 && param.offset < rd->files[curFileIndex].fileSize) ) {
printf("[ERROR] param: length:%d offset:%d fileSize:%d for %dth filename:%s\n",
printf("[ERROR] param: length:%ld offset:%ld fileSize:%ld for %ldth filename:%s\n",
param.length, param.offset, rd->files[curFileIndex].fileSize, curFileIndex,
rd->files[curFileIndex].fileName.c_str());
}
@ -2385,7 +2385,7 @@ ACTOR static Future<Void> distributeWorkloadPerVersionBatch(RestoreInterface int
ASSERT(rd->workers_interface.find(nodeID) != rd->workers_interface.end());
RestoreInterface& cmdInterf = rd->workers_interface[nodeID];
printf("[CMD] Loading fileIndex:%d fileInfo:%s loadingParam:%s on node %s\n",
printf("[CMD] Loading fileIndex:%ld fileInfo:%s loadingParam:%s on node %s\n",
curFileIndex, rd->files[curFileIndex].toString().c_str(),
param.toString().c_str(), nodeID.toString().c_str()); // VERY USEFUL INFO
@ -2556,7 +2556,6 @@ ACTOR Future<Void> _restoreWorker(Database cx_input, LocalityData locality) {
state Database cx = cx_input;
state RestoreInterface interf;
interf.initEndpoints();
interf.initNodeID();
state Optional<RestoreInterface> leaderInterf;
//Global data for the worker
state Reference<RestoreData> rd = Reference<RestoreData>(new RestoreData());
@ -3004,12 +3003,12 @@ ACTOR static Future<Version> processRestoreRequest(RestoreInterface interf, Refe
isRange = rd->allFiles[curBackupFilesEndIndex].isRange;
validVersion = !isVersionInForbiddenRange(rd, endVersion, isRange);
curWorkloadSize += rd->allFiles[curBackupFilesEndIndex].fileSize;
printf("[DEBUG][Batch:%d] Calculate backup files for a version batch: endVersion:%lld isRange:%d validVersion:%d curWorkloadSize:%.2fB curBackupFilesBeginIndex:%d curBackupFilesEndIndex:%d, files.size:%d\n",
printf("[DEBUG][Batch:%d] Calculate backup files for a version batch: endVersion:%lld isRange:%d validVersion:%d curWorkloadSize:%.2fB curBackupFilesBeginIndex:%ld curBackupFilesEndIndex:ld, files.size:%d\n",
restoreBatchIndex, endVersion, isRange, validVersion, curWorkloadSize, curBackupFilesBeginIndex, curBackupFilesEndIndex, rd->allFiles.size());
}
if ( (validVersion && curWorkloadSize >= loadBatchSizeThresholdB) || curBackupFilesEndIndex >= rd->allFiles.size() ) {
if ( curBackupFilesEndIndex >= rd->allFiles.size() && curWorkloadSize <= 0 ) {
printf("Restore finishes: curBackupFilesEndIndex:%d, allFiles.size:%d, curWorkloadSize:%.2f\n",
printf("Restore finishes: curBackupFilesEndIndex:%ld, allFiles.size:%d, curWorkloadSize:%.2f\n",
curBackupFilesEndIndex, rd->allFiles.size(), curWorkloadSize);
break;
}

3
fdbserver/RestoreInterface.h
View File

@ -138,7 +138,6 @@ struct RestoreInterface {
bool operator == (RestoreInterface const& r) const { return id() == r.id(); }
bool operator != (RestoreInterface const& r) const { return id() != r.id(); }
void initNodeID() { nodeID = setRole.getEndpoint().token; }
UID id() const { return nodeID; } //cmd.getEndpoint().token;
NetworkAddress address() const { return setRole.getEndpoint().addresses.address; }
@ -159,6 +158,8 @@ struct RestoreInterface {
applyToDB.getEndpoint( TaskClusterController );
initVersionBatch.getEndpoint( TaskClusterController );
nodeID = g_random->randomUniqueID();
}
template <class Ar>