From fc0fbfb5dca7aa85158ce7dc6b4fed3ae77330c5 Mon Sep 17 00:00:00 2001 From: sfc-gh-tclinkenbeard Date: Tue, 11 May 2021 12:00:44 -0700 Subject: [PATCH] Minor configuration database bug fixes --- fdbclient/ConfigKnobs.cpp | 2 -- fdbserver/LocalConfiguration.actor.cpp | 2 +- fdbserver/SimpleConfigDatabaseNode.actor.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fdbclient/ConfigKnobs.cpp b/fdbclient/ConfigKnobs.cpp index 29993e66e5..dddc94492c 100644 --- a/fdbclient/ConfigKnobs.cpp +++ b/fdbclient/ConfigKnobs.cpp @@ -24,7 +24,5 @@ ConfigKey ConfigKeyRef::decodeKey(KeyRef const& key) { auto tuple = Tuple::unpack(key); ASSERT(tuple.size() == 2); // TODO: Fail gracefully - ASSERT(tuple.getType(0) == Tuple::BYTES); - ASSERT(tuple.getType(1) == Tuple::BYTES); return ConfigKeyRef(tuple.getString(0), tuple.getString(1)); } diff --git a/fdbserver/LocalConfiguration.actor.cpp b/fdbserver/LocalConfiguration.actor.cpp index 471c02c245..c7b9bec4e8 100644 --- a/fdbserver/LocalConfiguration.actor.cpp +++ b/fdbserver/LocalConfiguration.actor.cpp @@ -172,7 +172,7 @@ class LocalConfigurationImpl { choose { when(wait(broadcaster->onChange())) {} when(wait(brokenPromiseToNever(fetchChanges(self, broadcaster->get())))) { - wait(delay(0.5)); // TODO: Make knob? + wait(delay(5.0)); // TODO: Make knob? } when(wait(monitor)) { ASSERT(false); } } diff --git a/fdbserver/SimpleConfigDatabaseNode.actor.cpp b/fdbserver/SimpleConfigDatabaseNode.actor.cpp index c15545778a..4d81d1fc72 100644 --- a/fdbserver/SimpleConfigDatabaseNode.actor.cpp +++ b/fdbserver/SimpleConfigDatabaseNode.actor.cpp @@ -185,7 +185,7 @@ class SimpleConfigDatabaseNodeImpl { return Void(); } state Optional value = - wait(self->kvStore->readValue(BinaryWriter::toValue(req.key, Unversioned()).withPrefix(kvKeys.begin))); + wait(self->kvStore->readValue(BinaryWriter::toValue(req.key, IncludeVersion()).withPrefix(kvKeys.begin))); Standalone> versionedMutations = wait(getMutations(self, 0, req.version)); for (const auto &versionedMutation : versionedMutations) { const auto &mutation = versionedMutation.mutation;