ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lpus...@apache.org
Subject ambari git commit: Revert "BUG-74324 rebalance hdfs custom command supports individual timeout - draft"
Date Mon, 20 Mar 2017 16:21:06 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 0c7dd9383 -> f1113a261


Revert "BUG-74324 rebalance hdfs custom command supports individual timeout - draft"

This reverts commit 0c7dd9383038b53cfe65c21b885fd6e901834821.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f1113a26
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1113a26
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1113a26

Branch: refs/heads/trunk
Commit: f1113a26136a9349cb50aed80de3fe74819ee8b7
Parents: 0c7dd93
Author: lpuskas <lpuskas@apache.org>
Authored: Mon Mar 20 17:20:30 2017 +0100
Committer: lpuskas <lpuskas@apache.org>
Committed: Mon Mar 20 17:20:30 2017 +0100

----------------------------------------------------------------------
 ambari-server/pom.xml                           | 22 --------------------
 .../AmbariCustomCommandExecutionHelper.java     | 11 +---------
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |  1 -
 3 files changed, 1 insertion(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f1113a26/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index cb687e0..8b4c8d6 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -50,31 +50,9 @@
     <el.log>ALL</el.log> <!-- log level for EclipseLink eclipselink-staticweave-maven-plugin
-->
     <xlint>none</xlint> <!-- passed to Java compiler -Xlint: flag -->
   </properties>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.5</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.7</version>
-        <configuration>
-        <linkXref>true</linkXref>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.7</version>
-      </plugin>
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <version>1.8</version>

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1113a26/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index db18394..77d5bf8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -448,16 +448,7 @@ public class AmbariCustomCommandExecutionHelper {
 
       if (serviceInfo.getSchemaVersion().equals(AmbariMetaInfo.SCHEMA_VERSION_2)) {
         // Service check command is not custom command
-        CommandScriptDefinition script = null;
-
-        if (customCommandDefinition != null) {
-          LOG.debug("Getting command script for custom command {}", customCommandDefinition.getName());
-          script = customCommandDefinition.getCommandScript();
-        } else {
-          LOG.debug("Getting command script for component {}", componentInfo.getDisplayName());
-          // Service check command is not custom command
-          script = componentInfo.getCommandScript();
-        }
+        CommandScriptDefinition script = componentInfo.getCommandScript();
 
         if (script != null) {
           commandParams.put(SCRIPT, script.getScript());

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1113a26/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
index d9b542f..3026938 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
@@ -102,7 +102,6 @@
               <commandScript>
                 <script>scripts/namenode.py</script>
                 <scriptType>PYTHON</scriptType>
-                <timeout>1</timeout>
               </commandScript>
             </customCommand>
           </customCommands>


Mime
View raw message