diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2021-09-23 16:41:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-23 16:41:14 +0200 |
commit | 5f1f8f36cd26e5d8a5502d165e3760ab636f8979 (patch) | |
tree | 96789f273f060e7f59eb3a1026b98af06ec8977d /storage | |
parent | 15cf8b13a546314ebaf6302bde156e4218a82b7e (diff) | |
parent | 3ba8ae256fa9082ca41ca3138122d6c9dec60a01 (diff) |
Merge pull request #19267 from vespa-engine/vekterli/use-max-of-current-and-pending-distribution-bit-counts
Use max instead of min from current and pending cluster states' distribution bit counts [run-systemtest]
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/distributor/distributor_bucket_space.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/distributor/distributor_bucket_space.cpp b/storage/src/vespa/storage/distributor/distributor_bucket_space.cpp index 9ec4d31eb32..3cfb8d70b7d 100644 --- a/storage/src/vespa/storage/distributor/distributor_bucket_space.cpp +++ b/storage/src/vespa/storage/distributor/distributor_bucket_space.cpp @@ -50,7 +50,7 @@ DistributorBucketSpace::enumerate_available_nodes() _distribution_bits = _clusterState->getDistributionBitCount(); auto node_count = _clusterState->getNodeCount(lib::NodeType::STORAGE); if (_pending_cluster_state) { - _distribution_bits = std::min(_distribution_bits, _pending_cluster_state->getDistributionBitCount()); + _distribution_bits = std::max(_distribution_bits, _pending_cluster_state->getDistributionBitCount()); node_count = std::min(node_count, _pending_cluster_state->getNodeCount(lib::NodeType::STORAGE)); } std::vector<bool> nodes(node_count); |