Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C22DCF111 for ; Fri, 26 Apr 2013 02:01:39 +0000 (UTC) Received: (qmail 23158 invoked by uid 500); 26 Apr 2013 02:01:39 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 23128 invoked by uid 500); 26 Apr 2013 02:01:39 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 23121 invoked by uid 99); 26 Apr 2013 02:01:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Apr 2013 02:01:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Apr 2013 02:01:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8DCCA23889F7; Fri, 26 Apr 2013 02:01:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1476023 - in /incubator/tez/branches/TEZ-1: tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java Date: Fri, 26 Apr 2013 02:01:15 -0000 To: commits@tez.incubator.apache.org From: bikas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130426020115.8DCCA23889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bikas Date: Fri Apr 26 02:01:15 2013 New Revision: 1476023 URL: http://svn.apache.org/r1476023 Log: TEZ-40. BipartiteSlowStartVertexScheduler configs should come from TezConfiguration (bikas) Modified: incubator/tez/branches/TEZ-1/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java incubator/tez/branches/TEZ-1/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java Modified: incubator/tez/branches/TEZ-1/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java URL: http://svn.apache.org/viewvc/incubator/tez/branches/TEZ-1/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java?rev=1476023&r1=1476022&r2=1476023&view=diff ============================================================================== --- incubator/tez/branches/TEZ-1/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java (original) +++ incubator/tez/branches/TEZ-1/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java Fri Apr 26 02:01:15 2013 @@ -79,8 +79,20 @@ public class TezConfiguration extends Co public static final String DAG_AM_RESOURCE_CPU_VCORES = DAG_AM_PREFIX + "resource.cpu.vcores"; public static final int DEFAULT_DAG_AM_RESOURCE_CPU_VCORES = 1; + + public static final String + SLOWSTART_VERTEX_SCHEDULER_MIN_SRC_FRACTION = TEZ_PREFIX + + "slowstart-vertex-scheduler.min-src-fraction"; + public static final float + SLOWSTART_VERTEX_SCHEDULER_MIN_SRC_FRACTION_DEFAULT = 0.5f; - private static final String TEZ_CONF_DIR_ENV = "TEZ_CONF_DIR"; + public static final String + SLOWSTART_VERTEX_SCHEDULER_MAX_SRC_FRACTION = TEZ_PREFIX + + "slowstart-vertex-scheduler.max-src-fraction"; + public static final float + SLOWSTART_VERTEX_SCHEDULER_MAX_SRC_FRACTION_DEFAULT = 0.8f; + +private static final String TEZ_CONF_DIR_ENV = "TEZ_CONF_DIR"; private static final String TEZ_HOME_ENV = "TEZ_HOME"; public static final String TEZ_APPLICATION_CLASSPATH = TEZ_PREFIX Modified: incubator/tez/branches/TEZ-1/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java URL: http://svn.apache.org/viewvc/incubator/tez/branches/TEZ-1/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java?rev=1476023&r1=1476022&r2=1476023&view=diff ============================================================================== --- incubator/tez/branches/TEZ-1/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java (original) +++ incubator/tez/branches/TEZ-1/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java Fri Apr 26 02:01:15 2013 @@ -784,11 +784,16 @@ public class VertexImpl implements org.a // setup vertex scheduler // TODO this needs to consider data size and perhaps API. // Currently implicitly BIPARTITE is the only edge type - // TODO TEZ-40 config from TeztConfiguration - vertex.vertexScheduler = new - BipartiteSlowStartVertexScheduler(vertex, - 0.5f, - 0.8f); + vertex.vertexScheduler = new BipartiteSlowStartVertexScheduler( + vertex, + vertex.conf + .getFloat( + TezConfiguration.SLOWSTART_VERTEX_SCHEDULER_MIN_SRC_FRACTION, + TezConfiguration.SLOWSTART_VERTEX_SCHEDULER_MIN_SRC_FRACTION_DEFAULT), + vertex.conf + .getFloat( + TezConfiguration.SLOWSTART_VERTEX_SCHEDULER_MAX_SRC_FRACTION, + TezConfiguration.SLOWSTART_VERTEX_SCHEDULER_MAX_SRC_FRACTION_DEFAULT)); } else { // schedule all tasks upon vertex start vertex.vertexScheduler = new ImmediateStartVertexScheduler(vertex);