diff options
Diffstat (limited to 'config')
4 files changed, 7 insertions, 5 deletions
diff --git a/config/src/apps/vespa-configproxy-cmd/main.cpp b/config/src/apps/vespa-configproxy-cmd/main.cpp index 63fa1285bb2..bb908e7268b 100644 --- a/config/src/apps/vespa-configproxy-cmd/main.cpp +++ b/config/src/apps/vespa-configproxy-cmd/main.cpp @@ -22,7 +22,7 @@ Application::parseOpts() char c = '?'; const char *optArg = NULL; int optInd = 0; - while ((c = GetOpt("m:s:p:", optArg, optInd)) != -1) { + while ((c = GetOpt("m:s:p:h", optArg, optInd)) != -1) { switch (c) { case 'm': _flags.method = optArg; diff --git a/config/src/apps/vespa-configproxy-cmd/methods.cpp b/config/src/apps/vespa-configproxy-cmd/methods.cpp index 6a143667102..6218c54e8b3 100644 --- a/config/src/apps/vespa-configproxy-cmd/methods.cpp +++ b/config/src/apps/vespa-configproxy-cmd/methods.cpp @@ -14,7 +14,7 @@ const Method methods[] = { { "cachefull", "listCachedConfigFull", 0 }, { "sources", "listSourceConnections", 0 }, { "statistics", "printStatistics", 0 }, - { "setmode", "setMode", 1 }, // { default | memorycache | diskcache } + { "setmode", "setMode", 1 }, // { default | memorycache } { "updatesources", "updateSources", 1 }, { 0, 0, 0} }; diff --git a/config/src/vespa/config/subscription/configsubscriptionset.cpp b/config/src/vespa/config/subscription/configsubscriptionset.cpp index f120272edcf..9b3ef32a128 100644 --- a/config/src/vespa/config/subscription/configsubscriptionset.cpp +++ b/config/src/vespa/config/subscription/configsubscriptionset.cpp @@ -42,7 +42,7 @@ ConfigSubscriptionSet::acquireSnapshot(uint64_t timeoutInMillis, bool ignoreChan bool inSync = false; LOG(debug, "Going into nextConfig loop, time left is %d", timeLeft); - while ((_state != CLOSED) && (timeLeft >= 0) && !inSync) { + while (!isClosed() && (timeLeft >= 0) && !inSync) { size_t numChanged = 0; size_t numGenerationChanged = 0; bool generationsInSync = true; @@ -117,7 +117,7 @@ ConfigSubscriptionSet::close() bool ConfigSubscriptionSet::isClosed() const { - return (_state == CLOSED); + return (_state.load(std::memory_order_relaxed) == CLOSED); } ConfigSubscription::SP diff --git a/config/src/vespa/config/subscription/configsubscriptionset.h b/config/src/vespa/config/subscription/configsubscriptionset.h index cebd3007b19..ce1f45b0eb8 100644 --- a/config/src/vespa/config/subscription/configsubscriptionset.h +++ b/config/src/vespa/config/subscription/configsubscriptionset.h @@ -9,6 +9,8 @@ #include "configsubscription.h" #include "configprovider.h" +#include <atomic> + namespace config { /** @@ -60,7 +62,7 @@ private: int64_t _currentGeneration; // Holds the current config generation. SubscriptionList _subscriptionList; // List of current subscriptions. - SubscriberState _state; // Current state of this subscriber. + std::atomic<SubscriberState> _state; // Current state of this subscriber. }; } // namespace config |