Merge 66fdfbb817 into f6e79f1a2d

clientlibrary/worker/worker.go

@@ -304,9 +304,11 @@ func (w *Worker) eventLoop() {
 			}
 		}
 
-		// max number of lease has not been reached yet
-		if counter < w.kclConfig.MaxLeasesForWorker {
 		for _, shard := range w.shardStatus {
+			// max number of lease has not been reached yet
+			if counter >= w.kclConfig.MaxLeasesForWorker {
+				break
+			}
 			// already owner of the shard
 			if shard.GetLeaseOwner() == w.workerID {
 				continue
@@ -364,9 +366,9 @@ func (w *Worker) eventLoop() {
 					log.Errorf("Error in getRecords: %+v", err)
 				}
 			}(shard)
-				// exit from for loop and not to grab more shard for now.
-				break
-			}
+
+			// Increase the number of leases we have
+			counter++
 		}
 
 		if w.kclConfig.EnableLeaseStealing {