From 392c73affb3cf38fdd65321481521d0d984d4284 Mon Sep 17 00:00:00 2001 From: Evan Tschannen Date: Thu, 12 Jul 2018 14:06:59 -0700 Subject: [PATCH] fixed a few slow tasks --- fdbserver/DataDistribution.actor.cpp | 1 + fdbserver/DataDistributionTracker.actor.cpp | 4 ---- fdbserver/Knobs.cpp | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp index 25c72d4a6c..375807b8d8 100644 --- a/fdbserver/DataDistribution.actor.cpp +++ b/fdbserver/DataDistribution.actor.cpp @@ -1275,6 +1275,7 @@ ACTOR Future teamTracker( DDTeamCollection *self, ReferencezeroHealthyTeams->get(); + Void _ = wait( yield() ); TraceEvent("TeamTrackerStarting", self->masterId).detail("Reason", "Initial wait complete (sc)").detail("Team", team->getDesc()); try { diff --git a/fdbserver/DataDistributionTracker.actor.cpp b/fdbserver/DataDistributionTracker.actor.cpp index 6e772bb7f8..636f8fc2d8 100644 --- a/fdbserver/DataDistributionTracker.actor.cpp +++ b/fdbserver/DataDistributionTracker.actor.cpp @@ -555,10 +555,6 @@ ACTOR Future shardTracker( Void _ = wait( delay(0, TaskDataDistribution) ); } } catch (Error& e) { - TraceEvent(SevWarn, "ShardTrackerError", self->masterId) - .detail("TrackerID", trackerID) - .detail("Keys", printable(keys)) - .error(e); if (e.code() != error_code_actor_cancelled) self->output.sendError(e); // Propagate failure to dataDistributionTracker throw e; diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp index 328b05f181..b0696b5efe 100644 --- a/fdbserver/Knobs.cpp +++ b/fdbserver/Knobs.cpp @@ -62,7 +62,7 @@ ServerKnobs::ServerKnobs(bool randomize, ClientKnobs* clientKnobs) { init( PEEK_TRACKER_EXPIRATION_TIME, 600 ); if( randomize && BUGGIFY ) PEEK_TRACKER_EXPIRATION_TIME = g_random->coinflip() ? 0.1 : 60; init( PARALLEL_GET_MORE_REQUESTS, 32 ); if( randomize && BUGGIFY ) PARALLEL_GET_MORE_REQUESTS = 2; init( MAX_QUEUE_COMMIT_BYTES, 15e6 ); if( randomize && BUGGIFY ) MAX_QUEUE_COMMIT_BYTES = 5000; - init( VERSIONS_PER_BATCH, VERSIONS_PER_SECOND ); if( randomize && BUGGIFY ) VERSIONS_PER_BATCH = std::max(1,VERSIONS_PER_SECOND/1000); + init( VERSIONS_PER_BATCH, VERSIONS_PER_SECOND/10 ); if( randomize && BUGGIFY ) VERSIONS_PER_BATCH = std::max(1,VERSIONS_PER_SECOND/1000); // Data distribution queue init( HEALTH_POLL_TIME, 1.0 );