From e231945aebb7c3302fa8b4af4934da21de46a999 Mon Sep 17 00:00:00 2001
From: Jihoon Son <jihoonson@apache.org>
Date: Wed, 22 Jul 2015 11:47:26 +0900
Subject: [PATCH] TAJO-1696

---
 .../org/apache/tajo/resource/DefaultResourceCalculator.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tajo-core/src/main/java/org/apache/tajo/resource/DefaultResourceCalculator.java b/tajo-core/src/main/java/org/apache/tajo/resource/DefaultResourceCalculator.java
index 15ec8459e4..63a5965e2b 100644
--- a/tajo-core/src/main/java/org/apache/tajo/resource/DefaultResourceCalculator.java
+++ b/tajo-core/src/main/java/org/apache/tajo/resource/DefaultResourceCalculator.java
@@ -27,8 +27,12 @@ public int compare(NodeResource unused, NodeResource lhs, NodeResource rhs) {
 
   @Override
   public int computeAvailableContainers(NodeResource available, NodeResource required) {
-    return Math.min(available.getMemory() / required.getMemory(),
+    int availableContainer = Math.min(available.getMemory() / required.getMemory(),
         available.getVirtualCores() / required.getVirtualCores());
+    if (required.getDisks() > 0) {
+      availableContainer = Math.min(availableContainer, available.getDisks() / required.getDisks());
+    }
+    return availableContainer;
   }
 
   @Override