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 503CD10BC4 for ; Tue, 2 Dec 2014 19:12:39 +0000 (UTC) Received: (qmail 44501 invoked by uid 500); 2 Dec 2014 19:12:39 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 44466 invoked by uid 500); 2 Dec 2014 19:12:38 -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 44456 invoked by uid 99); 2 Dec 2014 19:12:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 19:12:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A02549BBC8F; Tue, 2 Dec 2014 19:12:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hitesh@apache.org To: commits@tez.apache.org Message-Id: <5b5610dbd0ef4a9cbf725cc1fa5501cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tez git commit: TEZ-1796. Use of DeprecationDelta broke build against 2.2 Hadoop. (Siddharth Seth and hitesh via hitesh) Date: Tue, 2 Dec 2014 19:12:38 +0000 (UTC) Repository: tez Updated Branches: refs/heads/master 9e10348f6 -> 6b531075b TEZ-1796. Use of DeprecationDelta broke build against 2.2 Hadoop. (Siddharth Seth and hitesh via hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/6b531075 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6b531075 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6b531075 Branch: refs/heads/master Commit: 6b531075b37c34885a87c8b4e6bc7cc993cc1c06 Parents: 9e10348 Author: Hitesh Shah Authored: Tue Dec 2 11:11:55 2014 -0800 Committer: Hitesh Shah Committed: Tue Dec 2 11:11:55 2014 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/tez/dag/api/TezConfiguration.java | 51 +++++++++----------- .../util/TestTezMxBeanResourceCalculator.java | 13 ----- 3 files changed, 25 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/6b531075/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d023848..4ad652b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -43,6 +43,7 @@ ALL CHANGES: TEZ-1770. Handle ConnectExceptions correctly when establishing connections to an NM which may be down. TEZ-1774. AppLaunched event for Timeline does not have start time set. TEZ-1780. tez-api is missing jersey dependencies. + TEZ-1796. Use of DeprecationDelta broke build against 2.2 Hadoop. Release 0.5.2: 2014-11-07 http://git-wip-us.apache.org/repos/asf/tez/blob/6b531075/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java ---------------------------------------------------------------------- diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java index 84ee906..06c7008 100644 --- a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java +++ b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java @@ -36,33 +36,30 @@ public class TezConfiguration extends Configuration { public final static String TEZ_SITE_XML = "tez-site.xml"; static { - Configuration.addDeprecations(new DeprecationDelta[] - { - new DeprecationDelta("tez.am.counters.max.keys", TezConfiguration.TEZ_COUNTERS_MAX), - new DeprecationDelta("tez.am.counters.groups.max.keys", - TezConfiguration.TEZ_COUNTERS_MAX_GROUPS), - new DeprecationDelta("tez.am.counters.name.max.keys", - TezConfiguration.TEZ_COUNTERS_COUNTER_NAME_MAX_LENGTH), - new DeprecationDelta("tez.am.counters.group-name.max.keys", - TezConfiguration.TEZ_COUNTERS_GROUP_NAME_MAX_LENGTH), - - new DeprecationDelta("tez.task.scale.task.memory.enabled", - TezConfiguration.TEZ_TASK_SCALE_MEMORY_ENABLED), - new DeprecationDelta("tez.task.scale.task.memory.allocator.class", - TezConfiguration.TEZ_TASK_SCALE_MEMORY_ALLOCATOR_CLASS), - new DeprecationDelta("tez.task.scale.task.memory.reserve-fraction", - TezConfiguration.TEZ_TASK_SCALE_MEMORY_RESERVE_FRACTION), - new DeprecationDelta( - "tez.task.scale.task.memory.additional-reservation.fraction.per-io", - TezConfiguration.TEZ_TASK_SCALE_MEMORY_ADDITIONAL_RESERVATION_FRACTION_PER_IO), - new DeprecationDelta("tez.task.scale.task.memory.additional-reservation.fraction.max", - TezConfiguration.TEZ_TASK_SCALE_MEMORY_ADDITIONAL_RESERVATION_FRACTION_MAX), - new DeprecationDelta("tez.task.scale.task.memory.ratios", - TezConfiguration.TEZ_TASK_SCALE_MEMORY_WEIGHTED_RATIOS), - - new DeprecationDelta("tez.task.max-events-per-heartbeat.max", - TezConfiguration.TEZ_TASK_MAX_EVENTS_PER_HEARTBEAT) - }); + Configuration.addDeprecation("tez.am.counters.max.keys", TezConfiguration.TEZ_COUNTERS_MAX); + Configuration.addDeprecation("tez.am.counters.groups.max.keys", + TezConfiguration.TEZ_COUNTERS_MAX_GROUPS); + Configuration.addDeprecation("tez.am.counters.name.max.keys", + TezConfiguration.TEZ_COUNTERS_COUNTER_NAME_MAX_LENGTH); + Configuration.addDeprecation("tez.am.counters.group-name.max.keys", + TezConfiguration.TEZ_COUNTERS_GROUP_NAME_MAX_LENGTH); + + Configuration.addDeprecation("tez.task.scale.task.memory.enabled", + TezConfiguration.TEZ_TASK_SCALE_MEMORY_ENABLED); + Configuration.addDeprecation("tez.task.scale.task.memory.allocator.class", + TezConfiguration.TEZ_TASK_SCALE_MEMORY_ALLOCATOR_CLASS); + Configuration.addDeprecation("tez.task.scale.task.memory.reserve-fraction", + TezConfiguration.TEZ_TASK_SCALE_MEMORY_RESERVE_FRACTION); + Configuration + .addDeprecation("tez.task.scale.task.memory.additional-reservation.fraction.per-io", + TezConfiguration.TEZ_TASK_SCALE_MEMORY_ADDITIONAL_RESERVATION_FRACTION_PER_IO); + Configuration.addDeprecation("tez.task.scale.task.memory.additional-reservation.fraction.max", + TezConfiguration.TEZ_TASK_SCALE_MEMORY_ADDITIONAL_RESERVATION_FRACTION_MAX); + Configuration.addDeprecation("tez.task.scale.task.memory.ratios", + TezConfiguration.TEZ_TASK_SCALE_MEMORY_WEIGHTED_RATIOS); + + Configuration.addDeprecation("tez.task.max-events-per-heartbeat.max", + TezConfiguration.TEZ_TASK_MAX_EVENTS_PER_HEARTBEAT); } public TezConfiguration() { http://git-wip-us.apache.org/repos/asf/tez/blob/6b531075/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java b/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java index fdc0cb7..1aba859 100644 --- a/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java +++ b/tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java @@ -19,25 +19,12 @@ package org.apache.tez.util; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity; -import org.apache.hadoop.yarn.client.api.TimelineClient; import org.apache.hadoop.yarn.util.ResourceCalculatorProcessTree; import org.apache.tez.dag.api.TezConfiguration; -import org.apache.tez.dag.app.AppContext; -import org.apache.tez.dag.history.DAGHistoryEvent; -import org.apache.tez.dag.history.events.DAGStartedEvent; -import org.apache.tez.dag.records.TezDAGID; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; public class TestTezMxBeanResourceCalculator {