summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-12-20 13:17:17 +0100
committerGitHub <noreply@github.com>2017-12-20 13:17:17 +0100
commit86c9878e1983fbeec3cdefb227dcdcb176428758 (patch)
tree0e26d3c5e602b2112bd6ed6c42248359ea651fa5
parent2be1c34825fda8bdf9711c1e7522989fe3a8a45e (diff)
parentdde1e78ba3f902ba7396422169c3b2df906e259d (diff)
Merge pull request #4502 from vespa-engine/arnej/protect-against-empty-node-list
an entry with no nodes cannot be used
-rw-r--r--storage/src/vespa/storage/distributor/idealstatemanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
index 4ceeb387341..031e9946178 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
@@ -95,7 +95,7 @@ IdealStateManager::getEntryForPrimaryBucket(StateChecker::Context& c) const
{
for (uint32_t j = 0; j < c.entries.size(); ++j) {
BucketDatabase::Entry& e = c.entries[j];
- if (e.getBucketId() == c.getBucketId()) {
+ if (e.getBucketId() == c.getBucketId() && ! e->getNodes().empty()) {
return &e;
}
}