Merge pull request #4171 from vespa-engine/toregge/simplify-check-for-pending-request-bucket-info-command

Simplify check for pending RequestBucketInfoCommand.

1 files changed, 4 insertions, 13 deletions

diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp
index 1e4067eb128..2337129e375 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp
@@ -196,19 +196,10 @@ checkNullBucketRequestBucketInfoMessage(uint16_t node,
                                         const PendingMessageTracker& tracker)
 {
     RequestBucketInfoChecker rchk;
-    for (;;) {
-        // Check messages sent to null-bucket (i.e. any bucket) for the node.
-        document::Bucket nullBucket(bucketSpace, document::BucketId());
-        tracker.checkPendingMessages(node, nullBucket, rchk);
-        if (rchk.blocked) {
-            return true;
-        }
-        if (bucketSpace == BucketSpace::placeHolder()) {
-            break;
-        }
-        bucketSpace = BucketSpace::placeHolder();
-    }
-    return false;
+    // Check messages sent to null-bucket (i.e. any bucket) for the node.
+    document::Bucket nullBucket(bucketSpace, document::BucketId());
+    tracker.checkPendingMessages(node, nullBucket, rchk);
+    return rchk.blocked;
 }
 
 }