ambari git commit: AMBARI-19805. Add outputFormat attribute to all PXF Hive-related profiles.

2017-02-02 Thread odiachenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a8887c445 -> ccaa4a8a0


AMBARI-19805. Add outputFormat attribute to all PXF Hive-related profiles.


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

Branch: refs/heads/branch-2.5
Commit: ccaa4a8a0b51dd3436db9bff9cbbb13e9455ec7c
Parents: a8887c4
Author: Oleksandr Diachenko 
Authored: Thu Feb 2 16:01:24 2017 -0800
Committer: Oleksandr Diachenko 
Committed: Thu Feb 2 16:01:24 2017 -0800

--
 .../PXF/3.0.0/configuration/pxf-profiles.xml | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ccaa4a8a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
index 77aa4fc..a3e587d 100644
--- 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
+++ 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
@@ -71,12 +71,16 @@ under the License.
 
 
 Hive
-This profile is suitable for using when connecting to 
Hive
+
+This profile is suitable for using when connecting to Hive.
+Supports GPDBWritable output format, as specified in FORMAT header 
parameter.
+
 
 
org.apache.hawq.pxf.plugins.hive.HiveDataFragmenter
 org.apache.hawq.pxf.plugins.hive.HiveAccessor
 org.apache.hawq.pxf.plugins.hive.HiveResolver
 
org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher
+
org.apache.hawq.pxf.service.io.GPDBWritable
 
 
 
@@ -85,12 +89,15 @@ under the License.
 and serialized with either the ColumnarSerDe or the 
LazyBinaryColumnarSerDe.
 It is much faster than the general purpose Hive profile.
 DELIMITER parameter is mandatory.
+Supports both GPDBWritable and TEXT output formats, as specified 
in FORMAT header parameter.
+Primary optimized for TEXT output format.
 
 
 
org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter
 
org.apache.hawq.pxf.plugins.hive.HiveRCFileAccessor
 
org.apache.hawq.pxf.plugins.hive.HiveColumnarSerdeResolver
 
org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher
+org.apache.hawq.pxf.service.io.Text
 
 
 
@@ -98,12 +105,15 @@ under the License.
 This profile is suitable only for Hive tables stored as 
Text files.
 It is much faster than the general purpose Hive profile.
 DELIMITER parameter is mandatory.
+Supports both GPDBWritable and TEXT output formats, as specified 
in FORMAT header parameter.
+Primary optimized for TEXT output format.
 
 
 
org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter
 
org.apache.hawq.pxf.plugins.hive.HiveLineBreakAccessor
 
org.apache.hawq.pxf.plugins.hive.HiveStringPassResolver
 
org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher
+org.apache.hawq.pxf.service.io.Text
 
 
 
@@ -111,13 +121,14 @@ under the License.
 This profile is suitable only for Hive tables stored in 
ORC files
 and serialized with either the ColumnarSerDe or the 
LazyBinaryColumnarSerDe.
 It is much faster than the general purpose Hive profile.
-DELIMITER parameter is mandatory.
+Supports GPDBWritable output format, as specified in FORMAT header 
parameter.
 
 
 
org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter
 
org.apache.hawq.pxf.plugins.hive.HiveORCAccessor
 
org.apache.hawq.pxf.plugins.hive.HiveORCSerdeResolver
 
org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher
+
org.apache.hawq.pxf.service.io.GPDBWritable

ambari git commit: AMBARI-19805. Add outputFormat attribute to all PXF Hive-related profiles.

2017-02-02 Thread odiachenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 975dd1d40 -> 14cd837ea


AMBARI-19805. Add outputFormat attribute to all PXF Hive-related profiles.


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

Branch: refs/heads/trunk
Commit: 14cd837ea5c33ca4ebf5daf9262fe40d1f5a9130
Parents: 975dd1d
Author: Oleksandr Diachenko 
Authored: Thu Feb 2 15:58:28 2017 -0800
Committer: Oleksandr Diachenko 
Committed: Thu Feb 2 15:58:28 2017 -0800

--
 .../PXF/3.0.0/configuration/pxf-profiles.xml | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/14cd837e/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
index 77aa4fc..a3e587d 100644
--- 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
+++ 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
@@ -71,12 +71,16 @@ under the License.
 
 
 Hive
-This profile is suitable for using when connecting to 
Hive
+
+This profile is suitable for using when connecting to Hive.
+Supports GPDBWritable output format, as specified in FORMAT header 
parameter.
+
 
 
org.apache.hawq.pxf.plugins.hive.HiveDataFragmenter
 org.apache.hawq.pxf.plugins.hive.HiveAccessor
 org.apache.hawq.pxf.plugins.hive.HiveResolver
 
org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher
+
org.apache.hawq.pxf.service.io.GPDBWritable
 
 
 
@@ -85,12 +89,15 @@ under the License.
 and serialized with either the ColumnarSerDe or the 
LazyBinaryColumnarSerDe.
 It is much faster than the general purpose Hive profile.
 DELIMITER parameter is mandatory.
+Supports both GPDBWritable and TEXT output formats, as specified 
in FORMAT header parameter.
+Primary optimized for TEXT output format.
 
 
 
org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter
 
org.apache.hawq.pxf.plugins.hive.HiveRCFileAccessor
 
org.apache.hawq.pxf.plugins.hive.HiveColumnarSerdeResolver
 
org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher
+org.apache.hawq.pxf.service.io.Text
 
 
 
@@ -98,12 +105,15 @@ under the License.
 This profile is suitable only for Hive tables stored as 
Text files.
 It is much faster than the general purpose Hive profile.
 DELIMITER parameter is mandatory.
+Supports both GPDBWritable and TEXT output formats, as specified 
in FORMAT header parameter.
+Primary optimized for TEXT output format.
 
 
 
org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter
 
org.apache.hawq.pxf.plugins.hive.HiveLineBreakAccessor
 
org.apache.hawq.pxf.plugins.hive.HiveStringPassResolver
 
org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher
+org.apache.hawq.pxf.service.io.Text
 
 
 
@@ -111,13 +121,14 @@ under the License.
 This profile is suitable only for Hive tables stored in 
ORC files
 and serialized with either the ColumnarSerDe or the 
LazyBinaryColumnarSerDe.
 It is much faster than the general purpose Hive profile.
-DELIMITER parameter is mandatory.
+Supports GPDBWritable output format, as specified in FORMAT header 
parameter.
 
 
 
org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter
 
org.apache.hawq.pxf.plugins.hive.HiveORCAccessor
 
org.apache.hawq.pxf.plugins.hive.HiveORCSerdeResolver
 
org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher
+
org.apache.hawq.pxf.service.io.GPDBWritable

ambari git commit: AMBARI-19810. Remove upgrade logic in UpdateCatalog250 for tez-interactive-site's 'tez.runtime.io.sort.mb' and 'tez.runtime.unordered.output.buffer.size-mb'.

2017-02-02 Thread swapan 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 9b51e8b5f -> a8887c445


AMBARI-19810. Remove upgrade logic in UpdateCatalog250 for 
tez-interactive-site's 'tez.runtime.io.sort.mb' and 
'tez.runtime.unordered.output.buffer.size-mb'.


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

Branch: refs/heads/branch-2.5
Commit: a8887c44500d92e225d6d53774595500fc1a6c01
Parents: 9b51e8b
Author: Swapan Shridhar 
Authored: Thu Feb 2 11:23:17 2017 -0800
Committer: Swapan Shridhar 
Committed: Thu Feb 2 14:58:23 2017 -0800

--
 .../server/upgrade/UpgradeCatalog250.java   | 27 
 .../server/upgrade/UpgradeCatalog250Test.java   |  5 
 2 files changed, 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8887c44/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index 6b9076c..ccb6b9e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -161,7 +161,6 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 updateHadoopEnvConfigs();
 updateKafkaConfigs();
 updateHIVEInteractiveConfigs();
-updateTEZInteractiveConfigs();
 updateHiveLlapConfigs();
 updateTablesForZeppelinViewRemoval();
 updateZeppelinConfigs();
@@ -673,32 +672,6 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
   }
 
   /**
-   * Updates Tez for Hive2 Interactive's config in tez-interactive-site.
-   *
-   * @throws AmbariException
-   */
-  protected void updateTEZInteractiveConfigs() throws AmbariException {
-AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
-Clusters clusters = ambariManagementController.getClusters();
-if (clusters != null) {
-  Map clusterMap = clusters.getClusters();
-
-  if (clusterMap != null && !clusterMap.isEmpty()) {
-for (final Cluster cluster : clusterMap.values()) {
-  Config tezInteractiveSite = 
cluster.getDesiredConfigByType("tez-interactive-site");
-  if (tezInteractiveSite != null) {
-
-updateConfigurationProperties("tez-interactive-site", 
Collections.singletonMap("tez.runtime.io.sort.mb", "512"), true, true);
-
-updateConfigurationProperties("tez-interactive-site", 
Collections.singletonMap("tez.runtime.unordered.output.buffer.size-mb",
-"100"), true, true);
-  }
-}
-  }
-}
-  }
-
-  /**
* Updates Log Search configs.
*
* @throws AmbariException

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8887c44/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
index 1c455be..327a9c6 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
@@ -280,7 +280,6 @@ public class UpgradeCatalog250Test {
 Method updateAtlasConfigs = 
UpgradeCatalog250.class.getDeclaredMethod("updateAtlasConfigs");
 Method addNewConfigurationsFromXml = 
AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml");
 Method updateHIVEInteractiveConfigs = 
UpgradeCatalog250.class.getDeclaredMethod("updateHIVEInteractiveConfigs");
-Method updateTEZInteractiveConfigs = 
UpgradeCatalog250.class.getDeclaredMethod("updateTEZInteractiveConfigs");
 Method updateLogSearchConfigs = 
UpgradeCatalog250.class.getDeclaredMethod("updateLogSearchConfigs");
 Method updateAmbariInfraConfigs = 
UpgradeCatalog250.class.getDeclaredMethod("updateAmbariInfraConfigs");
 Method updateRangerUrlConfigs = 
UpgradeCatalog250.class.getDeclaredMethod("updateRangerUrlConfigs");
@@ -292,7 +291,6 @@ public class UpgradeCatalog250Test {
   .addMockedMethod(updateHadoopEnvConfigs)
   .addMockedMethod(updateKafkaConfigs)
   .addMockedMethod(updateHIVEInteractiveConfigs)
-

ambari git commit: AMBARI-19810. Remove upgrade logic in UpdateCatalog250 for tez-interactive-site's 'tez.runtime.io.sort.mb' and 'tez.runtime.unordered.output.buffer.size-mb'.

2017-02-02 Thread swapan 
Repository: ambari
Updated Branches:
  refs/heads/trunk ebc05a917 -> 975dd1d40


AMBARI-19810. Remove upgrade logic in UpdateCatalog250 for 
tez-interactive-site's 'tez.runtime.io.sort.mb' and 
'tez.runtime.unordered.output.buffer.size-mb'.


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

Branch: refs/heads/trunk
Commit: 975dd1d40c6136a61e7d014fb0dfc32e09863a2b
Parents: ebc05a9
Author: Swapan Shridhar 
Authored: Thu Feb 2 14:09:00 2017 -0800
Committer: Swapan Shridhar 
Committed: Thu Feb 2 14:57:04 2017 -0800

--
 .../server/upgrade/UpgradeCatalog250.java   | 58 ---
 .../server/upgrade/UpgradeCatalog250Test.java   | 78 +---
 2 files changed, 50 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/975dd1d4/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index 71cde7e..1e36a3c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -17,20 +17,8 @@
  */
 package org.apache.ambari.server.upgrade;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
