From 17ae952f151f8ebae009b18c92240e93fb42c1ca Mon Sep 17 00:00:00 2001 From: Zhe Wu Date: Wed, 9 Aug 2023 10:12:18 -0700 Subject: [PATCH] Remove debugging notes --- fdbserver/DDTeamCollection.actor.cpp | 5 ++--- .../fdbserver/ClusterController.actor.h | 4 +--- ...ualWiggleStorageMigrationWorkload.actor.cpp | 18 +----------------- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/fdbserver/DDTeamCollection.actor.cpp b/fdbserver/DDTeamCollection.actor.cpp index c76a898f9d..df803e685e 100644 --- a/fdbserver/DDTeamCollection.actor.cpp +++ b/fdbserver/DDTeamCollection.actor.cpp @@ -854,7 +854,7 @@ public: bool recheck = !healthy && (lastReady != self->initialFailureReactionDelay.isReady() || (lastZeroHealthy && !self->zeroHealthyTeams->get()) || containsFailed); - TraceEvent("TeamHealthChangeDetected", self->distributorId) + TraceEvent(SevVerbose, "TeamHealthChangeDetected", self->distributorId) .detail("Team", team->getDesc()) .detail("ServersLeft", serversLeft) .detail("LastServersLeft", lastServersLeft) @@ -2398,9 +2398,8 @@ public: state InitializeStorageRequest isr; isr.storeType = recruitTss ? self->configuration.testingStorageServerStoreType : self->configuration.storageServerStoreType; - if (self->configuration.perpetualStoreType.storeType() != KeyValueStoreType::END) { + if (!recruitTss && self->configuration.perpetualStoreType.storeType() != KeyValueStoreType::END) { if (self->configuration.perpetualStorageWiggleLocality == "0") { - // TODO(wiggle) : consider adding a perpetual wiggle storage engine type for TSS. isr.storeType = self->configuration.perpetualStoreType; } else { Optional localityKey; diff --git a/fdbserver/include/fdbserver/ClusterController.actor.h b/fdbserver/include/fdbserver/ClusterController.actor.h index 3ea592ab1e..3c6d7b9828 100644 --- a/fdbserver/include/fdbserver/ClusterController.actor.h +++ b/fdbserver/include/fdbserver/ClusterController.actor.h @@ -349,8 +349,7 @@ public: std::set excludedAddresses(req.excludeAddresses.begin(), req.excludeAddresses.end()); for (auto& it : id_worker) { - /* - TraceEvent("ZZZZZRecruitStorageTry") + TraceEvent(SevVerbose, "RecruitStorageTry") .detail("Worker", it.second.details.interf.address()) .detail("WorkerAvailable", workerAvailable(it.second, false)) .detail("RecoverDiskFiles", it.second.details.recoveredDiskFiles) @@ -365,7 +364,6 @@ public: it.second.details.processClass.machineClassFitness(ProcessClass::Storage) <= ProcessClass::UnsetFit) .detail("MachineFitness", it.second.details.processClass.machineClassFitness(ProcessClass::Storage)); - */ if (workerAvailable(it.second, false) && it.second.details.recoveredDiskFiles && !excludedMachines.count(it.second.details.interf.locality.zoneId()) && (includeDCs.size() == 0 || includeDCs.count(it.second.details.interf.locality.dcId())) && diff --git a/fdbserver/workloads/PerpetualWiggleStorageMigrationWorkload.actor.cpp b/fdbserver/workloads/PerpetualWiggleStorageMigrationWorkload.actor.cpp index 3b89ab7fd0..06b8de83ed 100644 --- a/fdbserver/workloads/PerpetualWiggleStorageMigrationWorkload.actor.cpp +++ b/fdbserver/workloads/PerpetualWiggleStorageMigrationWorkload.actor.cpp @@ -1,5 +1,5 @@ /* - * PerpetualWiggleStatsWorkload.actor.cpp + * PerpetualWiggleStorageMigrationWorkload.actor.cpp * * This source file is part of the FoundationDB open source project * @@ -52,22 +52,6 @@ struct PerpetualWiggleStorageMigrationWorkload : public TestWorkload { void disableFailureInjectionWorkloads(std::set& out) const override { out.insert("all"); } - /* - ACTOR static Future _setup(PerpetualWiggleStorageMigrationWorkload* self, Database cx) { - // wait(success(setHealthyZone(cx, ignoreSSFailuresZoneString, 0))); - // bool success = wait(IssueConfigurationChange(cx, "storage_migration_type=disabled", true)); - // ASSERT(success); - // wait(delay(30.0)); // make sure the DD has already quit before the test start - return Void(); - } - - Future setup(Database const& cx) override { - if (clientId == 0) { - return _setup(this, cx); // force to disable DD - } - return Void(); - } */ - Future start(Database const& cx) override { if (clientId == 0) { return _start(this, cx);