Repository: tez
Updated Branches:
  refs/heads/branch-0.6 740ed2d13 -> a1d7cda8e


TEZ-2290. Adding addendum patch (rbalamohan)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/a1d7cda8
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a1d7cda8
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a1d7cda8

Branch: refs/heads/branch-0.6
Commit: a1d7cda8eee30015760866f02d9ffa6c232b0302
Parents: 740ed2d
Author: Rajesh Balamohan <[email protected]>
Authored: Tue Sep 1 06:42:30 2015 +0530
Committer: Rajesh Balamohan <[email protected]>
Committed: Tue Sep 1 06:42:30 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/a1d7cda8/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));

Reply via email to