diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-03-04 09:36:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-04 09:36:57 +0100 |
commit | 18ff89e7c93e4597d9375eb395b694a54c6e342f (patch) | |
tree | 7c92eb53a9125b1a4b2d6095f00cf72e969cc402 | |
parent | 2747507ce27e3d41df5478b2cb42c1796424cf65 (diff) | |
parent | bf25e9eb063aeab4cbf4204ad9b84f0ca7ec340e (diff) |
Merge pull request #21541 from vespa-engine/balder/revert-back-to-poll
Revert back to using poll for nextUpdate
-rw-r--r-- | config/src/vespa/config/subscription/configsubscription.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/src/vespa/config/subscription/configsubscription.cpp b/config/src/vespa/config/subscription/configsubscription.cpp index 5eea0895eed..04904d07b17 100644 --- a/config/src/vespa/config/subscription/configsubscription.cpp +++ b/config/src/vespa/config/subscription/configsubscription.cpp @@ -31,11 +31,11 @@ ConfigSubscription::~ConfigSubscription() bool ConfigSubscription::nextUpdate(int64_t generation, vespalib::steady_time deadline) { - if (_closed || !_holder->wait_until(deadline)) { return false; } - if (_closed) { return false; } // The above wait_until can be interrupted + if (_closed || !_holder->poll()) { + return false; + } auto old = std::move(_next); _next = _holder->provide(); - if ( ! _next) { return false; } if (old) { _next->merge(*old); } |