Updated Branches: refs/heads/trunk 13d84663b -> 585511f7c
GIRAPH-819: Number of Containers required for a job (Rafal Wojdyla via ereisman) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/585511f7 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/585511f7 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/585511f7 Branch: refs/heads/trunk Commit: 585511f7c0d1cdb0d515a979dcc00641df2a026f Parents: 13d8466 Author: Eli Reisman <[email protected]> Authored: Thu Jan 30 11:45:43 2014 -0800 Committer: Eli Reisman <[email protected]> Committed: Thu Jan 30 11:45:43 2014 -0800 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../java/org/apache/giraph/yarn/GiraphYarnClient.java | 12 +++--------- 2 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/585511f7/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 1c1be0b..d88ed41 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-819: Number of Containers Required for a Job (Rafal Wojdyla via ereisman) + GIRAPH-832: Test don't finish after GIRAPH-792 (majakabiljo) GIRAPH-792: Print job progress to command line (majakabiljo) http://git-wip-us.apache.org/repos/asf/giraph/blob/585511f7/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnClient.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnClient.java b/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnClient.java index e8926eb..70166b6 100644 --- a/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnClient.java +++ b/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnClient.java @@ -206,7 +206,6 @@ public class GiraphYarnClient { final GetNewApplicationResponse cluster) throws YarnException, IOException { // are there enough containers to go around for our Giraph job? List<NodeReport> nodes = null; - int numContainers = 0; long totalAvailable = 0; try { nodes = yarnClient.getNodeReports(NodeState.RUNNING); @@ -218,18 +217,13 @@ public class GiraphYarnClient { for (NodeReport node : nodes) { LOG.info("Got node report from ASM for" + ", nodeId=" + node.getNodeId() + - ", nodeAddress" + node.getHttpAddress() + - ", nodeRackName" + node.getRackName() + - ", nodeNumContainers" + node.getNumContainers()); - numContainers += node.getNumContainers(); + ", nodeAddress " + node.getHttpAddress() + + ", nodeRackName " + node.getRackName() + + ", nodeNumContainers " + node.getNumContainers()); totalAvailable += node.getCapability().getMemory(); } // 1 master + all workers in -w command line arg final int workers = giraphConf.getMaxWorkers() + 1; - if (workers < numContainers) { - throw new RuntimeException("Giraph job requires " + workers + - " containers to run; cluster only hosts " + numContainers); - } checkAndAdjustPerTaskHeapSize(cluster); final long totalAsk = giraphConf.getYarnTaskHeapMb() * workers;
