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

Few bug fixes.

This commit is contained in:
negoyal 2020-06-05 16:27:04 -07:00
parent cf13e00a8f
commit 23a565ec63
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fdbclient/NativeAPI.actor.cpp
View File

@ -1813,6 +1813,7 @@ ACTOR Future<Key> getKey( Database cx, KeySelector k, Future<Version> version, T
reply = _reply;
}
}
++cx->transactionPhysicalReadsCompleted;
} catch(Error&) {
++cx->transactionPhysicalReadsCompleted;
throw;

7
fdbserver/StorageCache.actor.cpp
View File

@ -1184,9 +1184,9 @@ ACTOR Future<Void> fetchKeys( StorageCacheData *data, AddingCacheRange* cacheRan
// FIXME: enable when debugKeyRange is active
//debugKeyRange("fetchKeysBegin", data->version.get(), cacheRange->keys);
TraceEvent(SevDebug, interval.begin(), data->thisServerID)
.detail("KeyBegin", cacheRange->keys.begin)
.detail("KeyEnd",cacheRange->keys.end);
//TraceEvent(SevDebug, interval.begin(), data->thisServerID)
// .detail("KeyBegin", cacheRange->keys.begin)
// .detail("KeyEnd",cacheRange->keys.end);
validate(data);
@ -1955,6 +1955,7 @@ ACTOR Future<Void> storageCacheStartUpWarmup(StorageCacheData* self) {
state Value trueValue = storageCacheValue(std::vector<uint16_t>{ 0 });
state Value falseValue = storageCacheValue(std::vector<uint16_t>{});
state MutationRef privatized;
privatized.type = MutationRef::SetValue;
state Version readVersion;
try {
loop {

2
fdbserver/worker.actor.cpp
View File

@ -1762,7 +1762,7 @@ ACTOR Future<Void> fdbd(
Reference<AsyncVar<ServerDBInfo>> dbInfo( new AsyncVar<ServerDBInfo>(ServerDBInfo()) );
actors.push_back(reportErrors(monitorAndWriteCCPriorityInfo(fitnessFilePath, asyncPriorityInfo), "MonitorAndWriteCCPriorityInfo"));
if (processClass == ProcessClass::TesterClass) {
if (processClass.machineClassFitness(ProcessClass::ClusterController) == ProcessClass::NeverAssign) {
actors.push_back( reportErrors( monitorLeader( connFile, cc ), "ClusterController" ) );
} else if (processClass == ProcessClass::StorageClass && SERVER_KNOBS->MAX_DELAY_STORAGE_CANDIDACY_SECONDS > 0) {
actors.push_back( reportErrors( monitorLeaderRemotelyWithDelayedCandidacy( connFile, cc, asyncPriorityInfo, recoveredDiskFiles.getFuture(), localities, dbInfo ), "ClusterController" ) );

8
fdbserver/workloads/ReadWrite.actor.cpp
View File

@ -226,7 +226,11 @@ struct ReadWriteWorkload : KVWorkload {
ACTOR static Future<bool> traceDumpWorkers( Reference<AsyncVar<ServerDBInfo>> db ) {
try {
loop {
ErrorOr<std::vector<WorkerDetails>> workerList = wait( db->get().clusterInterface.getWorkers.tryGetReply( GetWorkersRequest() ) );
choose {
when( wait( db->onChange() ) ) {}
when (ErrorOr<std::vector<WorkerDetails>> workerList = wait( db->get().clusterInterface.getWorkers.tryGetReply( GetWorkersRequest() ) );)
{
if( workerList.present() ) {
std::vector<Future<ErrorOr<Void>>> dumpRequests;
for( int i = 0; i < workerList.get().size(); i++)
@ -236,6 +240,8 @@ struct ReadWriteWorkload : KVWorkload {
}
wait( delay( 1.0 ) );
}
}
}
} catch( Error &e ) {
TraceEvent(SevError, "FailedToDumpWorkers").error(e);
throw;