Repository: tez Updated Branches: refs/heads/branch-0.5 d05f4671d -> cb07ab4d2
TEZ-2290. Adding addendum patch (rbalamohan) (cherry picked from commit a1d7cda8eee30015760866f02d9ffa6c232b0302) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/cb07ab4d Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/cb07ab4d Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/cb07ab4d Branch: refs/heads/branch-0.5 Commit: cb07ab4d2cedd5ebe47fe16d17ebd0bf89329822 Parents: d05f467 Author: Rajesh Balamohan <[email protected]> Authored: Tue Sep 1 06:42:30 2015 +0530 Committer: Rajesh Balamohan <[email protected]> Committed: Tue Sep 1 06:43:24 2015 +0530 ---------------------------------------------------------------------- .../tez/runtime/library/common/sort/impl/ExternalSorter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/cb07ab4d/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java index f653ad5..34c32ab 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java @@ -288,7 +288,7 @@ public abstract class ExternalSorter { TezRuntimeConfiguration.TEZ_RUNTIME_IO_SORT_MB_DEFAULT); long reqBytes = ((long) initialMemRequestMb) << 20; //Higher bound checks are done in individual sorter implementations - Preconditions.checkArgument(initialMemRequestMb > 0 && reqBytes < maxAvailableTaskMemory, + Preconditions.checkArgument(initialMemRequestMb > 0 && reqBytes <= maxAvailableTaskMemory, TezRuntimeConfiguration.TEZ_RUNTIME_IO_SORT_MB + " " + initialMemRequestMb + " should be " + "larger than 0 and should be less than the available task memory (MB):" + (maxAvailableTaskMemory >> 20));