+import com.google.inject.Inject;
+import com.google.inject.Injector;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.actionmanager.CommandExecutionType;
 import org.apache.ambari.server.configuration.Configuration;
@@ -46,8 +34,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.support.JdbcUtils;
 
-import com.google.inject.Inject;
-import com.google.inject.Injector;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Upgrade catalog for version 2.5.0.
@@ -161,7 +160,6 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 updateHadoopEnvConfigs();
 updateKafkaConfigs();
 updateHIVEInteractiveConfigs();
-updateTEZInteractiveConfigs();
 updateHiveLlapConfigs();
 updateTablesForZeppelinViewRemoval();
 updateZeppelinConfigs();
@@ -678,32 +676,6 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
   }
 
   /**
-   * Updates Tez for Hive2 Interactive's config in tez-interactive-site.
-   *
-   * @throws AmbariException
-   */
-  protected void updateTEZInteractiveConfigs() throws AmbariException {
-AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
-Clusters clusters = ambariManagementController.getClusters();
-if (clusters != null) {
-  Map clusterMap = clusters.getClusters();
-
-  if (clusterMap != null && !clusterMap.isEmpty()) {
-for (final Cluster cluster : clusterMap.values()) {
-  Config tezInteractiveSite = 
cluster.getDesiredConfigByType("tez-interactive-site");
-  if (tezInteractiveSite != null) {
-
-updateConfigurationProperties("tez-interactive-site", 
Collections.singletonMap("tez.runtime.io.sort.mb", "512"), true, true);
-
-updateConfigurationProperties("tez-interactive-site", 
Collections.singletonMap("tez.runtime.unordered.output.buffer.size-mb",
-"100"), true, true);
-  }
-}
-  }
-}
-  }
-
-  /**
* Updates Log Search configs.
*
* @throws AmbariException

http://git-wip-us.apache.org/repos/asf/ambari/blob/975dd1d4/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java

ambari git commit: AMBARI-17722. Add some of value-attributes to property files in TEZ. (Masahiro Tanaka via yusaku)

2017-02-02 Thread yusaku 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 53e1bd8af -> 9b51e8b5f


AMBARI-17722. Add some of value-attributes to property files in TEZ. (Masahiro 
Tanaka via yusaku)


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

Branch: refs/heads/branch-2.5
Commit: 9b51e8b5f3a088c9ee2d4e557c003acf39487c53
Parents: 53e1bd8
Author: Yusaku Sako 
Authored: Thu Feb 2 13:08:09 2017 -0800
Committer: Yusaku Sako 
Committed: Thu Feb 2 13:09:20 2017 -0800

--
 .../TEZ/0.4.0.2.1/configuration/tez-site.xml| 27 +-
 .../services/TEZ/configuration/tez-site.xml | 65 ++-
 .../2.2/services/TEZ/configuration/tez-site.xml | 83 ++
 .../2.3/services/TEZ/configuration/tez-site.xml |  6 ++
 .../2.5/services/TEZ/configuration/tez-site.xml |  6 ++
 .../2.2/services/TEZ/configuration/tez-site.xml | 88 +++-
 6 files changed, 272 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b51e8b5/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
 
b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
index bf120e6..d7031e1 100644
--- 
a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
@@ -41,6 +41,7 @@
 The amount of memory to be used by the AppMaster
 
   int
+  MB
 
 
   
@@ -57,6 +58,9 @@
 In case of a ScatterGather connection, the fraction of source 
tasks which should
   complete before tasks for the current vertex are schedule
 
+
+  float
+
 
   
   
@@ -72,6 +76,10 @@
 tez.am.am-rm.heartbeat.interval-ms.max
 250
 The maximum heartbeat interval between the AM and RM in 
milliseconds
+
+  int
+  ms
+
 
   
   
@@ -94,6 +102,7 @@
 
 
   int
+  Bytes
 
 
   
@@ -105,6 +114,7 @@
 
 
   int
+  Bytes
 
 
   
@@ -136,6 +146,10 @@
   it immediately. Only active when reuse is enabled. Set to -1 to never 
release a container
   in a session
 
+
+  int
+  ms
+
 
   
   
@@ -149,9 +163,13 @@
   
 tez.task.get-task.sleep.interval-ms.max
 200
-The maximum amount of time, in seconds, to wait before a task 
asks an AM for
+The maximum amount of time, in milliseconds, to wait before a 
task asks an AM for
   another task
 
+
+  int
+  ms
+
 
   
   
@@ -170,6 +188,10 @@
 Time (in seconds) to wait for AM to come up when trying to 
submit a DAG from
   the client
 
+
+  int
+  seconds
+
 
   
   
@@ -229,6 +251,9 @@
 tez.yarn.ats.enabled
 true
 Whether to send history events to YARN Application Timeline 
Server
+
+  boolean
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b51e8b5/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
index 704022c..3632318 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
@@ -39,6 +39,10 @@
 tez.am.resource.memory.mb
 1536
 The amount of memory to be used by the AppMaster
+
+  int
+  MB
+
 
   
   
@@ -54,6 +58,9 @@
 In case of a ScatterGather connection, the fraction of source 
tasks which should
   complete before tasks for the current vertex are schedule
 
+
+  float
+
 
   
   
@@ -63,12 +70,19 @@
   completed, all tasks on the current vertex can be scheduled. Number of 
tasks ready for
   scheduling on the current vertex scales linearly between min-fraction 
and max-fraction
 
+
+  float
+
 
   
   
 tez.am.am-rm.heartbeat.interval-ms.max
 250
 The maximum heartbeat interval between the AM and RM in 
milliseconds
+
+  int
+  ms
+
 
   
   
@@ -78,6 +92,9 @@

ambari git commit: AMBARI-17722. Add some of value-attributes to property files in TEZ. (Masahiro Tanaka via yusaku)

2017-02-02 Thread yusaku 
Repository: ambari
Updated Branches:
  refs/heads/trunk b457d7b87 -> ebc05a917


AMBARI-17722. Add some of value-attributes to property files in TEZ. (Masahiro 
Tanaka via yusaku)


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

Branch: refs/heads/trunk
Commit: ebc05a917597eaa0b9cba60bb205478143538a78
Parents: b457d7b
Author: Yusaku Sako 
Authored: Thu Feb 2 13:08:09 2017 -0800
Committer: Yusaku Sako 
Committed: Thu Feb 2 13:08:34 2017 -0800

--
 .../TEZ/0.4.0.2.1/configuration/tez-site.xml| 27 +-
 .../services/TEZ/configuration/tez-site.xml | 65 ++-
 .../2.2/services/TEZ/configuration/tez-site.xml | 83 ++
 .../2.3/services/TEZ/configuration/tez-site.xml |  6 ++
 .../2.5/services/TEZ/configuration/tez-site.xml |  6 ++
 .../2.2/services/TEZ/configuration/tez-site.xml | 88 +++-
 6 files changed, 272 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ebc05a91/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
 
b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
index bf120e6..d7031e1 100644
--- 
a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
@@ -41,6 +41,7 @@
 The amount of memory to be used by the AppMaster
 
   int
+  MB
 
 
   
@@ -57,6 +58,9 @@
 In case of a ScatterGather connection, the fraction of source 
tasks which should
   complete before tasks for the current vertex are schedule
 
+
+  float
+
 
   
   
@@ -72,6 +76,10 @@
 tez.am.am-rm.heartbeat.interval-ms.max
 250
 The maximum heartbeat interval between the AM and RM in 
milliseconds
+
+  int
+  ms
+
 
   
   
@@ -94,6 +102,7 @@
 
 
   int
+  Bytes
 
 
   
@@ -105,6 +114,7 @@
 
 
   int
+  Bytes
 
 
   
@@ -136,6 +146,10 @@
   it immediately. Only active when reuse is enabled. Set to -1 to never 
release a container
   in a session
 
+
+  int
+  ms
+
 
   
   
@@ -149,9 +163,13 @@
   
 tez.task.get-task.sleep.interval-ms.max
 200
-The maximum amount of time, in seconds, to wait before a task 
asks an AM for
+The maximum amount of time, in milliseconds, to wait before a 
task asks an AM for
   another task
 
+
+  int
+  ms
+
 
   
   
@@ -170,6 +188,10 @@
 Time (in seconds) to wait for AM to come up when trying to 
submit a DAG from
   the client
 
+
+  int
+  seconds
+
 
   
   
@@ -229,6 +251,9 @@
 tez.yarn.ats.enabled
 true
 Whether to send history events to YARN Application Timeline 
Server
+
+  boolean
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebc05a91/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
index 704022c..3632318 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-site.xml
@@ -39,6 +39,10 @@
 tez.am.resource.memory.mb
 1536
 The amount of memory to be used by the AppMaster
+
+  int
+  MB
+
 
   
   
@@ -54,6 +58,9 @@
 In case of a ScatterGather connection, the fraction of source 
tasks which should
   complete before tasks for the current vertex are schedule
 
+
+  float
+
 
   
   
@@ -63,12 +70,19 @@
   completed, all tasks on the current vertex can be scheduled. Number of 
tasks ready for
   scheduling on the current vertex scales linearly between min-fraction 
and max-fraction
 
+
+  float
+
 
   
   
 tez.am.am-rm.heartbeat.interval-ms.max
 250
 The maximum heartbeat interval between the AM and RM in 
milliseconds
+
+  int
+  ms
+
 
   
   
@@ -78,6 +92,9 @@
   a

ambari git commit: AMBARI-19319 Disable auto start before RU/EU and enable during finalization phase

2017-02-02 Thread atkach 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 0ffa1bcd9 -> 53e1bd8af


AMBARI-19319 Disable auto start before RU/EU and enable during finalization 
phase


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

Branch: refs/heads/branch-2.5
Commit: 53e1bd8afa994715fcbd5ab69aae7f512e345246
Parents: 0ffa1bc
Author: Andrii Tkach 
Authored: Thu Feb 2 21:06:55 2017 +0200
Committer: Andrii Tkach 
Committed: Thu Feb 2 21:11:09 2017 +0200

--
 ambari-web/app/messages.js  | 1 +
 .../app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/53e1bd8a/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5e0f2d1..0cd41e0 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1790,6 +1790,7 @@ Em.I18n.translations = {
 "Click on Finalize when you are ready to finalize the downgrade and 
commit to the new version." +
 " You are strongly encouraged to run tests on your cluster to ensure it is 
fully operational before finalizing." +
 " You cannot go back to the original version once the downgrade is 
finalized.",
+  'admin.stackUpgrade.finalize.message.autoStart': "Please remember to 
re-enable Auto Start if you disabled it for upgrade.",
   'admin.stackUpgrade.finalize.message.skippedServiceChecks': "During the 
upgrade, checks for the following services failed and were skipped:",
   'admin.stackUpgrade.finalize.message.testServices': "You are strongly 
recommended to test these services before finalizing upgrade.",
   'admin.stackUpgrade.failedHosts.message': "Upgrade did not succeed on",

http://git-wip-us.apache.org/repos/asf/ambari/blob/53e1bd8a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index a86048e..4678f01 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -127,6 +127,7 @@
 {{else}}
   {{t 
admin.stackUpgrade.finalize.message.upgrade}}
 {{/if}}
+  {{t 
admin.stackUpgrade.finalize.message.autoStart}}
 
 {{#if areSkippedServiceChecksLoaded}}
   {{#if skippedServiceChecks.length}}

ambari git commit: AMBARI-19319 Disable auto start before RU/EU and enable during finalization phase

2017-02-02 Thread atkach 
Repository: ambari
Updated Branches:
  refs/heads/trunk 69c8389ef -> b457d7b87


AMBARI-19319 Disable auto start before RU/EU and enable during finalization 
phase


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

Branch: refs/heads/trunk
Commit: b457d7b874364b105d08a657e37721de973f9dca
Parents: 69c8389
Author: Andrii Tkach 
Authored: Thu Feb 2 21:06:55 2017 +0200
Committer: Andrii Tkach 
Committed: Thu Feb 2 21:06:55 2017 +0200

--
 ambari-web/app/messages.js  | 1 +
 .../app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b457d7b8/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6f8f435..cb88fda 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1818,6 +1818,7 @@ Em.I18n.translations = {
 "Click on Finalize when you are ready to finalize the downgrade and 
commit to the new version." +
 " You are strongly encouraged to run tests on your cluster to ensure it is 
fully operational before finalizing." +
 " You cannot go back to the original version once the downgrade is 
finalized.",
+  'admin.stackUpgrade.finalize.message.autoStart': "Please remember to 
re-enable Auto Start if you disabled it for upgrade.",
   'admin.stackUpgrade.finalize.message.skippedServiceChecks': "During the 
upgrade, checks for the following services failed and were skipped:",
   'admin.stackUpgrade.finalize.message.testServices': "You are strongly 
recommended to test these services before finalizing upgrade.",
   'admin.stackUpgrade.failedHosts.message': "Upgrade did not succeed on",

http://git-wip-us.apache.org/repos/asf/ambari/blob/b457d7b8/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index 8bb0904..f82cca4 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -126,6 +126,7 @@
 {{else}}
   {{t 
admin.stackUpgrade.finalize.message.upgrade}}
 {{/if}}
+  {{t 
admin.stackUpgrade.finalize.message.autoStart}}
 
 {{#if areSkippedServiceChecksLoaded}}
   {{#if skippedServiceChecks.length}}

ambari git commit: AMBARI-19828. UI changes to resolve discrepancies between what the stack vs Ambari reports as "live" for NodeManagers. (Vivek Subramanian via yusaku)

2017-02-02 Thread yusaku 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 d2837f786 -> 0ffa1bcd9


AMBARI-19828. UI changes to resolve discrepancies between what the stack vs 
Ambari reports as "live" for NodeManagers. (Vivek Subramanian via yusaku)


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

Branch: refs/heads/branch-2.5
Commit: 0ffa1bcd924d1d1c3e7236cafe2f23a2199bbdad
Parents: d2837f7
Author: Yusaku Sako 
Authored: Thu Feb 2 10:36:48 2017 -0800
Committer: Yusaku Sako 
Committed: Thu Feb 2 10:37:27 2017 -0800

--
 ambari-web/app/messages.js | 13 -
 ambari-web/app/views/main/service/services/hdfs.js | 10 ++
 ambari-web/app/views/main/service/services/yarn.js |  2 +-
 .../test/views/main/service/services/hdfs_test.js  |  6 --
 .../test/views/main/service/services/yarn_test.js  |  2 +-
 5 files changed, 24 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ffa1bcd/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 33a8289..5e0f2d1 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2896,7 +2896,18 @@ Em.I18n.translations = {
   'dashboard.services.yarn.resourceManager.standby':'Standby ResourceManager',
   'dashboard.services.resourceManager.nodes.heap':'ResourceManager Heap',
   'dashboard.services.yarn.nodeManagers.status': 'NodeManagers Status',
-  'dashboard.services.yarn.nodeManagers.status.msg': '{0} active / {1} lost / 
{2} unhealthy / {3} rebooted / {4} decommissioned',
+  'dashboard.services.yarn.nodeManagers.status.active': 'active',
+  'dashboard.services.yarn.nodeManagers.status.lost': 'lost',
+  'dashboard.services.yarn.nodeManagers.status.unhealthy': 'unhealthy',
+  'dashboard.services.yarn.nodeManagers.status.rebooted': 'rebooted',
+  'dashboard.services.yarn.nodeManagers.status.decommissioned': 
'decommissioned',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.active': 'This is the 
number of NodeManagers that are active as reported from the ResourceManager',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.lost': 'This is the 
number of NodeManagers that are lost as reported from the ResourceManager. ' +
+'Even if a NodeManager process is up, the ResourceManager might see the 
status as lost if the NodeManager is not communicating with the ' +
+'ResourceManager as expected. This can be due to situations such as a 
network issue or a hanging NodeManager process due to excessive garbage 
collection.',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.unhealthy': 'This is 
the number of NodeManagers that are unhealthy as reported from the 
ResourceManager.',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.rebooted': 'This is the 
number of NodeManagers that are in the rebooted state as reported from the 
ResourceManager.',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.decommissioned': 'This 
is the number of NodeManagers that are decommissioned as reported from the 
ResourceManager.',
   'dashboard.services.yarn.containers': 'Containers',
   'dashboard.services.yarn.containers.msg': '{0} allocated / {1} pending / {2} 
reserved',
   'dashboard.services.yarn.apps': 'Applications',

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ffa1bcd/ambari-web/app/views/main/service/services/hdfs.js
--
diff --git a/ambari-web/app/views/main/service/services/hdfs.js 
b/ambari-web/app/views/main/service/services/hdfs.js
index 40fb761..f85e095 100644
--- a/ambari-web/app/views/main/service/services/hdfs.js
+++ b/ambari-web/app/views/main/service/services/hdfs.js
@@ -74,10 +74,12 @@ App.MainDashboardServiceHdfsView = 
App.MainDashboardServiceView.extend({
   $('[rel=healthTooltip]').tooltip('destroy')
 }
   }),
-
-  didInsertElement: function() {
-App.tooltip($("[rel='tooltip']"));
-  },
+  
+  metricsNotAvailableObserver: function () {
+if(!this.get("service.metricsNotAvailable")) {
+  App.tooltip($("[rel='tooltip']"));
+}
+  }.observes("service.metricsNotAvailable"),
 
   willDestroyElement: function() {
 $("[rel='tooltip']").tooltip('destroy');

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ffa1bcd/ambari-web/app/views/main/service/services/yarn.js
--
diff --git a/ambari-web/app/views/main/service/services/yarn.js

ambari git commit: AMBARI-19828. UI changes to resolve discrepancies between what the stack vs Ambari reports as "live" for NodeManagers. (Vivek Subramanian via yusaku)

2017-02-02 Thread yusaku 
Repository: ambari
Updated Branches:
  refs/heads/trunk 9c1b153e2 -> 69c8389ef


AMBARI-19828. UI changes to resolve discrepancies between what the stack vs 
Ambari reports as "live" for NodeManagers. (Vivek Subramanian via yusaku)


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

Branch: refs/heads/trunk
Commit: 69c8389ef8d76e8a7a41a8a796f51be044033026
Parents: 9c1b153
Author: Yusaku Sako 
Authored: Thu Feb 2 10:36:48 2017 -0800
Committer: Yusaku Sako 
Committed: Thu Feb 2 10:36:48 2017 -0800

--
 ambari-web/app/messages.js | 13 -
 ambari-web/app/views/main/service/services/hdfs.js | 10 ++
 ambari-web/app/views/main/service/services/yarn.js |  2 +-
 .../test/views/main/service/services/hdfs_test.js  |  6 --
 .../test/views/main/service/services/yarn_test.js  |  2 +-
 5 files changed, 24 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/69c8389e/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 9644edb..6f8f435 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2930,7 +2930,18 @@ Em.I18n.translations = {
   'dashboard.services.yarn.resourceManager.standby':'Standby ResourceManager',
   'dashboard.services.resourceManager.nodes.heap':'ResourceManager Heap',
   'dashboard.services.yarn.nodeManagers.status': 'NodeManagers Status',
-  'dashboard.services.yarn.nodeManagers.status.msg': '{0} active / {1} lost / 
{2} unhealthy / {3} rebooted / {4} decommissioned',
+  'dashboard.services.yarn.nodeManagers.status.active': 'active',
+  'dashboard.services.yarn.nodeManagers.status.lost': 'lost',
+  'dashboard.services.yarn.nodeManagers.status.unhealthy': 'unhealthy',
+  'dashboard.services.yarn.nodeManagers.status.rebooted': 'rebooted',
+  'dashboard.services.yarn.nodeManagers.status.decommissioned': 
'decommissioned',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.active': 'This is the 
number of NodeManagers that are active as reported from the ResourceManager',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.lost': 'This is the 
number of NodeManagers that are lost as reported from the ResourceManager. ' +
+'Even if a NodeManager process is up, the ResourceManager might see the 
status as lost if the NodeManager is not communicating with the ' +
+'ResourceManager as expected. This can be due to situations such as a 
network issue or a hanging NodeManager process due to excessive garbage 
collection.',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.unhealthy': 'This is 
the number of NodeManagers that are unhealthy as reported from the 
ResourceManager.',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.rebooted': 'This is the 
number of NodeManagers that are in the rebooted state as reported from the 
ResourceManager.',
+  'dashboard.services.yarn.nodeManagers.status.tooltip.decommissioned': 'This 
is the number of NodeManagers that are decommissioned as reported from the 
ResourceManager.',
   'dashboard.services.yarn.containers': 'Containers',
   'dashboard.services.yarn.containers.msg': '{0} allocated / {1} pending / {2} 
reserved',
   'dashboard.services.yarn.apps': 'Applications',

http://git-wip-us.apache.org/repos/asf/ambari/blob/69c8389e/ambari-web/app/views/main/service/services/hdfs.js
--
diff --git a/ambari-web/app/views/main/service/services/hdfs.js 
b/ambari-web/app/views/main/service/services/hdfs.js
index 40fb761..f85e095 100644
--- a/ambari-web/app/views/main/service/services/hdfs.js
+++ b/ambari-web/app/views/main/service/services/hdfs.js
@@ -74,10 +74,12 @@ App.MainDashboardServiceHdfsView = 
App.MainDashboardServiceView.extend({
   $('[rel=healthTooltip]').tooltip('destroy')
 }
   }),
-
-  didInsertElement: function() {
-App.tooltip($("[rel='tooltip']"));
-  },
+  
+  metricsNotAvailableObserver: function () {
+if(!this.get("service.metricsNotAvailable")) {
+  App.tooltip($("[rel='tooltip']"));
+}
+  }.observes("service.metricsNotAvailable"),
 
   willDestroyElement: function() {
 $("[rel='tooltip']").tooltip('destroy');

http://git-wip-us.apache.org/repos/asf/ambari/blob/69c8389e/ambari-web/app/views/main/service/services/yarn.js
--
diff --git a/ambari-web/app/views/main/service/services/yarn.js 
b/ambari-web/app/views/main/service/services/yarn.js

ambari git commit: AMBARI-19825 : Metrics data is not getting collected for different services when AMS HTTPS is enabled. (avijayan)

2017-02-02 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/trunk 5d4d99efb -> 9c1b153e2


AMBARI-19825 : Metrics data is not getting collected for different services 
when AMS HTTPS is enabled. (avijayan)


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

Branch: refs/heads/trunk
Commit: 9c1b153e21f04d96f0afa806436c8e4d702be0cc
Parents: 5d4d99e
Author: Aravindan Vijayan 
Authored: Thu Feb 2 10:29:14 2017 -0800
Committer: Aravindan Vijayan 
Committed: Thu Feb 2 10:29:14 2017 -0800

--
 .../metrics2/sink/flume/FlumeTimelineMetricsSink.java |  3 ++-
 .../metrics2/sink/timeline/HadoopTimelineMetricsSink.java |  6 +++---
 .../server/metrics/system/impl/AmbariMetricSinkImpl.java  | 10 ++
 3 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1b153e/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
index c1b684b..86e092a 100644
--- 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
@@ -107,13 +107,14 @@ public class FlumeTimelineMetricsSink extends 
AbstractTimelineMetricsSink implem
 // Initialize the collector write strategy
 super.init();
 
-collectorUri = constructTimelineMetricUri(protocol, 
findPreferredCollectHost(), port);
 if (protocol.contains("https")) {
   String trustStorePath = 
configuration.getProperty(SSL_KEYSTORE_PATH_PROPERTY).trim();
   String trustStoreType = 
configuration.getProperty(SSL_KEYSTORE_TYPE_PROPERTY).trim();
   String trustStorePwd = 
configuration.getProperty(SSL_KEYSTORE_PASSWORD_PROPERTY).trim();
   loadTruststore(trustStorePath, trustStoreType, trustStorePwd);
 }
+collectorUri = constructTimelineMetricUri(protocol, 
findPreferredCollectHost(), port);
+
 pollFrequency = 
Long.parseLong(configuration.getProperty("collectionFrequency"));
 
 String[] metrics = 
configuration.getProperty(COUNTER_METRICS_PROPERTY).trim().split(",");

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1b153e/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
index 7c85171..14df30c 100644
--- 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
@@ -107,15 +107,15 @@ public class HadoopTimelineMetricsSink extends 
AbstractTimelineMetricsSink imple
 if (collectorHosts.isEmpty()) {
   LOG.error("No Metric collector configured.");
 } else {
-  String preferredCollectorHost = findPreferredCollectHost();
-  collectorUri = constructTimelineMetricUri(protocol, 
preferredCollectorHost, port);
-  containerMetricsUri = constructContainerMetricUri(protocol, 
preferredCollectorHost, port);
   if (protocol.contains("https")) {
 String trustStorePath = 
conf.getString(SSL_KEYSTORE_PATH_PROPERTY).trim();
 String trustStoreType = 
conf.getString(SSL_KEYSTORE_TYPE_PROPERTY).trim();
 String trustStorePwd = 
conf.getString(SSL_KEYSTORE_PASSWORD_PROPERTY).trim();
 loadTruststore(trustStorePath, trustStoreType, trustStorePwd);
   }
+  String preferredCollectorHost = findPreferredCollectHost();
+  collectorUri = constructTimelineMetricUri(protocol, 
preferredCollectorHost, port);
+  containerMetricsUri = constructContainerMetricUri(protocol, 
preferredCollectorHost, port);
 }
 
 LOG.info("Collector Uri: " + collectorUri);

ambari git commit: AMBARI-19746 Ambari HDFS Metric alerts turns to UNKNOWN status with error "argument of type 'NoneType' is not iterable" (dsen)

2017-02-02 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/trunk f297c48f0 -> 5d4d99efb


AMBARI-19746 Ambari HDFS Metric alerts turns to UNKNOWN status with error 
"argument of type 'NoneType' is not iterable" (dsen)


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

Branch: refs/heads/trunk
Commit: 5d4d99efbd1a7de059c1257c09b396b90bade83e
Parents: f297c48
Author: Dmytro Sen 
Authored: Thu Feb 2 20:12:30 2017 +0200
Committer: Dmytro Sen 
Committed: Thu Feb 2 20:12:30 2017 +0200

--
 .../src/main/python/ambari_agent/ActionQueue.py  |  5 +
 .../ambari_commons/ambari_metrics_helper.py  | 19 +--
 2 files changed, 18 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d4d99ef/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 8514a88..5300b52 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -36,6 +36,7 @@ from CommandStatusDict import CommandStatusDict
 from CustomServiceOrchestrator import CustomServiceOrchestrator
 from ambari_agent.BackgroundCommandExecutionHandle import 
BackgroundCommandExecutionHandle
 from ambari_commons.str_utils import split_on_chunks
+from resource_management.libraries.script import Script
 
 
 logger = logging.getLogger()
@@ -549,6 +550,10 @@ class ActionQueue(threading.Thread):
   else:
 globalConfig = {}
 
+  if not Script.config :
+logger.debug('Setting Script.config to last status command 
configuration')
+Script.config = command
+
   livestatus = LiveStatus(cluster, service, component,
   globalConfig, self.config, self.configTags)
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/5d4d99ef/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py
--
diff --git 
a/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py 
b/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py
index 7841bde..6444dfd 100644
--- a/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py
+++ b/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py
@@ -24,7 +24,6 @@ from resource_management.libraries.functions import 
conf_select
 
 DEFAULT_COLLECTOR_SUFFIX = '.sink.timeline.collector.hosts'
 DEFAULT_METRICS2_PROPERTIES_FILE_NAME = 'hadoop-metrics2.properties'
-DEFAULT_HADOOP_CONF_DIR_PATH = '/usr/hdp/current/hadoop-client/conf/'
 
 def select_metric_collector_for_sink(sink_name):
   # TODO check '*' sink_name
@@ -46,10 +45,18 @@ def get_metric_collectors_from_properties_file(sink_name):
   try:
 hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
   except Exception as e:
-print "Can't get hadoop conf directory from 
conf_select.get_hadoop_conf_dir() - " + str(e)
-hadoop_conf_dir = DEFAULT_HADOOP_CONF_DIR_PATH
-  props = load_properties_from_file(os.path.join(hadoop_conf_dir, 
DEFAULT_METRICS2_PROPERTIES_FILE_NAME))
-  return props.get(sink_name + DEFAULT_COLLECTOR_SUFFIX)
+raise Exception("Couldn't define hadoop_conf_dir: {0}".format(e))
+  properties_filepath = os.path.join(hadoop_conf_dir, 
DEFAULT_METRICS2_PROPERTIES_FILE_NAME)
+
+  if not os.path.exists(properties_filepath):
+raise Exception("Properties file doesn't exist : {0}. Can't define metric 
collector hosts".format(properties_filepath))
+  props = load_properties_from_file(properties_filepath)
+
+  property_key = sink_name + DEFAULT_COLLECTOR_SUFFIX
+  if property_key in props:
+return props.get(property_key)
+  else:
+raise Exception("Properties file doesn't contain {0}. Can't define metric 
collector hosts".format(property_key))
 
 def load_properties_from_file(filepath, sep='=', comment_char='#'):
   """
@@ -64,4 +71,4 @@ def load_properties_from_file(filepath, sep='=', 
comment_char='#'):
 key = key_value[0].strip()
 value = sep.join(key_value[1:]).strip('" \t')
 props[key] = value
-  return props
+  return props
\ No newline at end of file

ambari git commit: AMBARI-19746 Ambari HDFS Metric alerts turns to UNKNOWN status with error "argument of type 'NoneType' is not iterable" (dsen)

2017-02-02 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 ae4f0a944 -> c5ed48d79


AMBARI-19746 Ambari HDFS Metric alerts turns to UNKNOWN status with error 
"argument of type 'NoneType' is not iterable" (dsen)


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

Branch: refs/heads/branch-2.5
Commit: c5ed48d798cb97b6573589f6eb3d280b1c5d48de
Parents: ae4f0a9
Author: Dmytro Sen 
Authored: Thu Feb 2 20:12:30 2017 +0200
Committer: Dmytro Sen 
Committed: Thu Feb 2 20:13:14 2017 +0200

--
 .../src/main/python/ambari_agent/ActionQueue.py  |  5 +
 .../ambari_commons/ambari_metrics_helper.py  | 19 +--
 2 files changed, 18 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c5ed48d7/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 8514a88..5300b52 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -36,6 +36,7 @@ from CommandStatusDict import CommandStatusDict
 from CustomServiceOrchestrator import CustomServiceOrchestrator
 from ambari_agent.BackgroundCommandExecutionHandle import 
BackgroundCommandExecutionHandle
 from ambari_commons.str_utils import split_on_chunks
+from resource_management.libraries.script import Script
 
 
 logger = logging.getLogger()
@@ -549,6 +550,10 @@ class ActionQueue(threading.Thread):
   else:
 globalConfig = {}
 
+  if not Script.config :
+logger.debug('Setting Script.config to last status command 
configuration')
+Script.config = command
+
   livestatus = LiveStatus(cluster, service, component,
   globalConfig, self.config, self.configTags)
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5ed48d7/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py
--
diff --git 
a/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py 
b/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py
index 7841bde..6444dfd 100644
--- a/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py
+++ b/ambari-common/src/main/python/ambari_commons/ambari_metrics_helper.py
@@ -24,7 +24,6 @@ from resource_management.libraries.functions import 
conf_select
 
 DEFAULT_COLLECTOR_SUFFIX = '.sink.timeline.collector.hosts'
 DEFAULT_METRICS2_PROPERTIES_FILE_NAME = 'hadoop-metrics2.properties'
-DEFAULT_HADOOP_CONF_DIR_PATH = '/usr/hdp/current/hadoop-client/conf/'
 
 def select_metric_collector_for_sink(sink_name):
   # TODO check '*' sink_name
@@ -46,10 +45,18 @@ def get_metric_collectors_from_properties_file(sink_name):
   try:
 hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
   except Exception as e:
-print "Can't get hadoop conf directory from 
conf_select.get_hadoop_conf_dir() - " + str(e)
-hadoop_conf_dir = DEFAULT_HADOOP_CONF_DIR_PATH
-  props = load_properties_from_file(os.path.join(hadoop_conf_dir, 
DEFAULT_METRICS2_PROPERTIES_FILE_NAME))
-  return props.get(sink_name + DEFAULT_COLLECTOR_SUFFIX)
+raise Exception("Couldn't define hadoop_conf_dir: {0}".format(e))
+  properties_filepath = os.path.join(hadoop_conf_dir, 
DEFAULT_METRICS2_PROPERTIES_FILE_NAME)
+
+  if not os.path.exists(properties_filepath):
+raise Exception("Properties file doesn't exist : {0}. Can't define metric 
collector hosts".format(properties_filepath))
+  props = load_properties_from_file(properties_filepath)
+
+  property_key = sink_name + DEFAULT_COLLECTOR_SUFFIX
+  if property_key in props:
+return props.get(property_key)
+  else:
+raise Exception("Properties file doesn't contain {0}. Can't define metric 
collector hosts".format(property_key))
 
 def load_properties_from_file(filepath, sep='=', comment_char='#'):
   """
@@ -64,4 +71,4 @@ def load_properties_from_file(filepath, sep='=', 
comment_char='#'):
 key = key_value[0].strip()
 value = sep.join(key_value[1:]).strip('" \t')
 props[key] = value
-  return props
+  return props
\ No newline at end of file

ambari git commit: AMBARI-19800. Add precheck for Auto-Start being disabled (ncole)

2017-02-02 Thread ncole 
Repository: ambari
Updated Branches:
  refs/heads/trunk 98608ce71 -> f297c48f0


AMBARI-19800. Add precheck for Auto-Start being disabled (ncole)


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

Branch: refs/heads/trunk
Commit: f297c48f016c9deab2cf423fab3a87948496682b
Parents: 98608ce
Author: Nate Cole 
Authored: Thu Feb 2 11:07:30 2017 -0500
Committer: Nate Cole 
Committed: Thu Feb 2 13:06:16 2017 -0500

--
 .../server/checks/AutoStartDisabledCheck.java   |  74 
 .../ambari/server/checks/CheckDescription.java  |   7 ++
 .../checks/AutoStartDisabledCheckTest.java  | 121 +++
 3 files changed, 202 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f297c48f/ambari-server/src/main/java/org/apache/ambari/server/checks/AutoStartDisabledCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/AutoStartDisabledCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/AutoStartDisabledCheck.java
new file mode 100644
index 000..c41ad20
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/AutoStartDisabledCheck.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.ambari.server.checks;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
+import org.apache.commons.lang.StringUtils;
+
+import com.google.inject.Singleton;
+
+/**
+ * The {@link AutoStartDisabledCheck} class is used to check that the cluster 
does
+ * not have auto-restart enabled.
+ */
+@Singleton
+@UpgradeCheck(
+group = UpgradeCheckGroup.CONFIGURATION_WARNING,
+required = { UpgradeType.ROLLING, UpgradeType.NON_ROLLING, 
UpgradeType.HOST_ORDERED })
+public class AutoStartDisabledCheck extends AbstractCheckDescriptor {
+
+  static final String CLUSTER_ENV_TYPE = "cluster-env";
+  static final String RECOVERY_ENABLED_KEY = "recovery_enabled";
+  static final String RECOVERY_TYPE_KEY = "recovery_type";
+  static final String RECOVERY_AUTO_START = "AUTO_START";
+
+  /**
+   * Constructor.
+   */
+  public AutoStartDisabledCheck() {
+super(CheckDescription.AUTO_START_DISABLED);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest 
request) throws AmbariException {
+
+String autoStartEnabled = getProperty(request, CLUSTER_ENV_TYPE, 
RECOVERY_ENABLED_KEY);
+
+// !!! auto-start is already disabled
+if (!Boolean.valueOf(autoStartEnabled)) {
+  return;
+}
+
+// !!! double check the value is AUTO_START.  it's the only supported 
value (and there's no enum for it)
+String recoveryType = getProperty(request, CLUSTER_ENV_TYPE, 
RECOVERY_TYPE_KEY);
+if (StringUtils.equals(recoveryType, RECOVERY_AUTO_START)) {
+
+  prerequisiteCheck.setFailReason(getFailReason(prerequisiteCheck, 
request));
+  prerequisiteCheck.setStatus(PrereqCheckStatus.FAIL);
+  prerequisiteCheck.getFailedOn().add(request.getClusterName());
+
+}
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/f297c48f/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index a204ada..8d8f540 100644
---

ambari git commit: AMBARI-19849. Recent workflows in Workflow designer should be in descending order of time of updation (Venkata Sairam via pallavkul)

2017-02-02 Thread pallavkul 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6231da4e8 -> ae4f0a944


AMBARI-19849. Recent workflows in Workflow designer should be in descending 
order of time of updation (Venkata Sairam via pallavkul)


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

Branch: refs/heads/branch-2.5
Commit: ae4f0a94481b921a49f86f967352a130a5d378da
Parents: 6231da4
Author: pallavkul 
Authored: Thu Feb 2 23:10:35 2017 +0530
Committer: pallavkul 
Committed: Thu Feb 2 23:12:38 2017 +0530

--
 .../src/main/resources/ui/app/components/designer-workspace.js  | 5 +++--
 .../wfmanager/src/main/resources/ui/app/components/drafts-wf.js | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ae4f0a94/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
index 16fca55..0b689b0 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
@@ -169,8 +169,9 @@ export default Ember.Component.extend({
   generateTabId(){
 return 'tab-'+ Math.ceil(Math.random() * 10);
   },
-  recentFilesSorted: Ember.computed.sort("recentFiles", "['updatedAt:desc']"),
-  projList:Ember.computed("recentFilesSorted", function() {
+  sortProp: ['updatedAt:desc'],
+  recentFilesSorted: Ember.computed.sort("recentFiles", "sortProp"),
+  projList: Ember.computed("recentFilesSorted", function() {
  return this.get("recentFilesSorted").slice(0, 10);
   }),
   actions : {

http://git-wip-us.apache.org/repos/asf/ambari/blob/ae4f0a94/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
index 02483d4..33533db 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
@@ -23,6 +23,7 @@ export default Ember.Component.extend({
   "isBundle": true,
   "isCoordinator": true,
   "isWorkflow": true,
+  "sortProp": ['updatedAt:desc'],
   "filteredModels": Ember.computed("model", "search", "isBundle", 
"isCoordinator", "isWorkflow", function(){
Ember.run.later(()=>{
   this.$('.actions').hide();
@@ -61,7 +62,7 @@ export default Ember.Component.extend({
  return eval(condition);
});
   }),
-  modelSorted : Ember.computed.sort("filteredModels", "['updatedAt:desc']"),
+  modelSorted : Ember.computed.sort("filteredModels", "sortProp"),
   "isDeleteDraftConformation": false,
   "currentDraft": undefined,
   "deleteInProgress": false,

ambari git commit: AMBARI-19849. Recent workflows in Workflow designer should be in descending order of time of updation (Venkata Sairam via pallavkul)

2017-02-02 Thread pallavkul 
Repository: ambari
Updated Branches:
  refs/heads/trunk ce822359b -> 98608ce71


AMBARI-19849. Recent workflows in Workflow designer should be in descending 
order of time of updation (Venkata Sairam via pallavkul)


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

Branch: refs/heads/trunk
Commit: 98608ce71594a10338b42f41f127ac5e797876ca
Parents: ce82235
Author: pallavkul 
Authored: Thu Feb 2 23:10:35 2017 +0530
Committer: pallavkul 
Committed: Thu Feb 2 23:10:35 2017 +0530

--
 .../src/main/resources/ui/app/components/designer-workspace.js  | 5 +++--
 .../wfmanager/src/main/resources/ui/app/components/drafts-wf.js | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/98608ce7/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
index 16fca55..0b689b0 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
@@ -169,8 +169,9 @@ export default Ember.Component.extend({
   generateTabId(){
 return 'tab-'+ Math.ceil(Math.random() * 10);
   },
-  recentFilesSorted: Ember.computed.sort("recentFiles", "['updatedAt:desc']"),
-  projList:Ember.computed("recentFilesSorted", function() {
+  sortProp: ['updatedAt:desc'],
+  recentFilesSorted: Ember.computed.sort("recentFiles", "sortProp"),
+  projList: Ember.computed("recentFilesSorted", function() {
  return this.get("recentFilesSorted").slice(0, 10);
   }),
   actions : {

http://git-wip-us.apache.org/repos/asf/ambari/blob/98608ce7/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
index 02483d4..33533db 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
@@ -23,6 +23,7 @@ export default Ember.Component.extend({
   "isBundle": true,
   "isCoordinator": true,
   "isWorkflow": true,
+  "sortProp": ['updatedAt:desc'],
   "filteredModels": Ember.computed("model", "search", "isBundle", 
"isCoordinator", "isWorkflow", function(){
Ember.run.later(()=>{
   this.$('.actions').hide();
@@ -61,7 +62,7 @@ export default Ember.Component.extend({
  return eval(condition);
});
   }),
-  modelSorted : Ember.computed.sort("filteredModels", "['updatedAt:desc']"),
+  modelSorted : Ember.computed.sort("filteredModels", "sortProp"),
   "isDeleteDraftConformation": false,
   "currentDraft": undefined,
   "deleteInProgress": false,

ambari git commit: AMBARI-19852. Workflow name mandatory for save in Coordinator and Bundle (Venkata Sairam via pallavkul)

2017-02-02 Thread pallavkul 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 1b1c08088 -> 6231da4e8


AMBARI-19852. Workflow name mandatory for save in Coordinator and Bundle 
(Venkata Sairam via pallavkul)


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

Branch: refs/heads/branch-2.5
Commit: 6231da4e873d51ba89c3dd933a6c7e03cb47d119
Parents: 1b1c080
Author: pallavkul 
Authored: Thu Feb 2 23:07:05 2017 +0530
Committer: pallavkul 
Committed: Thu Feb 2 23:08:57 2017 +0530

--
 .../resources/ui/app/components/bundle-config.js   |  5 -
 .../resources/ui/app/components/coord-config.js| 17 ++---
 .../resources/ui/app/components/flow-designer.js   |  5 +
 3 files changed, 19 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6231da4e/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
index 7b24d34..445b86e 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
@@ -390,9 +390,12 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   this.set('showVersionSettings', value);
 },
 save(){
+  if (Ember.isBlank(this.$('[name=bundle_title]').val())) {
+return;
+  }
   var isDraft = false, bundleXml;
   if(this.get('validations.isInvalid')) {
-   isDraft = true;
+isDraft = true;
   }else{
 var bundleGenerator = 
BundleGenerator.create({bundle:this.get("bundle")});
 bundleXml = bundleGenerator.process();

http://git-wip-us.apache.org/repos/asf/ambari/blob/6231da4e/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
index 57dbeb0..b045798 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
@@ -147,7 +147,7 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
 if(Ember.isBlank(this.get('coordinator.name'))){
   this.set('coordinator.name', Ember.copy(this.get('tabInfo.name')));
 }
-this.schedulePersistWorkInProgress();
+this.schedulePersistWorkInProgress();
   },
   coordinatorFilePath : Ember.computed('tabInfo.filePath', function(){
 return this.get('tabInfo.filePath');
@@ -344,12 +344,12 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   this.set('inputLogicEnabled', true);
 }
   },
-  validateChildComponents(){
+  validateChildComponents(showErrorMessage){
 var isChildComponentsValid = true;
 this.get('childComponents').forEach((context)=>{
   if(context.get('validations') && context.get('validations.isInvalid')){
 isChildComponentsValid =  false;
-context.set('showErrorMessage', true);
+context.set('showErrorMessage', showErrorMessage);
   }
 }.bind(this));
 return isChildComponentsValid;
@@ -457,7 +457,7 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   this.send('submit');
 },
 submit(){
-  var isChildComponentsValid = this.validateChildComponents();
+  var isChildComponentsValid = this.validateChildComponents(true);
   if(this.get('validations.isInvalid') || !isChildComponentsValid) {
 this.set('showErrorMessage', true);
 return;
@@ -539,7 +539,7 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   this.set('inputLogicExists', false);
 },
 preview(){
-  var isChildComponentsValid = this.validateChildComponents();
+  var isChildComponentsValid = this.validateChildComponents(true);
   if(this.get('validations.isInvalid') || !isChildComponentsValid) {
 this.set('showErrorMessage', true);
 return;
@@ -637,10 +637,13 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   this.set('showVersionSettings', value);
 },
 save(){
+  if (Ember.isBlank(this.$('[name=coord_title]').val())) {
+return;
+  }
   var isDraft = false, coordinatorXml;
-

ambari git commit: AMBARI-19852. Workflow name mandatory for save in Coordinator and Bundle (Venkata Sairam via pallavkul)

2017-02-02 Thread pallavkul 
Repository: ambari
Updated Branches:
  refs/heads/trunk 7c8931a5e -> ce822359b


AMBARI-19852. Workflow name mandatory for save in Coordinator and Bundle 
(Venkata Sairam via pallavkul)


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

Branch: refs/heads/trunk
Commit: ce822359b3199ac62cfb7b3fed00333ea780e734
Parents: 7c8931a
Author: pallavkul 
Authored: Thu Feb 2 23:07:05 2017 +0530
Committer: pallavkul 
Committed: Thu Feb 2 23:07:05 2017 +0530

--
 .../resources/ui/app/components/bundle-config.js   |  5 -
 .../resources/ui/app/components/coord-config.js| 17 ++---
 .../resources/ui/app/components/flow-designer.js   |  5 +
 3 files changed, 19 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ce822359/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
index 7b24d34..445b86e 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
@@ -390,9 +390,12 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   this.set('showVersionSettings', value);
 },
 save(){
+  if (Ember.isBlank(this.$('[name=bundle_title]').val())) {
+return;
+  }
   var isDraft = false, bundleXml;
   if(this.get('validations.isInvalid')) {
-   isDraft = true;
+isDraft = true;
   }else{
 var bundleGenerator = 
BundleGenerator.create({bundle:this.get("bundle")});
 bundleXml = bundleGenerator.process();

http://git-wip-us.apache.org/repos/asf/ambari/blob/ce822359/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
index 57dbeb0..b045798 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
@@ -147,7 +147,7 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
 if(Ember.isBlank(this.get('coordinator.name'))){
   this.set('coordinator.name', Ember.copy(this.get('tabInfo.name')));
 }
-this.schedulePersistWorkInProgress();
+this.schedulePersistWorkInProgress();
   },
   coordinatorFilePath : Ember.computed('tabInfo.filePath', function(){
 return this.get('tabInfo.filePath');
@@ -344,12 +344,12 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   this.set('inputLogicEnabled', true);
 }
   },
-  validateChildComponents(){
+  validateChildComponents(showErrorMessage){
 var isChildComponentsValid = true;
 this.get('childComponents').forEach((context)=>{
   if(context.get('validations') && context.get('validations.isInvalid')){
 isChildComponentsValid =  false;
-context.set('showErrorMessage', true);
+context.set('showErrorMessage', showErrorMessage);
   }
 }.bind(this));
 return isChildComponentsValid;
@@ -457,7 +457,7 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   this.send('submit');
 },
 submit(){
-  var isChildComponentsValid = this.validateChildComponents();
+  var isChildComponentsValid = this.validateChildComponents(true);
   if(this.get('validations.isInvalid') || !isChildComponentsValid) {
 this.set('showErrorMessage', true);
 return;
@@ -539,7 +539,7 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   this.set('inputLogicExists', false);
 },
 preview(){
-  var isChildComponentsValid = this.validateChildComponents();
+  var isChildComponentsValid = this.validateChildComponents(true);
   if(this.get('validations.isInvalid') || !isChildComponentsValid) {
 this.set('showErrorMessage', true);
 return;
@@ -637,10 +637,13 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   this.set('showVersionSettings', value);
 },
 save(){
+  if (Ember.isBlank(this.$('[name=coord_title]').val())) {
+return;
+  }
   var isDraft = false, coordinatorXml;
-  var

ambari git commit: AMBARI-19800. Add precheck for Auto-Start being disabled (ncole)

2017-02-02 Thread ncole 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 83bdf4b3b -> 1b1c08088


AMBARI-19800. Add precheck for Auto-Start being disabled (ncole)


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

Branch: refs/heads/branch-2.5
Commit: 1b1c08088052530f7f79c67ea231b7ab3e1a0aa0
Parents: 83bdf4b
Author: Nate Cole 
Authored: Wed Feb 1 16:31:01 2017 -0500
Committer: Nate Cole 
Committed: Thu Feb 2 09:26:13 2017 -0500

--
 .../server/checks/AutoStartDisabledCheck.java   |  74 
 .../ambari/server/checks/CheckDescription.java  |   7 ++
 .../checks/AutoStartDisabledCheckTest.java  | 121 +++
 3 files changed, 202 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b1c0808/ambari-server/src/main/java/org/apache/ambari/server/checks/AutoStartDisabledCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/AutoStartDisabledCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/AutoStartDisabledCheck.java
new file mode 100644
index 000..c41ad20
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/AutoStartDisabledCheck.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.ambari.server.checks;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
+import org.apache.commons.lang.StringUtils;
+
+import com.google.inject.Singleton;
+
+/**
+ * The {@link AutoStartDisabledCheck} class is used to check that the cluster 
does
+ * not have auto-restart enabled.
+ */
+@Singleton
+@UpgradeCheck(
+group = UpgradeCheckGroup.CONFIGURATION_WARNING,
+required = { UpgradeType.ROLLING, UpgradeType.NON_ROLLING, 
UpgradeType.HOST_ORDERED })
+public class AutoStartDisabledCheck extends AbstractCheckDescriptor {
+
+  static final String CLUSTER_ENV_TYPE = "cluster-env";
+  static final String RECOVERY_ENABLED_KEY = "recovery_enabled";
+  static final String RECOVERY_TYPE_KEY = "recovery_type";
+  static final String RECOVERY_AUTO_START = "AUTO_START";
+
+  /**
+   * Constructor.
+   */
+  public AutoStartDisabledCheck() {
+super(CheckDescription.AUTO_START_DISABLED);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest 
request) throws AmbariException {
+
+String autoStartEnabled = getProperty(request, CLUSTER_ENV_TYPE, 
RECOVERY_ENABLED_KEY);
+
+// !!! auto-start is already disabled
+if (!Boolean.valueOf(autoStartEnabled)) {
+  return;
+}
+
+// !!! double check the value is AUTO_START.  it's the only supported 
value (and there's no enum for it)
+String recoveryType = getProperty(request, CLUSTER_ENV_TYPE, 
RECOVERY_TYPE_KEY);
+if (StringUtils.equals(recoveryType, RECOVERY_AUTO_START)) {
+
+  prerequisiteCheck.setFailReason(getFailReason(prerequisiteCheck, 
request));
+  prerequisiteCheck.setStatus(PrereqCheckStatus.FAIL);
+  prerequisiteCheck.getFailedOn().add(request.getClusterName());
+
+}
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b1c0808/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index a204ada..8d8f540 100644
---

ambari git commit: AMBARI-19804: Typo in preinstall_checker util script in the contrib project (dili)

2017-02-02 Thread dili 
Repository: ambari
Updated Branches:
  refs/heads/trunk c8b347c9e -> 7c8931a5e


AMBARI-19804: Typo in preinstall_checker util script in the contrib project 
(dili)


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

Branch: refs/heads/trunk
Commit: 7c8931a5e5a6320145867ea3bcd48a379c1c87a8
Parents: c8b347c
Author: Di Li 
Authored: Thu Feb 2 10:57:39 2017 -0500
Committer: Di Li 
Committed: Thu Feb 2 10:57:39 2017 -0500

--
 .../utils/preinstall-check/src/main/python/preinstall_checker.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7c8931a5/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
--
diff --git 
a/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py 
b/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
index 5da3772..eddb738 100644
--- a/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
+++ b/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
@@ -128,7 +128,7 @@ def validate_options(options):
   if not options.password:
 errors.append("No Ambari admin user passsword provided.")
   if not options.log:
-  errors.append("No log patch provided.")
+  errors.append("No log home path provided.")
 
   """General check for operations"""
   if not options.operation:

[1/2] ambari git commit: AMBARI-19797. ambari-server SuSE11 init script not working in certain environments (aonishuk)

2017-02-02 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 919500f2f -> 83bdf4b3b
  refs/heads/trunk 0b472f2e2 -> c8b347c9e


AMBARI-19797. ambari-server SuSE11 init script not working in certain 
environments (aonishuk)


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

Branch: refs/heads/trunk
Commit: c8b347c9ebb4bf2c1d5b544911185c01436d1f9b
Parents: 0b472f2
Author: Andrew Onishuk 
Authored: Thu Feb 2 16:20:30 2017 +0200
Committer: Andrew Onishuk 
Committed: Thu Feb 2 16:20:30 2017 +0200

--
 ambari-server/sbin/ambari-server | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c8b347c9/ambari-server/sbin/ambari-server
--
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index 5f97299..205f272 100755
--- a/ambari-server/sbin/ambari-server
+++ b/ambari-server/sbin/ambari-server
@@ -21,6 +21,7 @@
 
 ### BEGIN INIT INFO
 # Provides:  ambari-server
+# Required-Start:$ALL
 # Required-Start:
 # Required-Stop:
 # Default-Start: 2 3 4 5

[2/2] ambari git commit: AMBARI-19797. ambari-server SuSE11 init script not working in certain environments (aonishuk)

2017-02-02 Thread aonishuk 
AMBARI-19797. ambari-server SuSE11 init script not working in certain 
environments (aonishuk)


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

Branch: refs/heads/branch-2.5
Commit: 83bdf4b3bf11fe9a574222305cf36485c3d76847
Parents: 919500f
Author: Andrew Onishuk 
Authored: Thu Feb 2 16:20:34 2017 +0200
Committer: Andrew Onishuk 
Committed: Thu Feb 2 16:20:34 2017 +0200

--
 ambari-server/sbin/ambari-server | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/83bdf4b3/ambari-server/sbin/ambari-server
--
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index b63f128..88d503d 100755
--- a/ambari-server/sbin/ambari-server
+++ b/ambari-server/sbin/ambari-server
@@ -21,6 +21,7 @@
 
 ### BEGIN INIT INFO
 # Provides:  ambari-server
+# Required-Start:$ALL
 # Required-Start:
 # Required-Stop:
 # Default-Start: 2 3 4 5

ambari git commit: AMBARI-19843. Publish asset has issues when different users logins (Madhan Mohan Reddy via gauravn7)

2017-02-02 Thread gnagar 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4418789fc -> 919500f2f


AMBARI-19843. Publish asset has issues when different users logins (Madhan 
Mohan Reddy via gauravn7)


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

Branch: refs/heads/branch-2.5
Commit: 919500f2fe00e4f2ab923d39ef3ab02f19a78b48
Parents: 4418789
Author: Gaurav Nagar 
Authored: Thu Feb 2 18:15:52 2017 +0530
Committer: Gaurav Nagar 
Committed: Thu Feb 2 18:16:47 2017 +0530

--
 .../java/org/apache/oozie/ambari/view/assets/AssetResource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/919500f2/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
--
diff --git 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
index af86810..ef3b508 100644
--- 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
+++ 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
@@ -115,7 +115,7 @@ public class AssetResource {
 String workflowXml = oozieUtils.generateWorkflowXml(postBody);
 try {
   Map result = new HashMap<>();
-  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf.xml";
+  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf_" + 
Math.round(Math.random()*10) + ".xml";
   hdfsFileUtils.writeToFile(tempWfPath, workflowXml, true);
   queryParams.put("oozieparam.action", getAsList("dryrun"));
   queryParams.put("oozieconfig.rerunOnFailure", getAsList("false"));
@@ -125,6 +125,7 @@ public class AssetResource {
 tempWfPath, queryParams, JobType.WORKFLOW);
   LOGGER.info(String.format("resp from validating asset=[%s]",
 dryRunResp));
+  hdfsFileUtils.deleteFile(tempWfPath);
   if (dryRunResp != null && dryRunResp.trim().startsWith("{")) {
 JsonElement jsonElement = new JsonParser().parse(dryRunResp);
 JsonElement idElem = jsonElement.getAsJsonObject().get("id");

ambari git commit: AMBARI-19843. Publish asset has issues when different users logins (Madhan Mohan Reddy via gauravn7)

2017-02-02 Thread gnagar 
Repository: ambari
Updated Branches:
  refs/heads/trunk b5ee4c57a -> 0b472f2e2


AMBARI-19843. Publish asset has issues when different users logins (Madhan 
Mohan Reddy via gauravn7)


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

Branch: refs/heads/trunk
Commit: 0b472f2e2efbe1d1b2c2dc78c7442d59237edf2a
Parents: b5ee4c5
Author: Gaurav Nagar 
Authored: Thu Feb 2 18:15:52 2017 +0530
Committer: Gaurav Nagar 
Committed: Thu Feb 2 18:15:52 2017 +0530

--
 .../java/org/apache/oozie/ambari/view/assets/AssetResource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b472f2e/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
--
diff --git 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
index af86810..ef3b508 100644
--- 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
+++ 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
@@ -115,7 +115,7 @@ public class AssetResource {
 String workflowXml = oozieUtils.generateWorkflowXml(postBody);
 try {
   Map result = new HashMap<>();
-  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf.xml";
+  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf_" + 
Math.round(Math.random()*10) + ".xml";
   hdfsFileUtils.writeToFile(tempWfPath, workflowXml, true);
   queryParams.put("oozieparam.action", getAsList("dryrun"));
   queryParams.put("oozieconfig.rerunOnFailure", getAsList("false"));
@@ -125,6 +125,7 @@ public class AssetResource {
 tempWfPath, queryParams, JobType.WORKFLOW);
   LOGGER.info(String.format("resp from validating asset=[%s]",
 dryRunResp));
+  hdfsFileUtils.deleteFile(tempWfPath);
   if (dryRunResp != null && dryRunResp.trim().startsWith("{")) {
 JsonElement jsonElement = new JsonParser().parse(dryRunResp);
 JsonElement idElem = jsonElement.getAsJsonObject().get("id");

ambari git commit: AMBARI-19842. Custom Action should be created without prompting for the action type.(Padma Priya N via gauravn7)

2017-02-02 Thread gnagar 
Repository: ambari
Updated Branches:
  refs/heads/trunk db36bd92f -> b5ee4c57a


AMBARI-19842. Custom Action should be created without prompting for the action 
type.(Padma Priya N via gauravn7)


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

Branch: refs/heads/trunk
Commit: b5ee4c57a0d462e10a753b4613c5c8b118865b19
Parents: db36bd9
Author: Gaurav Nagar 
Authored: Thu Feb 2 18:12:00 2017 +0530
Committer: Gaurav Nagar 
Committed: Thu Feb 2 18:14:10 2017 +0530

--
 .../ui/app/components/flow-designer.js  | 11 
 .../ui/app/components/workflow-action-editor.js | 14 +-
 .../ui/app/domain/workflow-importer.js  |  3 +++
 .../app/templates/components/flow-designer.hbs  | 27 +---
 .../components/workflow-action-editor.hbs   |  4 +++
 .../main/resources/ui/app/utils/constants.js|  2 +-
 6 files changed, 22 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ee4c57/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index ad5f3f8..4618ab6 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -855,17 +855,6 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.$("#kill-node-dialog").modal("hide");
   this.set('showCreateKillNode', false);
 },
-addNode(type){
-  if(type === 'custom'){
-this.$('#customTypeModal').modal('show');
-  }else{
-this.send('addAction', type);
-  }
-},
-createCustomAction(type){
-  this.send('addAction', type);
-  this.set('customActionType', '');
-},
 addAction(type){
   this.createSnapshot();
   var currentTransition=this.get("currentTransition");

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ee4c57/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
index 43eeb5b..d09de7d 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
@@ -92,7 +92,19 @@ export default Ember.Component.extend( Ember.Evented,{
   this.set('errors', Ember.A([]));
   let temp = x2js.xml_str2json(vkbeautify.xmlmin(value));
   if(temp){
-this.set('actionModel', temp[this.get('actionType')]);
+let tempKeys = Object.keys(temp);
+let actionType = tempKeys && tempKeys.get('firstObject')? 
tempKeys.get('firstObject') : this.get('actionType');
+if(CommonUtils.isSupportedAction(actionType)){
+  this.get('errors').pushObject({message: `Looks like you are creating 
"${actionType}" action. Please use the ${actionType} action editor.`});
+}else{
+  this.set('currentNode.actionType', actionType);
+  this.set('actionType', actionType);
+}
+if(Ember.isBlank(temp[actionType])){
+  this.set('actionModel', {});
+}else{
+  this.set('actionModel', temp[actionType]);
+}
   }else{
 this.get('errors').pushObject({message:'Action Xml is syntatically 
incorrect'});
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ee4c57/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
index ff75e7e..ae566f2 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
@@ -77,6 +77,9 @@ var WorkflowImporter= Ember.Object.extend({
 });
 
 importedWfActionVersions._keys.forEach(function(wfActionType){
+  if(!CommonUtils.isSupportedAction(wfActionType)){
+return;
+  }
   var maxImportedActionVersion =

ambari git commit: AMBARI-19842. Custom Action should be created without prompting for the action type.((Padma Priya N via gauravn7))

2017-02-02 Thread gnagar 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 8075f5eb3 -> 4418789fc


AMBARI-19842. Custom Action should be created without prompting for the action 
type.((Padma Priya N via gauravn7))


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

Branch: refs/heads/branch-2.5
Commit: 4418789fc3f5c9725709667cc0c8be54f11d07c6
Parents: 8075f5e
Author: Gaurav Nagar 
Authored: Thu Feb 2 18:12:00 2017 +0530
Committer: Gaurav Nagar 
Committed: Thu Feb 2 18:12:00 2017 +0530

--
 .../ui/app/components/flow-designer.js  | 11 
 .../ui/app/components/workflow-action-editor.js | 14 +-
 .../ui/app/domain/workflow-importer.js  |  3 +++
 .../app/templates/components/flow-designer.hbs  | 27 +---
 .../components/workflow-action-editor.hbs   |  4 +++
 .../main/resources/ui/app/utils/constants.js|  2 +-
 6 files changed, 22 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4418789f/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index ad5f3f8..4618ab6 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -855,17 +855,6 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.$("#kill-node-dialog").modal("hide");
   this.set('showCreateKillNode', false);
 },
-addNode(type){
-  if(type === 'custom'){
-this.$('#customTypeModal').modal('show');
-  }else{
-this.send('addAction', type);
-  }
-},
-createCustomAction(type){
-  this.send('addAction', type);
-  this.set('customActionType', '');
-},
 addAction(type){
   this.createSnapshot();
   var currentTransition=this.get("currentTransition");

http://git-wip-us.apache.org/repos/asf/ambari/blob/4418789f/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
index 43eeb5b..d09de7d 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
@@ -92,7 +92,19 @@ export default Ember.Component.extend( Ember.Evented,{
   this.set('errors', Ember.A([]));
   let temp = x2js.xml_str2json(vkbeautify.xmlmin(value));
   if(temp){
-this.set('actionModel', temp[this.get('actionType')]);
+let tempKeys = Object.keys(temp);
+let actionType = tempKeys && tempKeys.get('firstObject')? 
tempKeys.get('firstObject') : this.get('actionType');
+if(CommonUtils.isSupportedAction(actionType)){
+  this.get('errors').pushObject({message: `Looks like you are creating 
"${actionType}" action. Please use the ${actionType} action editor.`});
+}else{
+  this.set('currentNode.actionType', actionType);
+  this.set('actionType', actionType);
+}
+if(Ember.isBlank(temp[actionType])){
+  this.set('actionModel', {});
+}else{
+  this.set('actionModel', temp[actionType]);
+}
   }else{
 this.get('errors').pushObject({message:'Action Xml is syntatically 
incorrect'});
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/4418789f/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
index ff75e7e..ae566f2 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
@@ -77,6 +77,9 @@ var WorkflowImporter= Ember.Object.extend({
 });
 
 importedWfActionVersions._keys.forEach(function(wfActionType){
+  if(!CommonUtils.isSupportedAction(wfActionType)){
+return;
+  }
   var maxImportedActionVersion =

ambari git commit: AMBARI-19465. JS error when user click Alert Link in the popup on the service summary page (onechiporenko)

2017-02-02 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 877ab571b -> 8075f5eb3


AMBARI-19465. JS error when user click Alert Link in the popup on the service 
summary page (onechiporenko)


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

Branch: refs/heads/branch-2.5
Commit: 8075f5eb3dae5738227c72a8a80e64db522910d0
Parents: 877ab57
Author: Oleg Nechiporenko 
Authored: Wed Jan 11 15:50:11 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Thu Feb 2 14:33:02 2017 +0200

--
 ambari-web/app/controllers/main/service/info/summary.js | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8075f5eb/ambari-web/app/controllers/main/service/info/summary.js
--
diff --git a/ambari-web/app/controllers/main/service/info/summary.js 
b/ambari-web/app/controllers/main/service/info/summary.js
index 09f3429..9f61058 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -408,13 +408,14 @@ App.MainServiceInfoSummaryController = 
Em.Controller.extend(App.WidgetSectionMix
 }.property('controller.content'),
 onToggleBlock: function (alert) {
   this.$('#' + alert.context.clientId).toggle('blind', 500);
-  alert.context.set("isCollapsed", !alert.context.get("isCollapsed"));
+  alert.context.toggleProperty('isCollapsed');
 },
-gotoAlertDetails: function (event) {
-  if (event && event.context) {
+gotoAlertDetails: function (e) {
+  if (e && e.context) {
 this.get('parentView').hide();
-App.router.transitionTo('main.alerts.alertDetails', event.context);
+App.router.transitionTo('main.alerts.alertDetails', e.context);
   }
+  return false;
 },
 closePopup: function () {
   this.get('parentView').hide();

[1/2] ambari git commit: AMBARI-19818. "Set version on all hosts" failed during EU (dlysnichenko)

2017-02-02 Thread dmitriusan 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 7e11d79f9 -> 877ab571b
  refs/heads/trunk 325dc2053 -> db36bd92f


AMBARI-19818. "Set version on all hosts" failed during EU (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: db36bd92f6cf7d648d0a748cb9164185d12ee329
Parents: 325dc20
Author: Lisnichenko Dmitro 
Authored: Thu Feb 2 11:32:04 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Thu Feb 2 11:32:04 2017 +0200

--
 ambari-agent/conf/unix/agent-multiplier.py | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/db36bd92/ambari-agent/conf/unix/agent-multiplier.py
--
diff --git a/ambari-agent/conf/unix/agent-multiplier.py 
b/ambari-agent/conf/unix/agent-multiplier.py
index 5abae58..63409dd 100644
--- a/ambari-agent/conf/unix/agent-multiplier.py
+++ b/ambari-agent/conf/unix/agent-multiplier.py
@@ -320,19 +320,22 @@ class Multiplier:
 print "Starting %d host(s)" % len(self.hosts)
 for host in self.hosts:
   cmd = "ambari-agent start --home %s" % (host.home_dir)
-  subprocess.call(cmd, shell=True)
+  os.environ['AMBARI_AGENT_CONF_DIR'] = os.path.join(host.home_dir, 
"etc/ambari-agent/conf")
+  subprocess.call(cmd, shell=True, env=os.environ)
 
   def cmd_stop(self):
 print "Stopping %d host(s)" % len(self.hosts)
 for host in self.hosts:
   cmd = "ambari-agent stop --home %s" % (host.home_dir)
-  subprocess.call(cmd, shell=True)
+  os.environ['AMBARI_AGENT_CONF_DIR'] = os.path.join(host.home_dir, 
"etc/ambari-agent/conf")
+  subprocess.call(cmd, shell=True, env=os.environ)
 
   def cmd_restart(self):
 print "Restarting %d host(s)" % len(self.hosts)
 for host in self.hosts:
   cmd = "ambari-agent restart --home %s" % (host.home_dir)
-  subprocess.call(cmd, shell=True)
+  os.environ['AMBARI_AGENT_CONF_DIR'] = os.path.join(host.home_dir, 
"etc/ambari-agent/conf")
+  subprocess.call(cmd, shell=True, env=os.environ)
 
   def cmd_status(self):
 print "Summary of Agent Status:"

[2/2] ambari git commit: AMBARI-19818. "Set version on all hosts" failed during EU (dlysnichenko)

2017-02-02 Thread dmitriusan 
AMBARI-19818. "Set version on all hosts" failed during EU (dlysnichenko)


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

Branch: refs/heads/branch-2.5
Commit: 877ab571b9c900e71860051cd7d520ce6e69b3fc
Parents: 7e11d79
Author: Lisnichenko Dmitro 
Authored: Thu Feb 2 11:32:04 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Thu Feb 2 11:32:43 2017 +0200

--
 ambari-agent/conf/unix/agent-multiplier.py | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/877ab571/ambari-agent/conf/unix/agent-multiplier.py
--
diff --git a/ambari-agent/conf/unix/agent-multiplier.py 
b/ambari-agent/conf/unix/agent-multiplier.py
index 5abae58..63409dd 100644
--- a/ambari-agent/conf/unix/agent-multiplier.py
+++ b/ambari-agent/conf/unix/agent-multiplier.py
@@ -320,19 +320,22 @@ class Multiplier:
 print "Starting %d host(s)" % len(self.hosts)
 for host in self.hosts:
   cmd = "ambari-agent start --home %s" % (host.home_dir)
-  subprocess.call(cmd, shell=True)
+  os.environ['AMBARI_AGENT_CONF_DIR'] = os.path.join(host.home_dir, 
"etc/ambari-agent/conf")
+  subprocess.call(cmd, shell=True, env=os.environ)
 
   def cmd_stop(self):
 print "Stopping %d host(s)" % len(self.hosts)
 for host in self.hosts:
   cmd = "ambari-agent stop --home %s" % (host.home_dir)
-  subprocess.call(cmd, shell=True)
+  os.environ['AMBARI_AGENT_CONF_DIR'] = os.path.join(host.home_dir, 
"etc/ambari-agent/conf")
+  subprocess.call(cmd, shell=True, env=os.environ)
 
   def cmd_restart(self):
 print "Restarting %d host(s)" % len(self.hosts)
 for host in self.hosts:
   cmd = "ambari-agent restart --home %s" % (host.home_dir)
-  subprocess.call(cmd, shell=True)
+  os.environ['AMBARI_AGENT_CONF_DIR'] = os.path.join(host.home_dir, 
"etc/ambari-agent/conf")
+  subprocess.call(cmd, shell=True, env=os.environ)
 
   def cmd_status(self):
 print "Summary of Agent Status:"