diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-09 18:15:18 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-09 18:15:18 -0800 |
| commit | ccb1ca4a2307cbfe0b8b1cabaf85230d8c19e99f (patch) | |
| tree | eab1bc6d933f80f8fb2531407ce2b343d37f5cf6 /core/src | |
| parent | 76ac0ce6c04fd27db3b99a7c2387309f28060fe5 (diff) | |
| parent | cfab1a35282c08cec351e468f6e57d1261f02d10 (diff) | |
| download | spark-ccb1ca4a2307cbfe0b8b1cabaf85230d8c19e99f.tar.gz spark-ccb1ca4a2307cbfe0b8b1cabaf85230d8c19e99f.tar.bz2 spark-ccb1ca4a2307cbfe0b8b1cabaf85230d8c19e99f.zip | |
Merge pull request #448 from squito/fetch_maxBytesInFlight
add as many fetch requests as we can, subject to maxBytesInFlight
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/scala/spark/storage/BlockManager.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/storage/BlockManager.scala b/core/src/main/scala/spark/storage/BlockManager.scala index 9893e9625d..2e7db60841 100644 --- a/core/src/main/scala/spark/storage/BlockManager.scala +++ b/core/src/main/scala/spark/storage/BlockManager.scala @@ -585,7 +585,7 @@ class BlockManager( resultsGotten += 1 val result = results.take() bytesInFlight -= result.size - if (!fetchRequests.isEmpty && + while (!fetchRequests.isEmpty && (bytesInFlight == 0 || bytesInFlight + fetchRequests.front.size <= maxBytesInFlight)) { sendRequest(fetchRequests.dequeue()) } |