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 E25F110871 for ; Wed, 4 Mar 2015 20:43:12 +0000 (UTC) Received: (qmail 87034 invoked by uid 500); 4 Mar 2015 20:42:14 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 86998 invoked by uid 500); 4 Mar 2015 20:42:14 -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 86989 invoked by uid 99); 4 Mar 2015 20:42:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2015 20:42:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59FFCE0D39; Wed, 4 Mar 2015 20:42:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sseth@apache.org To: commits@tez.apache.org Message-Id: <40d3c1d27df04e6bb0f267fe69f7b6e6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tez git commit: TEZ-2171. Remove unused metrics code. Contributed by Prasanth Jayachandran. Date: Wed, 4 Mar 2015 20:42:14 +0000 (UTC) Repository: tez Updated Branches: refs/heads/master c85b724d6 -> 728dc66ae TEZ-2171. Remove unused metrics code. Contributed by Prasanth Jayachandran. Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/728dc66a Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/728dc66a Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/728dc66a Branch: refs/heads/master Commit: 728dc66aea4436954abffa4e50c75f812ae04275 Parents: c85b724 Author: Siddharth Seth Authored: Wed Mar 4 12:41:44 2015 -0800 Committer: Siddharth Seth Committed: Wed Mar 4 12:41:44 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../java/org/apache/tez/dag/app/DAGAppMaster.java | 18 ++++-------------- .../org/apache/tez/runtime/task/TezChild.java | 10 ++-------- 3 files changed, 7 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/728dc66a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 73cfc63..e19c4bf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ Release 0.7.0: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2171. Remove unused metrics code. TEZ-2001. Support pipelined data transfer for ordered output. TEZ-2170. Incorrect its in README.md. TEZ-2070. Controller class of output should be committer rather than initializer in DAG's dot file. http://git-wip-us.apache.org/repos/asf/tez/blob/728dc66a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java index 3ce63d1..f6256d7 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java @@ -18,8 +18,6 @@ package org.apache.tez.dag.app; -import com.google.common.base.Preconditions; - import static com.google.common.base.Preconditions.checkNotNull; import java.io.File; @@ -64,7 +62,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; @@ -96,7 +93,9 @@ import org.apache.tez.common.TezConverterUtils; import org.apache.tez.common.TezUtilsInternal; import org.apache.tez.common.VersionInfo; import org.apache.tez.common.counters.Limits; +import org.apache.tez.common.security.ACLManager; import org.apache.tez.common.security.JobTokenIdentifier; +import org.apache.tez.common.security.JobTokenSecretManager; import org.apache.tez.common.security.TokenCache; import org.apache.tez.dag.api.DagTypeConverters; import org.apache.tez.dag.api.TezConfiguration; @@ -107,7 +106,6 @@ import org.apache.tez.dag.api.client.DAGClientHandler; import org.apache.tez.dag.api.client.DAGClientServer; import org.apache.tez.dag.api.records.DAGProtos; import org.apache.tez.dag.api.records.DAGProtos.DAGPlan; -import org.apache.tez.dag.api.records.DAGProtos.PlanKeyValuePair; import org.apache.tez.dag.api.records.DAGProtos.PlanLocalResourcesProto; import org.apache.tez.dag.api.records.DAGProtos.VertexPlan; import org.apache.tez.dag.app.RecoveryParser.RecoveredDAGData; @@ -117,8 +115,8 @@ import org.apache.tez.dag.app.dag.Task; import org.apache.tez.dag.app.dag.TaskAttempt; import org.apache.tez.dag.app.dag.Vertex; import org.apache.tez.dag.app.dag.event.DAGAppMasterEvent; -import org.apache.tez.dag.app.dag.event.DAGAppMasterEventSchedulingServiceError; import org.apache.tez.dag.app.dag.event.DAGAppMasterEventDAGFinished; +import org.apache.tez.dag.app.dag.event.DAGAppMasterEventSchedulingServiceError; import org.apache.tez.dag.app.dag.event.DAGAppMasterEventType; import org.apache.tez.dag.app.dag.event.DAGEvent; import org.apache.tez.dag.app.dag.event.DAGEventRecoverEvent; @@ -146,7 +144,6 @@ import org.apache.tez.dag.app.rm.container.ContainerSignatureMatcher; import org.apache.tez.dag.app.rm.node.AMNodeEventType; import org.apache.tez.dag.app.rm.node.AMNodeTracker; import org.apache.tez.dag.app.web.WebUIService; -import org.apache.tez.common.security.ACLManager; import org.apache.tez.dag.history.DAGHistoryEvent; import org.apache.tez.dag.history.HistoryEventHandler; import org.apache.tez.dag.history.events.AMLaunchedEvent; @@ -158,12 +155,12 @@ import org.apache.tez.dag.records.TezDAGID; import org.apache.tez.dag.records.TezVertexID; import org.apache.tez.dag.utils.Graph; import org.apache.tez.dag.utils.RelocalizationUtils; -import org.apache.tez.common.security.JobTokenSecretManager; import org.apache.tez.dag.utils.Simple2LevelVersionComparator; import org.codehaus.jettison.json.JSONException; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; +import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; @@ -319,9 +316,6 @@ public class DAGAppMaster extends AbstractService { .createRemoteUser(jobUserName); this.appMasterUgi.addCredentials(amCredentials); - - // TODO Metrics - //this.metrics = DAGAppMetrics.create(); LOG.info("Created DAGAppMaster for application " + applicationAttemptId + ", versionInfo=" + dagVersionInfo.toString()); } @@ -1588,10 +1582,6 @@ public class DAGAppMaster extends AbstractService { return; } - // metrics system init is really init & start. - // It's more test friendly to put it here. - DefaultMetricsSystem.initialize("DAGAppMaster"); - this.appsStartTime = clock.getTime(); AMStartedEvent startEvent = new AMStartedEvent(appAttemptID, appsStartTime, appMasterUgi.getShortUserName()); http://git-wip-us.apache.org/repos/asf/tez/blob/728dc66a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java ---------------------------------------------------------------------- diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java index d537846..c031ecb 100644 --- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java +++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/task/TezChild.java @@ -18,8 +18,6 @@ package org.apache.tez.runtime.task; -import javax.annotation.Nullable; - import java.io.IOException; import java.net.InetSocketAddress; import java.net.URI; @@ -35,10 +33,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.Nullable; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.ipc.RPC; -import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.SecurityUtil; @@ -353,7 +352,6 @@ public class TezChild { if (taskReporter != null) { taskReporter.shutdown(); } - DefaultMetricsSystem.shutdown(); if (!isLocal) { RPC.stopProxy(umbilical); LogManager.shutdown(); @@ -420,10 +418,6 @@ public class TezChild { // for each and every task, and reading it back from disk. Also needs to be per vertex. Limits.setConfiguration(conf); - // Should this be part of main - Metrics and ObjectRegistry. TezTask setup should be independent - // of this class. Leaving it here, till there's some entity representing a running JVM. - DefaultMetricsSystem.initialize("TezTask"); - // singleton of ObjectRegistry for this JVM ObjectRegistryImpl objectRegistry = new ObjectRegistryImpl();