TEZ-2767. Make TezMxBeanResourceCalculator the default resource calculator. (sseth)
authorSiddharth Seth <sseth@apache.org>
Wed, 2 Sep 2015 18:40:04 +0000 (11:40 -0700)
committerSiddharth Seth <sseth@apache.org>
Wed, 2 Sep 2015 18:40:04 +0000 (11:40 -0700)
CHANGES.txt
tez-common/pom.xml
tez-common/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java [moved from tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java with 100% similarity]
tez-common/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java [moved from tez-plugins/tez-mbeans-resource-calculator/src/test/java/org/apache/tez/util/TestTezMxBeanResourceCalculator.java with 100% similarity]
tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
tez-plugins/pom.xml
tez-plugins/tez-mbeans-resource-calculator/findbugs-exclude.xml [deleted file]
tez-plugins/tez-mbeans-resource-calculator/pom.xml [deleted file]

index 5f0ca2b..1f785b0 100644 (file)
@@ -7,6 +7,7 @@ Release 0.8.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2767. Make TezMxBeanResourceCalculator the default resource calculator.
   TEZ-2765. Change Xmlwriter to use defaultValue instead of value tag.
   TEZ-2750. Shuffle may not shutdown in case of a fetch failure, causing it to hang.
   TEZ-2294. Add tez-site-template.xml with description of config properties.
@@ -158,6 +159,7 @@ Release 0.7.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2767. Make TezMxBeanResourceCalculator the default resource calculator.
   TEZ-2602. Throwing EOFException when launching MR job
   TEZ-2575. Handle KeyValue pairs size which do not fit in a single block in PipelinedSorter
   TEZ-2198. Fix sorter spill counts
index fceb589..49846ca 100644 (file)
       <artifactId>tez-api</artifactId>
     </dependency>
     <dependency>
-     <groupId>junit</groupId>
-     <artifactId>junit</artifactId>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
index 613046b..04c7b82 100644 (file)
@@ -172,6 +172,7 @@ 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.dag.utils.Simple2LevelVersionComparator;
+import org.apache.tez.util.TezMxBeanResourceCalculator;
 import org.codehaus.jettison.json.JSONException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -351,7 +352,8 @@ public class DAGAppMaster extends AbstractService {
   
   private void initResourceCalculatorPlugins() {
     Class<? extends ResourceCalculatorProcessTree> clazz = amConf.getClass(
-        TezConfiguration.TEZ_TASK_RESOURCE_CALCULATOR_PROCESS_TREE_CLASS, null,
+        TezConfiguration.TEZ_TASK_RESOURCE_CALCULATOR_PROCESS_TREE_CLASS,
+        TezMxBeanResourceCalculator.class,
         ResourceCalculatorProcessTree.class);
 
     // this is set by YARN NM
index 657b8bf..7114bdc 100644 (file)
         <module>tez-history-parser</module>
       </modules>
     </profile>
-    <profile>
-      <id>jdk6check</id>
-      <activation>
-        <property>
-          <name>java.vendor.url</name>
-          <value>http://java.sun.com/</value>
-        </property>
-      </activation>
-      <modules>
-        <module>tez-mbeans-resource-calculator</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>jdk7check</id>
-      <activation>
-        <property>
-          <name>java.vendor.url</name>
-          <value>http://java.oracle.com/</value>
-        </property>
-      </activation>
-      <modules>
-        <module>tez-mbeans-resource-calculator</module>
-      </modules>
-    </profile>
   </profiles>
 
   <build>
diff --git a/tez-plugins/tez-mbeans-resource-calculator/findbugs-exclude.xml b/tez-plugins/tez-mbeans-resource-calculator/findbugs-exclude.xml
deleted file mode 100644 (file)
index 5b11308..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License. See accompanying LICENSE file.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
diff --git a/tez-plugins/tez-mbeans-resource-calculator/pom.xml b/tez-plugins/tez-mbeans-resource-calculator/pom.xml
deleted file mode 100644 (file)
index 6783803..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License. See accompanying LICENSE file.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.tez</groupId>
-    <artifactId>tez-plugins</artifactId>
-    <version>0.8.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>tez-mbeans-resource-calculator</artifactId>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tez</groupId>
-      <artifactId>tez-dag</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>