ambari git commit: Revert "AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View"

2017-08-29 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk b300f504c -> 6848c8f4f


Revert "AMBARI-21569.Users randomly getting "HDFS020 Could not write file" 
exceptions while running query from Hive View"

This reverts commit 0a2eccd09aa7ec6bc4389603a2668f27d2d79900.


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

Branch: refs/heads/trunk
Commit: 6848c8f4f1a162cbc99b632a4285fc5b579bab40
Parents: b300f50
Author: Sumit Mohanty 
Authored: Tue Aug 29 15:38:18 2017 -0700
Committer: Sumit Mohanty 
Committed: Tue Aug 29 15:38:18 2017 -0700

--
 .../hive20/src/main/resources/ui/yarn.lock  |  2 +-
 .../apache/ambari/view/utils/hdfs/HdfsApi.java  | 18 ++-
 .../apache/ambari/view/utils/hdfs/HdfsUtil.java | 23 +---
 3 files changed, 9 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6848c8f4/contrib/views/hive20/src/main/resources/ui/yarn.lock
--
diff --git a/contrib/views/hive20/src/main/resources/ui/yarn.lock 
b/contrib/views/hive20/src/main/resources/ui/yarn.lock
index 607cf81..477a15c 100644
--- a/contrib/views/hive20/src/main/resources/ui/yarn.lock
+++ b/contrib/views/hive20/src/main/resources/ui/yarn.lock
@@ -569,7 +569,7 @@ 
babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
 babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.23.0, 
babel-plugin-transform-es2015-block-scoping@^6.24.1:
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
   version "6.24.1"
   resolved 
"https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576;
   dependencies:

http://git-wip-us.apache.org/repos/asf/ambari/blob/6848c8f4/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
index 5bce7ba..90fa483 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
@@ -386,20 +386,7 @@ public class HdfsApi {
* @throws IOException
* @throws InterruptedException
*/
-  public  T execute(PrivilegedExceptionAction action) throws 
IOException, InterruptedException {
-return this.execute(action, false);
-  }
-
-
-  /**
-   * Executes action on HDFS using doAs
-   * @param action strategy object
-   * @param  result type
-   * @return result of operation
-   * @throws IOException
-   * @throws InterruptedException
-   */
-  public  T execute(PrivilegedExceptionAction action, boolean 
alwaysRetry)
+  public  T execute(PrivilegedExceptionAction action)
   throws IOException, InterruptedException {
 T result = null;
 
@@ -414,7 +401,7 @@ public class HdfsApi {
 result = ugi.doAs(action);
 succeeded = true;
   } catch (IOException ex) {
-if (!alwaysRetry && !ex.getMessage().contains("Cannot obtain block 
length for")) {
+if (!ex.getMessage().contains("Cannot obtain block length for")) {
   throw ex;
 }
 if (tryNumber >= 3) {
@@ -422,7 +409,6 @@ public class HdfsApi {
 }
 LOG.info("HDFS threw 'IOException: Cannot obtain block length' 
exception. " +
 "Retrying... Try #" + (tryNumber + 1));
-LOG.error("Retrying: " + ex.getMessage(),ex);
 Thread.sleep(1000);  //retry after 1 second
   }
 } while (!succeeded);

http://git-wip-us.apache.org/repos/asf/ambari/blob/6848c8f4/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
index 39958c3..0670f1a 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Map;
-import java.security.PrivilegedExceptionAction;
 
 public class HdfsUtil {
   private final static Logger LOG =
@@ -39,29

ambari git commit: Revert "AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View"

2017-08-29 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 22fe5ffae -> 63989a2d6


Revert "AMBARI-21569.Users randomly getting "HDFS020 Could not write file" 
exceptions while running query from Hive View"

This reverts commit 4b047c37a7771ffa2bf7a1f2ab1d09d1d464e34e.


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

Branch: refs/heads/branch-2.6
Commit: 63989a2d635e9bcfcf5034d8dbbaaa644b42032a
Parents: 22fe5ff
Author: Sumit Mohanty 
Authored: Tue Aug 29 14:17:20 2017 -0700
Committer: Sumit Mohanty 
Committed: Tue Aug 29 14:17:20 2017 -0700

--
 .../hive20/src/main/resources/ui/yarn.lock  |  2 +-
 .../apache/ambari/view/utils/hdfs/HdfsApi.java  | 18 ++-
 .../apache/ambari/view/utils/hdfs/HdfsUtil.java | 23 +---
 3 files changed, 9 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/63989a2d/contrib/views/hive20/src/main/resources/ui/yarn.lock
--
diff --git a/contrib/views/hive20/src/main/resources/ui/yarn.lock 
b/contrib/views/hive20/src/main/resources/ui/yarn.lock
index 607cf81..477a15c 100644
--- a/contrib/views/hive20/src/main/resources/ui/yarn.lock
+++ b/contrib/views/hive20/src/main/resources/ui/yarn.lock
@@ -569,7 +569,7 @@ 
babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
 babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.23.0, 
babel-plugin-transform-es2015-block-scoping@^6.24.1:
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
   version "6.24.1"
   resolved 
"https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576;
   dependencies:

http://git-wip-us.apache.org/repos/asf/ambari/blob/63989a2d/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
index 5bce7ba..90fa483 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
@@ -386,20 +386,7 @@ public class HdfsApi {
* @throws IOException
* @throws InterruptedException
*/
-  public  T execute(PrivilegedExceptionAction action) throws 
IOException, InterruptedException {
-return this.execute(action, false);
-  }
-
-
-  /**
-   * Executes action on HDFS using doAs
-   * @param action strategy object
-   * @param  result type
-   * @return result of operation
-   * @throws IOException
-   * @throws InterruptedException
-   */
-  public  T execute(PrivilegedExceptionAction action, boolean 
alwaysRetry)
+  public  T execute(PrivilegedExceptionAction action)
   throws IOException, InterruptedException {
 T result = null;
 
@@ -414,7 +401,7 @@ public class HdfsApi {
 result = ugi.doAs(action);
 succeeded = true;
   } catch (IOException ex) {
-if (!alwaysRetry && !ex.getMessage().contains("Cannot obtain block 
length for")) {
+if (!ex.getMessage().contains("Cannot obtain block length for")) {
   throw ex;
 }
 if (tryNumber >= 3) {
@@ -422,7 +409,6 @@ public class HdfsApi {
 }
 LOG.info("HDFS threw 'IOException: Cannot obtain block length' 
exception. " +
 "Retrying... Try #" + (tryNumber + 1));
-LOG.error("Retrying: " + ex.getMessage(),ex);
 Thread.sleep(1000);  //retry after 1 second
   }
 } while (!succeeded);

http://git-wip-us.apache.org/repos/asf/ambari/blob/63989a2d/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
index 39958c3..0670f1a 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Map;
-import java.security.PrivilegedExceptionAction;
 
 public class HdfsUtil {
   private final static Logger LOG =
@@

ambari git commit: AMBARI-18574. Set hbase.hregion.memstore.chunkpool.maxsize to 1.0 (Yao Lei via smohanty)

2017-08-25 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk ca5fd7877 -> e399cb4a9


AMBARI-18574. Set hbase.hregion.memstore.chunkpool.maxsize to 1.0 (Yao Lei via 
smohanty)


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

Branch: refs/heads/trunk
Commit: e399cb4a9d3169f40eb98c1bd193597ca75f05ba
Parents: ca5fd78
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Aug 25 13:59:43 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Aug 25 14:00:45 2017 -0700

--
 .../HDP/2.6/services/HBASE/configuration/hbase-site.xml  | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e399cb4a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
index 9b69913..7822081 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
@@ -48,4 +48,15 @@
 
 
   
+  
+hbase.hregion.memstore.chunkpool.maxsize
+1.0
+The percentage for memstore chunk pool (between 0 and 
1.0).
+
+  float
+  0
+  1.0
+
+
+

ambari git commit: AMBARI-18574. Set hbase.hregion.memstore.chunkpool.maxsize to 1.0 (Yao Lei via smohanty)

2017-08-25 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 aff9629ae -> 7f0e6567c


AMBARI-18574. Set hbase.hregion.memstore.chunkpool.maxsize to 1.0 (Yao Lei via 
smohanty)


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

Branch: refs/heads/branch-2.6
Commit: 7f0e6567c1fcb32dc450f5c91b524d14468e7467
Parents: aff9629
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Aug 25 13:59:43 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Aug 25 13:59:43 2017 -0700

--
 .../HDP/2.6/services/HBASE/configuration/hbase-site.xml  | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f0e6567/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
index 9b69913..7822081 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HBASE/configuration/hbase-site.xml
@@ -48,4 +48,15 @@
 
 
   
+  
+hbase.hregion.memstore.chunkpool.maxsize
+1.0
+The percentage for memstore chunk pool (between 0 and 
1.0).
+
+  float
+  0
+  1.0
+
+
+

ambari git commit: AMBARI-21793. Add support for variables used by Knox topology template (Sandeep More via smohanty)

2017-08-24 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk b290ce068 -> 787fe0f7e


AMBARI-21793. Add support for variables used by Knox topology template (Sandeep 
More via smohanty)


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

Branch: refs/heads/trunk
Commit: 787fe0f7e56cd56d3daf5e40e56647f06b3fe890
Parents: b290ce0
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Aug 24 16:55:14 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Aug 24 16:55:14 2017 -0700

--
 .../0.5.0.2.2/package/scripts/params_linux.py   | 92 ++--
 .../0.5.0.3.0/package/scripts/params_linux.py   | 90 ++-
 2 files changed, 173 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/787fe0f7/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 97b90af..5f470ec 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -233,6 +233,12 @@ if type(webhcat_server_hosts) is list:
 else:
   webhcat_server_host = webhcat_server_hosts
 
+hive_scheme = 'http'
+webhcat_scheme = 'http'
+
+hbase_master_scheme = 'http'
+hbase_master_ui_port = 
default('/configurations/hbase-site/hbase.master.info.port', "16010");
+
 hbase_master_port = default('/configurations/hbase-site/hbase.rest.port', 
"8080")
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", None)
 if type(hbase_master_hosts) is list:
@@ -240,24 +246,100 @@ if type(hbase_master_hosts) is list:
 else:
   hbase_master_host = hbase_master_hosts
 
+#
+# Oozie
+#
 oozie_https_port = None
+oozie_scheme = 'http'
+oozie_server_port = "11000"
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
+
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]
 else:
   oozie_server_host = oozie_server_hosts
 
-oozie_scheme = 'http'
 has_oozie = not oozie_server_host == None
-oozie_server_port = "11000"
 
 if has_oozie:
   oozie_server_port = 
get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
   oozie_https_port = default("/configurations/oozie-site/oozie.https.port", 
None)
-  
+
 if oozie_https_port is not None:
-   oozie_scheme = 'https'
-   oozie_server_port = oozie_https_port
+  oozie_scheme = 'https'
+  oozie_server_port = oozie_https_port
+
+#
+# Falcon
+#
+falcon_server_hosts = default("/clusterHostInfo/falcon_server_hosts", None)
+if type(falcon_server_hosts) is list:
+  falcon_server_host = falcon_server_hosts[0]
+else:
+  falcon_server_host = falcon_server_hosts
+
+falcon_scheme = 'http'
+has_falcon = not falcon_server_host == None
+falcon_server_port = "15000"
+
+if has_falcon:
+  falcon_server_port = config['configurations']['falcon-env']['falcon_port']
+
+#
+# Solr
+#
+solr_scheme='http'
+solr_server_hosts  = default("/clusterHostInfo/solr_hosts", None)
+if type(solr_server_hosts ) is list:
+  solr_host = solr_server_hosts[0]
+else:
+  solr_host = solr_server_hosts
+solr_port=default("/configuration/solr/solr-env/solr_port","8983")
+
+#
+# Spark
+# 
+spark_scheme = 'http'
+spark_historyserver_hosts = 
default("/clusterHostInfo/spark_jobhistoryserver_hosts", None)
+if type(spark_historyserver_hosts) is list:
+  spark_historyserver_host = spark_historyserver_hosts[0]
+else: 
+  spark_historyserver_host = spark_historyserver_hosts
+spark_historyserver_ui_port = 
default("/configurations/spark-defaults/spark.history.ui.port", "18080")
+
+
+#
+# JobHistory mapreduce
+#
+mr_scheme='http'
+mr_historyserver_address = 
default("/configurations/mapred-site/mapreduce.jobhistory.webapp.address", 
None) 
+
+#
+# Yarn nodemanager
+#
+nodeui_scheme= 'http'
+nodeui_port = "8042"
+nm_hosts = default("/clusterHostInfo/nm_hosts", None)
+if type(nm_hosts) is list:
+  nm_host = nm_hosts[0]
+else:
+  nm_host = nm_hosts
+
+has_yarn = default("/configurations/yarn-site", None )
+if has_yarn and 'yarn.nodemanager.webapp.address' in 
config['configurations']['yarn-site']:
+  nodeui_port = 
get_port_fro

ambari git commit: AMBARI-21793. Add support for variables used by Knox topology template (Sandeep More via smohanty)

2017-08-24 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 e845f41a7 -> a21dc6d89


AMBARI-21793. Add support for variables used by Knox topology template (Sandeep 
More via smohanty)


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

Branch: refs/heads/branch-2.6
Commit: a21dc6d89a8243a34bf5fdc9df089bdfcaf40443
Parents: e845f41
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Aug 24 16:55:14 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Aug 24 17:01:13 2017 -0700

--
 .../0.5.0.2.2/package/scripts/params_linux.py   | 91 +++-
 1 file changed, 90 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a21dc6d8/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index c9b229f..7f2101d 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -221,6 +221,12 @@ if type(webhcat_server_hosts) is list:
 else:
   webhcat_server_host = webhcat_server_hosts
 
+hive_scheme = 'http'
+webhcat_scheme = 'http'
+
+hbase_master_scheme = 'http'
+hbase_master_ui_port = 
default('/configurations/hbase-site/hbase.master.info.port', "16010");
+
 hbase_master_port = default('/configurations/hbase-site/hbase.rest.port', 
"8080")
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", None)
 if type(hbase_master_hosts) is list:
@@ -228,17 +234,100 @@ if type(hbase_master_hosts) is list:
 else:
   hbase_master_host = hbase_master_hosts
 
+#
+# Oozie
+#
+oozie_https_port = None
+oozie_scheme = 'http'
+oozie_server_port = "11000"
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
+
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]
 else:
   oozie_server_host = oozie_server_hosts
 
 has_oozie = not oozie_server_host == None
-oozie_server_port = "11000"
 
 if has_oozie:
   oozie_server_port = 
get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
+  oozie_https_port = default("/configurations/oozie-site/oozie.https.port", 
None)
+
+if oozie_https_port is not None:
+  oozie_scheme = 'https'
+  oozie_server_port = oozie_https_port
+
+#
+# Falcon
+#
+falcon_server_hosts = default("/clusterHostInfo/falcon_server_hosts", None)
+if type(falcon_server_hosts) is list:
+  falcon_server_host = falcon_server_hosts[0]
+else:
+  falcon_server_host = falcon_server_hosts
+
+falcon_scheme = 'http'
+has_falcon = not falcon_server_host == None
+falcon_server_port = "15000"
+
+if has_falcon:
+  falcon_server_port = config['configurations']['falcon-env']['falcon_port']
+
+#
+# Solr
+#
+solr_scheme='http'
+solr_server_hosts  = default("/clusterHostInfo/solr_hosts", None)
+if type(solr_server_hosts ) is list:
+  solr_host = solr_server_hosts[0]
+else:
+  solr_host = solr_server_hosts
+solr_port=default("/configuration/solr/solr-env/solr_port","8983")
+
+#
+# Spark
+# 
+spark_scheme = 'http'
+spark_historyserver_hosts = 
default("/clusterHostInfo/spark_jobhistoryserver_hosts", None)
+if type(spark_historyserver_hosts) is list:
+  spark_historyserver_host = spark_historyserver_hosts[0]
+else: 
+  spark_historyserver_host = spark_historyserver_hosts
+spark_historyserver_ui_port = 
default("/configurations/spark-defaults/spark.history.ui.port", "18080")
+
+
+#
+# JobHistory mapreduce
+#
+mr_scheme='http'
+mr_historyserver_address = 
default("/configurations/mapred-site/mapreduce.jobhistory.webapp.address", 
None) 
+
+#
+# Yarn nodemanager
+#
+nodeui_scheme= 'http'
+nodeui_port = "8042"
+nm_hosts = default("/clusterHostInfo/nm_hosts", None)
+if type(nm_hosts) is list:
+  nm_host = nm_hosts[0]
+else:
+  nm_host = nm_hosts
+
+has_yarn = default("/configurations/yarn-site", None )
+if has_yarn and 'yarn.nodemanager.webapp.address' in 
config['configurations']['yarn-site']:
+  nodeui_port = 
get_port_from_url(config['configurations']['yarn-site']['yarn.nodemanager.webapp.address'])
+
+
+#
+# Spark Thrift UI
+#
+spark_thriftserver_scheme = 'http'
+spark_thriftserver_ui_p

ambari git commit: AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View

2017-08-24 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 b7b3dbd53 -> 4b047c37a


AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions 
while running query from Hive View


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

Branch: refs/heads/branch-2.6
Commit: 4b047c37a7771ffa2bf7a1f2ab1d09d1d464e34e
Parents: b7b3dbd
Author: Venkata Sairam 
Authored: Wed Aug 23 15:58:01 2017 +0530
Committer: Sumit Mohanty 
Committed: Thu Aug 24 09:40:35 2017 -0700

--
 .../hive20/src/main/resources/ui/yarn.lock  |  2 +-
 .../apache/ambari/view/utils/hdfs/HdfsApi.java  | 18 +--
 .../apache/ambari/view/utils/hdfs/HdfsUtil.java | 23 +++-
 3 files changed, 34 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4b047c37/contrib/views/hive20/src/main/resources/ui/yarn.lock
--
diff --git a/contrib/views/hive20/src/main/resources/ui/yarn.lock 
b/contrib/views/hive20/src/main/resources/ui/yarn.lock
index 477a15c..607cf81 100644
--- a/contrib/views/hive20/src/main/resources/ui/yarn.lock
+++ b/contrib/views/hive20/src/main/resources/ui/yarn.lock
@@ -569,7 +569,7 @@ 
babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
 babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.23.0:
+babel-plugin-transform-es2015-block-scoping@^6.23.0, 
babel-plugin-transform-es2015-block-scoping@^6.24.1:
   version "6.24.1"
   resolved 
"https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576;
   dependencies:

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b047c37/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
index 90fa483..5bce7ba 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
@@ -386,7 +386,20 @@ public class HdfsApi {
* @throws IOException
* @throws InterruptedException
*/
-  public  T execute(PrivilegedExceptionAction action)
+  public  T execute(PrivilegedExceptionAction action) throws 
IOException, InterruptedException {
+return this.execute(action, false);
+  }
+
+
+  /**
+   * Executes action on HDFS using doAs
+   * @param action strategy object
+   * @param  result type
+   * @return result of operation
+   * @throws IOException
+   * @throws InterruptedException
+   */
+  public  T execute(PrivilegedExceptionAction action, boolean 
alwaysRetry)
   throws IOException, InterruptedException {
 T result = null;
 
@@ -401,7 +414,7 @@ public class HdfsApi {
 result = ugi.doAs(action);
 succeeded = true;
   } catch (IOException ex) {
-if (!ex.getMessage().contains("Cannot obtain block length for")) {
+if (!alwaysRetry && !ex.getMessage().contains("Cannot obtain block 
length for")) {
   throw ex;
 }
 if (tryNumber >= 3) {
@@ -409,6 +422,7 @@ public class HdfsApi {
 }
 LOG.info("HDFS threw 'IOException: Cannot obtain block length' 
exception. " +
 "Retrying... Try #" + (tryNumber + 1));
+LOG.error("Retrying: " + ex.getMessage(),ex);
 Thread.sleep(1000);  //retry after 1 second
   }
 } while (!succeeded);

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b047c37/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
index 0670f1a..39958c3 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Map;
+import java.security.PrivilegedExceptionAction;
 
 public class HdfsUtil {
   private final static Logger LOG =
@@ -38,19 +39,29 @@ public class HdfsUtil {
* @param filePath

ambari git commit: Revert "AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View"

2017-08-24 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 2eed29264 -> 27e00dde1


Revert "AMBARI-21569.Users randomly getting "HDFS020 Could not write file" 
exceptions while running query from Hive View"

This reverts commit 9ba009b5a69b640e68db3c92aaf11792ab8d.


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

Branch: refs/heads/branch-2.5
Commit: 27e00dde15b0d4e1c3701158521268623ff1be0d
Parents: 2eed292
Author: Sumit Mohanty 
Authored: Thu Aug 24 09:39:47 2017 -0700
Committer: Sumit Mohanty 
Committed: Thu Aug 24 09:39:47 2017 -0700

--
 .../hive20/src/main/resources/ui/yarn.lock  |  2 +-
 .../apache/ambari/view/utils/hdfs/HdfsApi.java  | 18 ++-
 .../apache/ambari/view/utils/hdfs/HdfsUtil.java | 23 +---
 3 files changed, 9 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/27e00dde/contrib/views/hive20/src/main/resources/ui/yarn.lock
--
diff --git a/contrib/views/hive20/src/main/resources/ui/yarn.lock 
b/contrib/views/hive20/src/main/resources/ui/yarn.lock
index 607cf81..477a15c 100644
--- a/contrib/views/hive20/src/main/resources/ui/yarn.lock
+++ b/contrib/views/hive20/src/main/resources/ui/yarn.lock
@@ -569,7 +569,7 @@ 
babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
 babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.23.0, 
babel-plugin-transform-es2015-block-scoping@^6.24.1:
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
   version "6.24.1"
   resolved 
"https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576;
   dependencies:

http://git-wip-us.apache.org/repos/asf/ambari/blob/27e00dde/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
index 5bce7ba..90fa483 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java
@@ -386,20 +386,7 @@ public class HdfsApi {
* @throws IOException
* @throws InterruptedException
*/
-  public  T execute(PrivilegedExceptionAction action) throws 
IOException, InterruptedException {
-return this.execute(action, false);
-  }
-
-
-  /**
-   * Executes action on HDFS using doAs
-   * @param action strategy object
-   * @param  result type
-   * @return result of operation
-   * @throws IOException
-   * @throws InterruptedException
-   */
-  public  T execute(PrivilegedExceptionAction action, boolean 
alwaysRetry)
+  public  T execute(PrivilegedExceptionAction action)
   throws IOException, InterruptedException {
 T result = null;
 
@@ -414,7 +401,7 @@ public class HdfsApi {
 result = ugi.doAs(action);
 succeeded = true;
   } catch (IOException ex) {
-if (!alwaysRetry && !ex.getMessage().contains("Cannot obtain block 
length for")) {
+if (!ex.getMessage().contains("Cannot obtain block length for")) {
   throw ex;
 }
 if (tryNumber >= 3) {
@@ -422,7 +409,6 @@ public class HdfsApi {
 }
 LOG.info("HDFS threw 'IOException: Cannot obtain block length' 
exception. " +
 "Retrying... Try #" + (tryNumber + 1));
-LOG.error("Retrying: " + ex.getMessage(),ex);
 Thread.sleep(1000);  //retry after 1 second
   }
 } while (!succeeded);

http://git-wip-us.apache.org/repos/asf/ambari/blob/27e00dde/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
index 39958c3..0670f1a 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Map;
-import java.security.PrivilegedExceptionAction;
 
 public class HdfsUtil {
   private final static Logger LOG =
@@

ambari git commit: AMBARI-13135. Provide recommendation w.r.t. CMSInitiatingOccupancy for HBase (Yao Lei via smohanty)

2017-08-23 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk b155c1a77 -> 2e5139ab1


AMBARI-13135. Provide recommendation w.r.t. CMSInitiatingOccupancy for HBase 
(Yao Lei via smohanty)


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

Branch: refs/heads/trunk
Commit: 2e5139ab162865eecb173f9d73760979a5e32b00
Parents: b155c1a
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Aug 23 07:38:43 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Aug 23 07:51:38 2017 -0700

--
 .../HBASE/0.96.0.2.0/configuration/hbase-env.xml| 16 ++--
 .../0.96.0.2.0/package/scripts/params_linux.py  |  2 ++
 .../2.2/services/HBASE/configuration/hbase-env.xml  |  4 ++--
 .../2.3/services/HBASE/configuration/hbase-env.xml  |  4 ++--
 .../2.6/services/HBASE/configuration/hbase-env.xml  |  4 ++--
 5 files changed, 22 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2e5139ab/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index 8876141..6393659 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -154,6 +154,18 @@ The timeout is introduced because there is a known bug 
when from time to time HB
 
 
   
+  
+hbase_regionserver_cms_initiating_occupancy_fraction
+50
+HBase RegionServer CMSInitiatingOccupancyFraction when 
ConcMarkSweepGC is used.
+RegionServer CMSInitiatingOccupancyFraction
+
+  int
+  40
+  60
+
+
+  
   
   
 content
@@ -220,11 +232,11 @@ export HBASE_MANAGES_ZK=false
 {% if security_enabled %}
 export HBASE_OPTS="$HBASE_OPTS -XX:+UseConcMarkSweepGC 
-XX:ErrorFile={{log_dir}}/hs_err_pid%p.log 
-Djava.security.auth.login.config={{client_jaas_config_file}} 
-Djava.io.tmpdir={{java_io_tmpdir}}"
 export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}} 
-Djava.security.auth.login.config={{master_jaas_config_file}}"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 
-XX:ReservedCodeCacheSize=256m -Xms{{regionserver_heapsize}} 
-Xmx{{regionserver_heapsize}} 
-Djava.security.auth.login.config={{regionserver_jaas_config_file}}"
+export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} 
-XX:CMSInitiatingOccupancyFraction={{regionserver_cms_initiating_occupancy_fraction}}
 -XX:+UseCMSInitiatingOccupancyOnly -XX:ReservedCodeCacheSize=256m 
-Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}} 
-Djava.security.auth.login.config={{regionserver_jaas_config_file}}"
 {% else %}
 export HBASE_OPTS="$HBASE_OPTS -XX:+UseConcMarkSweepGC 
-XX:ErrorFile={{log_dir}}/hs_err_pid%p.log -Djava.io.tmpdir={{java_io_tmpdir}}"
 export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}}"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 
-XX:ReservedCodeCacheSize=256m -Xms{{regionserver_heapsize}} 
-Xmx{{regionserver_heapsize}}"
+export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} 
-XX:CMSInitiatingOccupancyFraction={{regionserver_cms_initiating_occupancy_fraction}}
 -XX:+UseCMSInitiatingOccupancyOnly -XX:ReservedCodeCacheSize=256m 
-Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}"
 {% endif %}
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e5139ab/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index cd258db..3a16c5e 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -131,6 +131,8 @@ regionserver_xmn_size = 
calc_xmn_f

ambari git commit: AMBARI-13135. Provide recommendation w.r.t. CMSInitiatingOccupancy for HBase (Yao Lei via smohanty)

2017-08-23 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 5605db329 -> b2b801915


AMBARI-13135. Provide recommendation w.r.t. CMSInitiatingOccupancy for HBase 
(Yao Lei via smohanty)


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

Branch: refs/heads/branch-2.6
Commit: b2b801915e826c58c7ad65f8f2429f3b31fabade
Parents: 5605db3
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Aug 23 07:38:43 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Aug 23 07:38:43 2017 -0700

--
 .../HBASE/0.96.0.2.0/configuration/hbase-env.xml| 16 ++--
 .../0.96.0.2.0/package/scripts/params_linux.py  |  2 ++
 .../2.2/services/HBASE/configuration/hbase-env.xml  |  4 ++--
 .../2.3/services/HBASE/configuration/hbase-env.xml  |  4 ++--
 .../2.6/services/HBASE/configuration/hbase-env.xml  |  4 ++--
 5 files changed, 22 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b2b80191/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index 8876141..6393659 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -154,6 +154,18 @@ The timeout is introduced because there is a known bug 
when from time to time HB
 
 
   
+  
+hbase_regionserver_cms_initiating_occupancy_fraction
+50
+HBase RegionServer CMSInitiatingOccupancyFraction when 
ConcMarkSweepGC is used.
+RegionServer CMSInitiatingOccupancyFraction
+
+  int
+  40
+  60
+
+
+  
   
   
 content
@@ -220,11 +232,11 @@ export HBASE_MANAGES_ZK=false
 {% if security_enabled %}
 export HBASE_OPTS="$HBASE_OPTS -XX:+UseConcMarkSweepGC 
-XX:ErrorFile={{log_dir}}/hs_err_pid%p.log 
-Djava.security.auth.login.config={{client_jaas_config_file}} 
-Djava.io.tmpdir={{java_io_tmpdir}}"
 export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}} 
-Djava.security.auth.login.config={{master_jaas_config_file}}"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 
-XX:ReservedCodeCacheSize=256m -Xms{{regionserver_heapsize}} 
-Xmx{{regionserver_heapsize}} 
-Djava.security.auth.login.config={{regionserver_jaas_config_file}}"
+export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} 
-XX:CMSInitiatingOccupancyFraction={{regionserver_cms_initiating_occupancy_fraction}}
 -XX:+UseCMSInitiatingOccupancyOnly -XX:ReservedCodeCacheSize=256m 
-Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}} 
-Djava.security.auth.login.config={{regionserver_jaas_config_file}}"
 {% else %}
 export HBASE_OPTS="$HBASE_OPTS -XX:+UseConcMarkSweepGC 
-XX:ErrorFile={{log_dir}}/hs_err_pid%p.log -Djava.io.tmpdir={{java_io_tmpdir}}"
 export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}}"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 
-XX:ReservedCodeCacheSize=256m -Xms{{regionserver_heapsize}} 
-Xmx{{regionserver_heapsize}}"
+export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} 
-XX:CMSInitiatingOccupancyFraction={{regionserver_cms_initiating_occupancy_fraction}}
 -XX:+UseCMSInitiatingOccupancyOnly -XX:ReservedCodeCacheSize=256m 
-Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}"
 {% endif %}
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b2b80191/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index fa9bef2..46f715e 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -131,6 +131,8 @@ regionserver_xmn_size = 
calc_xmn_f

ambari git commit: AMBARI-21765. Missing hdfs_scheme variable in params.py file for Apache Knox (Sandeep More via smohanty)

2017-08-21 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 d1df4d9aa -> ca6ce335d


AMBARI-21765. Missing hdfs_scheme variable in params.py file for Apache Knox 
(Sandeep More via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: ca6ce335d7bd3d50e5892a3169d90acbdada963d
Parents: d1df4d9
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Aug 21 14:00:40 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Aug 21 14:02:12 2017 -0700

--
 .../0.5.0.2.2/package/scripts/params_linux.py   | 27 
 1 file changed, 27 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ca6ce335/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 9b0bbfc..f54abef 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -157,17 +157,30 @@ else:
 
 has_namenode = not namenode_host == None
 namenode_http_port = "50070"
+namenode_https_port = "50470"
 namenode_rpc_port = "8020"
 
 if has_namenode:
   if 'dfs.namenode.http-address' in config['configurations']['hdfs-site']:
 namenode_http_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.http-address'])
+  if 'dfs.namenode.https-address' in config['configurations']['hdfs-site']:
+namenode_https_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.https-address'])
   if dfs_ha_enabled and namenode_rpc:
 namenode_rpc_port = get_port_from_url(namenode_rpc)
   else:
 if 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']:
   namenode_rpc_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.rpc-address'])
 
+dfs_http_policy = default('/configurations/hdfs-site/dfs.http.policy', None)
+
+hdfs_https_on = False
+hdfs_scheme = 'http'
+if dfs_http_policy  !=  None :
+   hdfs_https_on = (dfs_http_policy.upper() == 'HTTPS_ONLY')
+   hdfs_scheme = 'http' if not hdfs_https_on else 'https'
+   hdfs_port = str(namenode_http_port)  if not hdfs_https_on else 
str(namenode_https_port)
+   namenode_http_port = hdfs_port
+
 webhdfs_service_urls = ""
 
 def buildUrlElement(protocol, hdfs_host, port, servicePath) :
@@ -188,6 +201,13 @@ else:
   webhdfs_service_urls = buildUrlElement("http", namenode_host, 
namenode_http_port, "/webhdfs")
 
 
+yarn_http_policy = default('/configurations/yarn-site/yarn.http.policy', None )
+yarn_https_on = False
+yarn_scheme = 'http'
+if yarn_http_policy !=  None :
+   yarn_https_on = ( yarn_http_policy.upper() == 'HTTPS_ONLY')
+   yarn_scheme = 'http' if not yarn_https_on else 'https'
+   
 rm_hosts = default("/clusterHostInfo/rm_host", None)
 if type(rm_hosts) is list:
   rm_host = rm_hosts[0]
@@ -227,17 +247,24 @@ if type(hbase_master_hosts) is list:
 else:
   hbase_master_host = hbase_master_hosts
 
+oozie_https_port = None
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]
 else:
   oozie_server_host = oozie_server_hosts
 
+oozie_scheme = 'http'
 has_oozie = not oozie_server_host == None
 oozie_server_port = "11000"
 
 if has_oozie:
   oozie_server_port = 
get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
+  oozie_https_port = default("/configurations/oozie-site/oozie.https.port", 
None)
+  
+if oozie_https_port is not None:
+   oozie_scheme = 'https'
+   oozie_server_port = oozie_https_port
 
 # Knox managed properties
 knox_managed_pid_symlink= format('{stack_root}/current/knox-server/pids')

ambari git commit: AMBARI-21765. Missing hdfs_scheme variable in params.py file for Apache Knox (Sandeep More via smohanty)

2017-08-21 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk c129baa1f -> 8e33d8864


AMBARI-21765. Missing hdfs_scheme variable in params.py file for Apache Knox 
(Sandeep More via smohanty)


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

Branch: refs/heads/trunk
Commit: 8e33d8864aa0d1cb5be00241be5900d9fa9310dd
Parents: c129baa
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Aug 21 14:00:40 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Aug 21 14:01:19 2017 -0700

--
 .../0.5.0.2.2/package/scripts/params_linux.py   | 27 
 .../0.5.0.3.0/package/scripts/params_linux.py   | 26 +++
 2 files changed, 53 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e33d886/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 7ddf0c8..97b90af 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -150,17 +150,30 @@ else:
 
 has_namenode = not namenode_host == None
 namenode_http_port = "50070"
+namenode_https_port = "50470"
 namenode_rpc_port = "8020"
 
 if has_namenode:
   if 'dfs.namenode.http-address' in config['configurations']['hdfs-site']:
 namenode_http_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.http-address'])
+  if 'dfs.namenode.https-address' in config['configurations']['hdfs-site']:
+namenode_https_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.https-address'])
   if dfs_ha_enabled and namenode_rpc:
 namenode_rpc_port = get_port_from_url(namenode_rpc)
   else:
 if 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']:
   namenode_rpc_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.rpc-address'])
 
+dfs_http_policy = default('/configurations/hdfs-site/dfs.http.policy', None)
+
+hdfs_https_on = False
+hdfs_scheme = 'http'
+if dfs_http_policy  !=  None :
+   hdfs_https_on = (dfs_http_policy.upper() == 'HTTPS_ONLY')
+   hdfs_scheme = 'http' if not hdfs_https_on else 'https'
+   hdfs_port = str(namenode_http_port)  if not hdfs_https_on else 
str(namenode_https_port)
+   namenode_http_port = hdfs_port
+
 webhdfs_service_urls = ""
 
 def buildUrlElement(protocol, hdfs_host, port, servicePath) :
@@ -181,6 +194,13 @@ else:
   webhdfs_service_urls = buildUrlElement("http", namenode_host, 
namenode_http_port, "/webhdfs")
 
 
+yarn_http_policy = default('/configurations/yarn-site/yarn.http.policy', None )
+yarn_https_on = False
+yarn_scheme = 'http'
+if yarn_http_policy !=  None :
+   yarn_https_on = ( yarn_http_policy.upper() == 'HTTPS_ONLY')
+   yarn_scheme = 'http' if not yarn_https_on else 'https'
+   
 rm_hosts = default("/clusterHostInfo/rm_host", None)
 if type(rm_hosts) is list:
   rm_host = rm_hosts[0]
@@ -220,17 +240,24 @@ if type(hbase_master_hosts) is list:
 else:
   hbase_master_host = hbase_master_hosts
 
+oozie_https_port = None
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]
 else:
   oozie_server_host = oozie_server_hosts
 
+oozie_scheme = 'http'
 has_oozie = not oozie_server_host == None
 oozie_server_port = "11000"
 
 if has_oozie:
   oozie_server_port = 
get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
+  oozie_https_port = default("/configurations/oozie-site/oozie.https.port", 
None)
+  
+if oozie_https_port is not None:
+   oozie_scheme = 'https'
+   oozie_server_port = oozie_https_port
 
 # Knox managed properties
 knox_managed_pid_symlink= format('{stack_root}/current/knox-server/pids')

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e33d886/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/p

ambari git commit: Revert "AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in Zeppelin(Prabhjyot Singh via Venkata Sairam)"

2017-08-21 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 ba1fa0bfb -> 4124bc30d


Revert "AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in 
Zeppelin(Prabhjyot Singh via Venkata Sairam)"

This reverts commit 2b50a560c34a278b67352b699e698a1cfd050406.


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

Branch: refs/heads/branch-2.5
Commit: 4124bc30d021277efbd132123a99de9df7707c6e
Parents: ba1fa0b
Author: Sumit Mohanty 
Authored: Mon Aug 21 13:07:34 2017 -0700
Committer: Sumit Mohanty 
Committed: Mon Aug 21 13:07:34 2017 -0700

--
 .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml| 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4124bc30/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
index 742f5be..971e4af 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
@@ -61,12 +61,6 @@ sessionManager = 
org.apache.shiro.web.session.mgt.DefaultWebSessionManager
 cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager
 securityManager.cacheManager = $cacheManager
 
-cookie = org.apache.shiro.web.servlet.SimpleCookie
-cookie.name = JSESSIONID
-cookie.secure = true
-cookie.httpOnly = true
-sessionManager.sessionIdCookie = $cookie
-
 securityManager.sessionManager = $sessionManager
 # 86,400,000 milliseconds = 24 hour
 securityManager.sessionManager.globalSessionTimeout = 8640

ambari git commit: AMBARI-21045. Enable Storm's AutoTGT configs in secure mode (Sriharsha Chintalapani via smohanty)""

2017-08-16 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 d6d2a3b63 -> c126b37e6


AMBARI-21045. Enable Storm's AutoTGT configs in secure mode (Sriharsha 
Chintalapani via smohanty)""

This reverts commit 96e5ea566037e7874e815000966495145974f69c.


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

Branch: refs/heads/branch-2.6
Commit: c126b37e67be5304cfbd8b5be6b750fb3c1ca329
Parents: d6d2a3b
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Aug 15 16:58:33 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Aug 16 10:37:35 2017 -0700

--
 .../STORM/1.1.0/configuration/storm-env.xml | 54 
 .../STORM/1.1.0/configuration/storm-site.xml| 48 ---
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  1 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  2 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 +
 .../stacks/HDP/2.6/services/stack_advisor.py| 87 +++-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  6 ++
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  1 +
 .../src/main/resources/stacks/stack_advisor.py  | 18 
 16 files changed, 204 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c126b37e/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
 
b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
new file mode 100644
index 000..2ce560d
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
@@ -0,0 +1,54 @@
+
+
+
+
+  
+  
+content
+storm-env template
+This is the jinja template for storm-env.sh file
+
+#!/bin/bash
+
+# Set Storm specific environment variables here.
+
+# The java implementation to use.
+export JAVA_HOME={{java64_home}}
+
+export STORM_CONF_DIR={{conf_dir}}
+export STORM_HOME={{storm_component_home_dir}}
+export STORM_JAR_JVM_OPTS={{jar_jvm_opts}}
+
+#set storm-auto creds
+# check if storm_jaas.conf in config , only enable storm_auto_creds in secure 
mode.
+STORM_JAAS_CONF=$STORM_HOME/conf/storm_jaas.conf
+STORM_AUTOCREDS_LIB_DIR=$STORM_HOME/external/storm-autocreds
+
+if [ -f $STORM_JAAS_CONF ]  [ -d $STORM_AUTOCREDS_LIB_DIR ]; then
+export STORM_EXT_CLASSPATH=$STORM_AUTOCREDS_LIB_DIR
+fi
+
+
+  content
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/c126b37e/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
 
b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
deleted file mode 100644
index b2e9acb..000
--- 
a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-  
-nimbus.impersonation.acl
-
-  The ImpersonationAuthorizer uses nimbus.impersonation.acl as the acl to 
authorize users. Following is a sample nimbus config for supporting 
impersonation:
-  nimbus.impersonation.acl:
-  impersonating_user1:
-  hosts:
-  [comma separated list of hosts from which impersonating_user1 is allowed 
to impersonate other users]
-  groups:
-  [comma separated list of groups whose users impersonating_user1 is 
allowed to impersonate]
-  impersonating_user2:
-  hosts:
-  [comma separated list of hosts from which impersonating_user2 is allowed 
to impersonate other users]
-  groups:
-  [comma separated list of groups whose users impersonating_user2 is 
allowed to impersonate]
-
-
-
-  
-streamline-env
-streamline_principal_name
-  
-
-
-  
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/c126b37e/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
--

ambari git commit: AMBARI-21045. Enable Storm's AutoTGT configs in secure mode (Sriharsha Chintalapani via smohanty)""

2017-08-15 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 96e5ea566 -> d7b2d8566


AMBARI-21045. Enable Storm's AutoTGT configs in secure mode (Sriharsha 
Chintalapani via smohanty)""

This reverts commit 96e5ea566037e7874e815000966495145974f69c.


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

Branch: refs/heads/branch-2.5
Commit: d7b2d856632fa2614ba2d2b153c8717ed4390d66
Parents: 96e5ea5
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Aug 15 16:58:33 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue Aug 15 17:09:47 2017 -0700

--
 .../STORM/1.1.0/configuration/storm-env.xml | 54 
 .../STORM/1.1.0/configuration/storm-site.xml| 48 ---
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  1 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  2 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 +
 .../stacks/HDP/2.6/services/stack_advisor.py| 87 +++-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  6 ++
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  1 +
 .../src/main/resources/stacks/stack_advisor.py  | 18 
 16 files changed, 204 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b2d856/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
 
b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
new file mode 100644
index 000..2ce560d
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
@@ -0,0 +1,54 @@
+
+
+
+
+  
+  
+content
+storm-env template
+This is the jinja template for storm-env.sh file
+
+#!/bin/bash
+
+# Set Storm specific environment variables here.
+
+# The java implementation to use.
+export JAVA_HOME={{java64_home}}
+
+export STORM_CONF_DIR={{conf_dir}}
+export STORM_HOME={{storm_component_home_dir}}
+export STORM_JAR_JVM_OPTS={{jar_jvm_opts}}
+
+#set storm-auto creds
+# check if storm_jaas.conf in config , only enable storm_auto_creds in secure 
mode.
+STORM_JAAS_CONF=$STORM_HOME/conf/storm_jaas.conf
+STORM_AUTOCREDS_LIB_DIR=$STORM_HOME/external/storm-autocreds
+
+if [ -f $STORM_JAAS_CONF ]  [ -d $STORM_AUTOCREDS_LIB_DIR ]; then
+export STORM_EXT_CLASSPATH=$STORM_AUTOCREDS_LIB_DIR
+fi
+
+
+  content
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b2d856/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
 
b/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
deleted file mode 100644
index b2e9acb..000
--- 
a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-site.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-  
-nimbus.impersonation.acl
-
-  The ImpersonationAuthorizer uses nimbus.impersonation.acl as the acl to 
authorize users. Following is a sample nimbus config for supporting 
impersonation:
-  nimbus.impersonation.acl:
-  impersonating_user1:
-  hosts:
-  [comma separated list of hosts from which impersonating_user1 is allowed 
to impersonate other users]
-  groups:
-  [comma separated list of groups whose users impersonating_user1 is 
allowed to impersonate]
-  impersonating_user2:
-  hosts:
-  [comma separated list of hosts from which impersonating_user2 is allowed 
to impersonate other users]
-  groups:
-  [comma separated list of groups whose users impersonating_user2 is 
allowed to impersonate]
-
-
-
-  
-streamline-env
-streamline_principal_name
-  
-
-
-  
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b2d856/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
--

ambari git commit: Revert "AMBARI-21045. AMBARI-21045. Enable Storm's AutoTGT configs in secure mode (Sriharsha Chintalapani via smohanty)"

2017-08-15 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 3d07ec5a0 -> 96e5ea566


Revert "AMBARI-21045. AMBARI-21045. Enable Storm's AutoTGT configs in secure 
mode (Sriharsha Chintalapani via smohanty)"

This reverts commit 3d07ec5a091de3735e63c5500c380612e6533baa.


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

Branch: refs/heads/branch-2.5
Commit: 96e5ea566037e7874e815000966495145974f69c
Parents: 3d07ec5
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Aug 15 16:58:05 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue Aug 15 16:58:05 2017 -0700

--
 .../server/upgrade/UpgradeCatalog251.java   | 36 
 .../STORM/1.1.0/configuration/storm-env.xml | 54 
 .../STORM/1.1.0/configuration/storm-site.xml| 48 +++
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |  7 --
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  4 -
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  1 -
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |  7 --
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  4 -
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  2 -
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  7 --
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  4 -
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 -
 .../stacks/HDP/2.6/services/stack_advisor.py| 87 +---
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  6 --
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |  4 -
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  1 -
 .../src/main/resources/stacks/stack_advisor.py  | 18 
 17 files changed, 51 insertions(+), 240 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
index 1a854f8..afda1f6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
@@ -170,40 +170,4 @@ public class UpgradeCatalog251 extends 
AbstractUpgradeCatalog {
   }
 }
   }
-
-  /**
-   * Make sure storm-env changes are applied to anyone upgrading to HDP-2.6.1 
Storm
-   * If the base version was before Ambari 2.5.0, this method should wind up 
doing nothing.
-   * @throws AmbariException
-   */
-  protected void updateSTORMConfigs() throws AmbariException {
-AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
-Clusters clusters = ambariManagementController.getClusters();
-if (clusters != null) {
-  Map<String, Cluster> clusterMap = getCheckedClusterMap(clusters);
-  if (clusterMap != null && !clusterMap.isEmpty()) {
-for (final Cluster cluster : clusterMap.values()) {
-  Set installedServices = cluster.getServices().keySet();
-
-  if (installedServices.contains("STORM") && cluster.getSecurityType() 
== SecurityType.KERBEROS) {
-Config stormEnv = cluster.getDesiredConfigByType(STORM_ENV_CONFIG);
-String content = stormEnv.getProperties().get("content");
-if (content != null && 
!content.contains("STORM_AUTOCREDS_LIB_DIR")) {
-  Map<String, String> newProperties = new HashMap<>();
-  String stormEnvConfigs = "\n #set storm-auto creds \n" +
-  "# check if storm_jaas.conf in config , only enable 
storm_auto_creds in secure mode.\n " +
-  "STORM_JAAS_CONF=$STORM_HOME/conf/storm_jaas.conf \n" +
-  
"STORM_AUTOCREDS_LIB_DIR=$STORM_HOME/external/storm-autocreds \n" +
-  "if [ -f $STORM_JAAS_CONF ]  [ -d 
$STORM_AUTOCREDS_LIB_DIR ]; then \n" +
-  "   export STORM_EXT_CLASSPATH=$STORM_AUTOCREDS_LIB_DIR \n" +
-  "fi\n";
-  content += stormEnvConfigs;
-  newProperties.put("content", content);
-  updateConfigurationPropertiesForCluster(cluster, "storm-env", 
newProperties, true, false);
-}
-  }
-}
-  }
-}
-  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/96e5ea56/ambari-se

ambari git commit: AMBARI-21045. AMBARI-21045. Enable Storm's AutoTGT configs in secure mode (Sriharsha Chintalapani via smohanty)

2017-08-15 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 fb5567608 -> 3d07ec5a0


AMBARI-21045. AMBARI-21045. Enable Storm's AutoTGT configs in secure mode 
(Sriharsha Chintalapani via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 3d07ec5a091de3735e63c5500c380612e6533baa
Parents: fb55676
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Aug 15 15:59:46 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue Aug 15 15:59:46 2017 -0700

--
 .../server/upgrade/UpgradeCatalog251.java   | 36 
 .../STORM/1.1.0/configuration/storm-env.xml | 54 
 .../STORM/1.1.0/configuration/storm-site.xml| 48 ---
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  1 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  2 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  7 ++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 +
 .../stacks/HDP/2.6/services/stack_advisor.py| 87 +++-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  6 ++
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |  4 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  1 +
 .../src/main/resources/stacks/stack_advisor.py  | 18 
 17 files changed, 240 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d07ec5a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
index afda1f6..1a854f8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
@@ -170,4 +170,40 @@ public class UpgradeCatalog251 extends 
AbstractUpgradeCatalog {
   }
 }
   }
+
+  /**
+   * Make sure storm-env changes are applied to anyone upgrading to HDP-2.6.1 
Storm
+   * If the base version was before Ambari 2.5.0, this method should wind up 
doing nothing.
+   * @throws AmbariException
+   */
+  protected void updateSTORMConfigs() throws AmbariException {
+AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
+Clusters clusters = ambariManagementController.getClusters();
+if (clusters != null) {
+  Map<String, Cluster> clusterMap = getCheckedClusterMap(clusters);
+  if (clusterMap != null && !clusterMap.isEmpty()) {
+for (final Cluster cluster : clusterMap.values()) {
+  Set installedServices = cluster.getServices().keySet();
+
+  if (installedServices.contains("STORM") && cluster.getSecurityType() 
== SecurityType.KERBEROS) {
+Config stormEnv = cluster.getDesiredConfigByType(STORM_ENV_CONFIG);
+String content = stormEnv.getProperties().get("content");
+if (content != null && 
!content.contains("STORM_AUTOCREDS_LIB_DIR")) {
+  Map<String, String> newProperties = new HashMap<>();
+  String stormEnvConfigs = "\n #set storm-auto creds \n" +
+  "# check if storm_jaas.conf in config , only enable 
storm_auto_creds in secure mode.\n " +
+  "STORM_JAAS_CONF=$STORM_HOME/conf/storm_jaas.conf \n" +
+  
"STORM_AUTOCREDS_LIB_DIR=$STORM_HOME/external/storm-autocreds \n" +
+  "if [ -f $STORM_JAAS_CONF ]  [ -d 
$STORM_AUTOCREDS_LIB_DIR ]; then \n" +
+  "   export STORM_EXT_CLASSPATH=$STORM_AUTOCREDS_LIB_DIR \n" +
+  "fi\n";
+  content += stormEnvConfigs;
+  newProperties.put("content", content);
+  updateConfigurationPropertiesForCluster(cluster, "storm-env", 
newProperties, true, false);
+}
+  }
+}
+  }
+}
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d07ec5a/ambari-server/src/main/resources/common-services/STORM/1.1.0/configuration/storm-env.xml
---

ambari git commit: AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 (smohanty)

2017-08-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk bc6cbf359 -> d9c271ae6


AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 
(smohanty)


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

Branch: refs/heads/trunk
Commit: d9c271ae61c285e3b4e066616f057d857797fec9
Parents: bc6cbf3
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Aug 11 16:35:00 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Aug 11 16:36:41 2017 -0700

--
 ambari-server/src/main/resources/host_scripts/alert_disk_space.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9c271ae/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
--
diff --git a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py 
b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
index f3c6406..eb92781 100644
--- a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
+++ b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
@@ -67,7 +67,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 return (('UNKNOWN', ['There were no configurations supplied to the 
script.']))
 
   if not STACK_NAME in configurations or not STACK_ROOT in configurations:
-return (('STACK_ROOT', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
+return (('UNKNOWN', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
 
   path = stack_tools.get_stack_root(configurations[STACK_NAME], 
configurations[STACK_ROOT])

ambari git commit: AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 (smohanty)

2017-08-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 0630899ce -> 7ab587612


AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 
(smohanty)


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

Branch: refs/heads/branch-2.6
Commit: 7ab5876124db25cc111d80d82afb94b29e607485
Parents: 0630899
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Aug 11 16:35:00 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Aug 11 16:36:12 2017 -0700

--
 ambari-server/src/main/resources/host_scripts/alert_disk_space.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ab58761/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
--
diff --git a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py 
b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
index f3c6406..eb92781 100644
--- a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
+++ b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
@@ -67,7 +67,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 return (('UNKNOWN', ['There were no configurations supplied to the 
script.']))
 
   if not STACK_NAME in configurations or not STACK_ROOT in configurations:
-return (('STACK_ROOT', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
+return (('UNKNOWN', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
 
   path = stack_tools.get_stack_root(configurations[STACK_NAME], 
configurations[STACK_ROOT])

ambari git commit: AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 (smohanty)

2017-08-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 aa9d866e7 -> 5f750176f


AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 
(smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 5f750176f0c1fb88b7577aa69d3054ded6382f93
Parents: aa9d866
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Aug 11 16:35:00 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Aug 11 16:35:00 2017 -0700

--
 ambari-server/src/main/resources/host_scripts/alert_disk_space.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5f750176/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
--
diff --git a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py 
b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
index f3c6406..eb92781 100644
--- a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
+++ b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
@@ -67,7 +67,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 return (('UNKNOWN', ['There were no configurations supplied to the 
script.']))
 
   if not STACK_NAME in configurations or not STACK_ROOT in configurations:
-return (('STACK_ROOT', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
+return (('UNKNOWN', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
 
   path = stack_tools.get_stack_root(configurations[STACK_NAME], 
configurations[STACK_ROOT])

ambari git commit: AMBARI-21663. Livy2 should use the same keytab as Livy. (Bikas Saha via smohanty)

2017-08-04 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk b175d8f69 -> aa9e16d89


AMBARI-21663. Livy2 should use the same keytab as Livy. (Bikas Saha via 
smohanty)


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

Branch: refs/heads/trunk
Commit: aa9e16d8928b95c555a1e5b966fe1cf86c15cf82
Parents: b175d8f
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Aug 4 15:03:24 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Aug 4 15:11:22 2017 -0700

--
 .../main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aa9e16d8/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
index 198ab41..0f99bbb 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
@@ -96,7 +96,7 @@
 "local_username": "${livy2-env/livy2_user}"
   },
   "keytab": {
-"file": "${keytab_dir}/livy2.service.keytab",
+"file": "${keytab_dir}/livy.service.keytab",
 "owner": {
   "name": "${livy2-env/livy2_user}",
   "access": "r"

ambari git commit: AMBARI-21663. Livy2 should use the same keytab as Livy. (Bikas Saha via smohanty)

2017-08-04 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 24d7689f0 -> 2432f6f68


AMBARI-21663. Livy2 should use the same keytab as Livy. (Bikas Saha via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 2432f6f68104d47cfc3103b091dc32a4680785da
Parents: 24d7689
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Aug 4 15:03:24 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Aug 4 15:03:24 2017 -0700

--
 .../main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2432f6f6/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
index 198ab41..0f99bbb 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
@@ -96,7 +96,7 @@
 "local_username": "${livy2-env/livy2_user}"
   },
   "keytab": {
-"file": "${keytab_dir}/livy2.service.keytab",
+"file": "${keytab_dir}/livy.service.keytab",
 "owner": {
   "name": "${livy2-env/livy2_user}",
   "access": "r"

ambari git commit: AMBARI-21605. Missing Kerberos configs for Spark2 (Bikas Saha via smohanty)

2017-07-28 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 3009a4aa1 -> 70baac3b4


AMBARI-21605. Missing Kerberos configs for Spark2 (Bikas Saha via smohanty)


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

Branch: refs/heads/trunk
Commit: 70baac3b42bf0cf3286cb5d926475d4f9de78d77
Parents: 3009a4a
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Jul 28 17:29:05 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Jul 28 17:29:43 2017 -0700

--
 .../resources/stacks/HDP/2.6/services/SPARK2/kerberos.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/70baac3b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
index 36513f2..198ab41 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
@@ -30,12 +30,12 @@
   ],
   "configurations": [
 {
-  "spark-defaults": {
+  "spark2-defaults": {
 "spark.history.kerberos.enabled": "true"
   }
 },
 {
-  "spark-thrift-sparkconf": {
+  "spark2-thrift-sparkconf": {
 "spark.yarn.keytab": "${spark2-env/hive_kerberos_keytab}",
 "spark.yarn.principal": "${spark2-env/hive_kerberos_principal}"
   }
@@ -123,4 +123,4 @@
   ]
 }
   ]
-}
\ No newline at end of file
+}

ambari git commit: AMBARI-21605. Missing Kerberos configs for Spark2 (Bikas Saha via smohanty)

2017-07-28 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 28e7fb579 -> 9b309e31a


AMBARI-21605. Missing Kerberos configs for Spark2 (Bikas Saha via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 9b309e31a048c645202aa0fc88502c2a113fc01c
Parents: 28e7fb5
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Jul 28 17:29:05 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Jul 28 17:29:05 2017 -0700

--
 .../resources/stacks/HDP/2.6/services/SPARK2/kerberos.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b309e31/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
index 36513f2..198ab41 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
@@ -30,12 +30,12 @@
   ],
   "configurations": [
 {
-  "spark-defaults": {
+  "spark2-defaults": {
 "spark.history.kerberos.enabled": "true"
   }
 },
 {
-  "spark-thrift-sparkconf": {
+  "spark2-thrift-sparkconf": {
 "spark.yarn.keytab": "${spark2-env/hive_kerberos_keytab}",
 "spark.yarn.principal": "${spark2-env/hive_kerberos_principal}"
   }
@@ -123,4 +123,4 @@
   ]
 }
   ]
-}
\ No newline at end of file
+}

ambari git commit: AMBARI-21563. Copy Hadoop core-site.xml to Atlas conf when hadoop is configured for LDAP/AD (Vishal Suvagia via smohanty)

2017-07-27 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 0f426c16c -> d4fad25e0


AMBARI-21563. Copy Hadoop core-site.xml to Atlas conf when hadoop is configured 
for LDAP/AD (Vishal Suvagia via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: d4fad25e0c1d768fd2073a75259246d1be2c4bf9
Parents: 0f426c1
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Jul 27 13:14:41 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Jul 27 13:15:20 2017 -0700

--
 .../libraries/functions/constants.py|  1 +
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 16 
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |  1 +
 .../stacks/HDP/2.0.6/properties/stack_features.json |  5 +
 .../stacks/HDP/2.6/services/ATLAS/metainfo.xml  |  1 +
 5 files changed, 24 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d4fad25e/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
index c74e029..3b941ec 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
@@ -119,3 +119,4 @@ class StackFeature:
   SECURE_RANGER_SSL_PASSWORD = "secure_ranger_ssl_password"
   RANGER_KMS_SSL = "ranger_kms_ssl"
   KAFKA_ACL_MIGRATION_SUPPORT = "kafka_acl_migration_support"
+  ATLAS_CORE_SITE_SUPPORT="atlas_core_site_support"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/d4fad25e/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index 36c4598..6b5f562 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -197,6 +197,22 @@ def metadata(type='server'):
 else:
   File(format('{conf_dir}/hdfs-site.xml'), action="delete")
 
+'''
+Atlas requires hadoop core-site.xml to resolve users/groups synced in 
HadoopUGI for
+authentication and authorization process. Earlier the core-site.xml was 
available in
+Hbase conf directory which is a part of Atlas class-path, from stack 2.6 
onwards,
+core-site.xml is no more available in Hbase conf directory. Hence need to 
create
+core-site.xml in Atlas conf directory.
+'''
+if params.stack_supports_atlas_core_site and params.has_namenode:
+  XmlConfig("core-site.xml",
+conf_dir=params.conf_dir,
+configurations=params.config['configurations']['core-site'],
+
configuration_attributes=params.config['configuration_attributes']['core-site'],
+owner=params.metadata_user,
+group=params.user_group,
+mode=0644
+  )
 
 def upload_conf_set(config_set, jaasFile):
   import params

http://git-wip-us.apache.org/repos/asf/ambari/blob/d4fad25e/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index b83a79f..41be001 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -237,6 +237,7 @@ for host in zookeeper_hosts:
 zookeeper_quorum += ","
 
 stack_supports_atlas_hdfs_site_on_namenode_ha = 
check_stack_feature(StackFeature.ATLAS_HDFS_SITE_ON_NAMENODE_HA, 
version_for_stack_feature_checks)
+stack_supports_atlas_core_site = 
check_stack_feature(StackFeature.ATLAS_CORE_SITE_SUPPORT,version_for_stack_feature_checks)
 
 atlas_server_xmx = default("configurations/atlas-env/atlas_server_xmx", 2048)

ambari git commit: AMBARI-21563. Copy Hadoop core-site.xml to Atlas conf when hadoop is configured for LDAP/AD (Vishal Suvagia via smohanty)

2017-07-27 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk ad593b4ed -> eb2725158


AMBARI-21563. Copy Hadoop core-site.xml to Atlas conf when hadoop is configured 
for LDAP/AD (Vishal Suvagia via smohanty)


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

Branch: refs/heads/trunk
Commit: eb272515826f46620d1e24b1250605b614fe424d
Parents: ad593b4
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Jul 27 13:14:41 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Jul 27 13:14:41 2017 -0700

--
 .../libraries/functions/constants.py|  1 +
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 16 
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |  3 ++-
 .../stacks/HDP/2.0.6/properties/stack_features.json |  5 +
 .../stacks/HDP/2.6/services/ATLAS/metainfo.xml  |  1 +
 5 files changed, 25 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eb272515/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
index c74e029..3b941ec 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
@@ -119,3 +119,4 @@ class StackFeature:
   SECURE_RANGER_SSL_PASSWORD = "secure_ranger_ssl_password"
   RANGER_KMS_SSL = "ranger_kms_ssl"
   KAFKA_ACL_MIGRATION_SUPPORT = "kafka_acl_migration_support"
+  ATLAS_CORE_SITE_SUPPORT="atlas_core_site_support"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb272515/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index d424f5b..74b1688 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -197,6 +197,22 @@ def metadata(type='server'):
 else:
   File(format('{conf_dir}/hdfs-site.xml'), action="delete")
 
+'''
+Atlas requires hadoop core-site.xml to resolve users/groups synced in 
HadoopUGI for
+authentication and authorization process. Earlier the core-site.xml was 
available in
+Hbase conf directory which is a part of Atlas class-path, from stack 2.6 
onwards,
+core-site.xml is no more available in Hbase conf directory. Hence need to 
create
+core-site.xml in Atlas conf directory.
+'''
+if params.stack_supports_atlas_core_site and params.has_namenode:
+  XmlConfig("core-site.xml",
+conf_dir=params.conf_dir,
+configurations=params.config['configurations']['core-site'],
+
configuration_attributes=params.config['configuration_attributes']['core-site'],
+owner=params.metadata_user,
+group=params.user_group,
+mode=0644
+  )
 
 def upload_conf_set(config_set, jaasFile):
   import params

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb272515/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 3ed469a..96041e6 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -78,7 +78,7 @@ def configs_for_ha(atlas_hosts, metadata_port, 
is_atlas_ha_enabled, metadata_pro
 additional_props["atlas.server.ha.enabled"] = "true"
 
   return additional_props
-  
+
 # server configurations
 config = Script.get_config()
 exec_tmp_dir = Script.get_tmp_dir()
@@ -240,6 +240,7 @@ for host in zookeeper_hosts:
 zookeeper_quorum += ","
 
 stack_supports_atlas_hdfs_site_on_namenode

ambari git commit: AMBARI-21157. Logging cleanup around reading config properties file

2017-07-22 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk d77bde7fd -> 495a3f467


AMBARI-21157. Logging cleanup around reading config properties file


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

Branch: refs/heads/trunk
Commit: 495a3f467edc4e19e9da76db10a1499e514c80a5
Parents: d77bde7
Author: Sumit Mohanty 
Authored: Sat Jul 22 18:09:54 2017 -0700
Committer: Sumit Mohanty 
Committed: Sat Jul 22 18:10:42 2017 -0700

--
 .../org/apache/ambari/server/configuration/Configuration.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/495a3f46/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 28f9d64..1b4d741 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -4064,7 +4064,11 @@ public class Configuration {
   if (result != null) {
 password = new String(result);
   } else {
-LOG.error("Cannot read password for alias = " + aliasStr);
+if (CredentialProvider.isAliasString(aliasStr)) {
+  LOG.error("Cannot read password for alias = " + aliasStr);
+} else {
+  LOG.warn("Raw password provided, not an alias. It cannot be read 
from credential store.");
+}
   }
 }
 return password;

ambari git commit: AMBARI-21157. Logging cleanup around reading config properties file

2017-07-22 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 61df6972d -> e57032d26


AMBARI-21157. Logging cleanup around reading config properties file


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

Branch: refs/heads/branch-2.5
Commit: e57032d26633b0a451b123d3109672b638dc40a9
Parents: 61df697
Author: Sumit Mohanty 
Authored: Sat Jul 22 18:09:54 2017 -0700
Committer: Sumit Mohanty 
Committed: Sat Jul 22 18:09:54 2017 -0700

--
 .../org/apache/ambari/server/configuration/Configuration.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e57032d2/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index fa5ed71..7567755 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -3946,7 +3946,11 @@ public class Configuration {
   if (result != null) {
 password = new String(result);
   } else {
-LOG.error("Cannot read password for alias = " + aliasStr);
+if (CredentialProvider.isAliasString(aliasStr)) {
+  LOG.error("Cannot read password for alias = " + aliasStr);
+} else {
+  LOG.warn("Raw password provided, not an alias. It cannot be read 
from credential store.");
+}
   }
 }
 return password;

ambari git commit: Cross-stack upgrade, Oozie restart fails with ext-2.2.zip missing error, stack_tools.py is missing get_stack_name in __all__, disable BigInsights in UI (Alejandro Fernandez via smoh

2017-07-21 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk cfd7bb4cb -> eca55998d


Cross-stack upgrade, Oozie restart fails with ext-2.2.zip missing error, 
stack_tools.py is missing get_stack_name in __all__, disable BigInsights in UI 
(Alejandro Fernandez via smohanty)


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

Branch: refs/heads/trunk
Commit: eca55998d38f6a8edbb156d84c6cc963c68e85a9
Parents: cfd7bb4
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Jul 21 12:07:34 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Jul 21 12:10:28 2017 -0700

--
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 44 
 .../package/scripts/oozie_server_upgrade.py | 34 +--
 .../stacks/2.0.6/OOZIE/test_oozie_server.py | 32 ++
 3 files changed, 84 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eca55998/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index d916d3b..3467ed2 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -215,7 +215,27 @@ def oozie_ownership():
 group = params.user_group
   )
 
-def oozie_server_specific():
+def get_oozie_ext_zip_source_paths(upgrade_type, params):
+  """
+  Get an ordered list of Oozie ext zip file paths from the source stack.
+  :param upgrade_type:  Upgrade type will be None if not in the middle of a 
stack upgrade.
+  :param params: Expected to contain fields for ext_js_path, 
upgrade_direction, source_stack_name, and ext_js_file
+  :return: Source paths to use for Oozie extension zip file
+  """
+  # Default to /usr/share/$TARGETSTACK-oozie/ext-2.2.zip
+  paths = []
+  source_ext_js_path = params.ext_js_path
+  # Preferred location used by HDP and BigInsights 4.2.5
+  if upgrade_type is not None and params.upgrade_direction == 
Direction.UPGRADE:
+source_ext_js_path = "/usr/share/" + params.source_stack_name.upper() + 
"-oozie/" + params.ext_js_file
+  paths.append(source_ext_js_path)
+
+  # Alternate location used by BigInsights 4.2.0 when migrating to another 
stack.
+  paths.append("/var/lib/oozie/" + params.ext_js_file)
+
+  return paths
+
+def oozie_server_specific(upgrade_type):
   import params
   
   no_op_test = as_user(format("ls {pid_file} >/dev/null 2>&1 && ps -p `cat 
{pid_file}` >/dev/null 2>&1"), user=params.oozie_user)
@@ -249,13 +269,23 @@ def oozie_server_specific():
   )
 
   configure_cmds = []
-  configure_cmds.append(('cp', params.ext_js_path, params.oozie_libext_dir))
-  configure_cmds.append(('chown', format('{oozie_user}:{user_group}'), 
format('{oozie_libext_dir}/{ext_js_file}')))
+  # Default to /usr/share/$TARGETSTACK-oozie/ext-2.2.zip as the first path
+  source_ext_zip_paths = get_oozie_ext_zip_source_paths(upgrade_type, params)
+  
+  # Copy the first oozie ext-2.2.zip file that is found.
+  # This uses a list to handle the cases when migrating from some versions of 
BigInsights to HDP.
+  if source_ext_zip_paths is not None:
+for source_ext_zip_path in source_ext_zip_paths:
+  if os.path.isfile(source_ext_zip_path):
+configure_cmds.append(('cp', source_ext_zip_path, 
params.oozie_libext_dir))
+configure_cmds.append(('chown', format('{oozie_user}:{user_group}'), 
format('{oozie_libext_dir}/{ext_js_file}')))
+
+Execute(configure_cmds,
+not_if=no_op_test,
+sudo=True,
+)
+break
   
-  Execute( configure_cmds,
-not_if  = no_op_test,
-sudo = True,
-  )
   
   Directory(params.oozie_webapps_conf_dir,
 owner = params.oozie_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/eca55998/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
inde

ambari git commit: Cross-stack upgrade, Oozie restart fails with ext-2.2.zip missing error, stack_tools.py is missing get_stack_name in __all__, disable BigInsights in UI (Alejandro Fernandez via smoh

2017-07-21 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 421f3c6a2 -> 0ad9d587d


Cross-stack upgrade, Oozie restart fails with ext-2.2.zip missing error, 
stack_tools.py is missing get_stack_name in __all__, disable BigInsights in UI 
(Alejandro Fernandez via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 0ad9d587d0d7cf88c53ae08c8ce9d7351be4a505
Parents: 421f3c6
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Jul 21 12:07:34 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Jul 21 12:07:34 2017 -0700

--
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 40 +---
 .../package/scripts/oozie_server_upgrade.py | 35 ++---
 .../stacks/2.0.6/OOZIE/test_oozie_server.py | 32 
 3 files changed, 74 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ad9d587/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 142e962..aa5bc30 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -215,18 +215,25 @@ def oozie_ownership():
 group = params.user_group
   )
 
-def get_oozie_ext_zip_source_path(upgrade_type, params):
+def get_oozie_ext_zip_source_paths(upgrade_type, params):
   """
-  Get the Oozie ext zip file path from the source stack.
+  Get an ordered list of Oozie ext zip file paths from the source stack.
   :param upgrade_type:  Upgrade type will be None if not in the middle of a 
stack upgrade.
   :param params: Expected to contain fields for ext_js_path, 
upgrade_direction, source_stack_name, and ext_js_file
-  :return: Source path to use for Oozie extension zip file
+  :return: Source paths to use for Oozie extension zip file
   """
   # Default to /usr/share/$TARGETSTACK-oozie/ext-2.2.zip
+  paths = []
   source_ext_js_path = params.ext_js_path
+  # Preferred location used by HDP and BigInsights 4.2.5
   if upgrade_type is not None and params.upgrade_direction == 
Direction.UPGRADE:
 source_ext_js_path = "/usr/share/" + params.source_stack_name.upper() + 
"-oozie/" + params.ext_js_file
-  return source_ext_js_path
+  paths.append(source_ext_js_path)
+
+  # Alternate location used by BigInsights 4.2.0 when migrating to another 
stack.
+  paths.append("/var/lib/oozie/" + params.ext_js_file)
+
+  return paths
 
 def oozie_server_specific(upgrade_type):
   import params
@@ -262,16 +269,23 @@ def oozie_server_specific(upgrade_type):
   )
 
   configure_cmds = []
-  # Default to /usr/share/$TARGETSTACK-oozie/ext-2.2.zip
-  source_ext_zip_path = get_oozie_ext_zip_source_path(upgrade_type, params)
-
-  configure_cmds.append(('cp', source_ext_zip_path, params.oozie_libext_dir))
-  configure_cmds.append(('chown', format('{oozie_user}:{user_group}'), 
format('{oozie_libext_dir}/{ext_js_file}')))
+  # Default to /usr/share/$TARGETSTACK-oozie/ext-2.2.zip as the first path
+  source_ext_zip_paths = get_oozie_ext_zip_source_paths(upgrade_type, params)
+  
+  # Copy the first oozie ext-2.2.zip file that is found.
+  # This uses a list to handle the cases when migrating from some versions of 
BigInsights to HDP.
+  if source_ext_zip_paths is not None:
+for source_ext_zip_path in source_ext_zip_paths:
+  if os.path.isfile(source_ext_zip_path):
+configure_cmds.append(('cp', source_ext_zip_path, 
params.oozie_libext_dir))
+configure_cmds.append(('chown', format('{oozie_user}:{user_group}'), 
format('{oozie_libext_dir}/{ext_js_file}')))
+
+Execute(configure_cmds,
+not_if=no_op_test,
+sudo=True,
+)
+break
   
-  Execute( configure_cmds,
-not_if  = no_op_test,
-sudo = True,
-  )
   
   Directory(params.oozie_webapps_conf_dir,
 owner = params.oozie_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ad9d587/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/p

ambari git commit: Reverting the accidental commit of a rust file (smohanty)

2017-07-19 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 2b24cde43 -> dc9bf0821


Reverting the accidental commit of a rust file (smohanty)


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

Branch: refs/heads/branch-2.5
Commit: dc9bf0821690dd7f677060dca5f3c4bf81c577aa
Parents: 2b24cde
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Jul 19 07:15:05 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Jul 19 07:15:48 2017 -0700

--
 ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dc9bf082/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs
deleted file mode 100644
index e69de29..000

ambari git commit: Reverting the accidental commit of a rust file (smohanty)

2017-07-19 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk ba977e5a9 -> 4b189a113


Reverting the accidental commit of a rust file (smohanty)


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

Branch: refs/heads/trunk
Commit: 4b189a1131a387f1a74e45624af95525e984d30a
Parents: ba977e5
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Jul 19 07:15:05 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Jul 19 07:15:05 2017 -0700

--
 ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4b189a11/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs
deleted file mode 100644
index e69de29..000

ambari git commit: AMBARI-21512. Stack Advisor reported an error: KeyError: stack_name while Issued INSTALLED as new state for NODEMANAGER (smohanty)

2017-07-18 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 016df4e9f -> 8de651738


AMBARI-21512. Stack Advisor reported an error: KeyError: stack_name while 
Issued INSTALLED as new state for NODEMANAGER (smohanty)


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

Branch: refs/heads/trunk
Commit: 8de651738a8338e4744b0a2a661577b08ae01778
Parents: 016df4e
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Jul 18 22:05:46 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue Jul 18 22:07:22 2017 -0700

--
 .../src/main/java/org/apache/ambari/server/agent/hello.rs | 0
 ambari-server/src/main/resources/stacks/stack_advisor.py  | 7 ---
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8de65173/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/hello.rs
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/ambari/blob/8de65173/ambari-server/src/main/resources/stacks/stack_advisor.py
--
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/stack_advisor.py
index 67f7fe0..321ac4e 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -2017,9 +2017,10 @@ class DefaultStackAdvisor(StackAdvisor):
 if cluster_env and "stack_root" in cluster_env:
   stack_root_as_str = cluster_env["stack_root"]
   stack_roots = json.loads(stack_root_as_str)
-  stack_name = cluster_env["stack_name"]
-  if stack_name in stack_roots:
-stack_root = stack_roots[stack_name]
+  if "stack_name" in cluster_env:
+stack_name = cluster_env["stack_name"]
+if stack_name in stack_roots:
+  stack_root = stack_roots[stack_name]
 
 return stack_root

ambari git commit: AMBARI-21460. Add new kafka client properties to the ambari managed atlas config (smohanty)

2017-07-14 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 0a8c397bd -> c7f42285a


AMBARI-21460. Add new kafka client properties to the ambari managed atlas 
config (smohanty)


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

Branch: refs/heads/trunk
Commit: c7f42285a2bd36a215b6c8988cfd7fd025461285
Parents: 0a8c397
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Jul 14 15:42:52 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Jul 14 15:44:25 2017 -0700

--
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml |  4 
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml|  6 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml|  1 +
 .../ATLAS/configuration/application-properties.xml | 17 +
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml |  4 
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml|  4 
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml|  1 +
 7 files changed, 36 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c7f42285/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 30796cc..db3ef59 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -153,6 +153,10 @@
 atlas-env
 
   
+  
+application-properties
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7f42285/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 1f37389..cfd429f 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -456,7 +456,7 @@
   Updating the Atlas Log4J properties to include 
parameterizations
 
   
-  
+
   
 
   Updating Atlas TLS Exclude Protocols to exclude TLS 
v1.2
@@ -475,6 +475,10 @@
 
   
 
+  
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7f42285/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 22c9a8d..840b17d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -1101,6 +1101,7 @@
   
   
   
+  
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7f42285/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
index 91de1b0..c271dc3 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml
@@ -92,4 +92,21 @@
 
 
   
+  
+atlas.kafka.session.timeout.ms
+3
+New Kafka consumer API
+
+  
+  
+atlas.kafka.enable.auto.commit
+false
+New Kafka consumer API
+
+  
+  
+atlas.kafka.auto.commit.enable
+true
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7f42285/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/r

ambari git commit: AMBARI-21460. Add new kafka client properties to the ambari managed atlas config (smohanty)

2017-07-14 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 48bc7635e -> 4ddbd6246


AMBARI-21460. Add new kafka client properties to the ambari managed atlas 
config (smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 4ddbd6246b5718f30912dec0f30939ac33b052dc
Parents: 48bc763
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Jul 14 15:42:52 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Jul 14 15:43:01 2017 -0700

--
 .../4.0/stack-advisor/stack_advisor_25.py  |  3 ++-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml |  4 
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml|  6 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml|  1 +
 .../ATLAS/configuration/application-properties.xml | 17 +
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml |  4 
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml|  4 
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml|  1 +
 8 files changed, 38 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4ddbd624/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
index eb7d370..7e77382 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
@@ -734,7 +734,8 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 self.checkAndStopLlapQueue(services, configurations, LLAP_QUEUE_NAME)
 
 putYarnSiteProperty = self.putProperty(configurations, "yarn-site", 
services)
-stack_root = self.getStackRoot(services)
+stack_root = self.getStackRoot(services
+)
 
 timeline_plugin_classes_values = []
 timeline_plugin_classpath_values = []

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ddbd624/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 7fedc3a..6166318 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -123,6 +123,10 @@
 atlas-env
 
   
+  
+application-properties
+
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ddbd624/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 3cab083..ce10e8b 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -453,7 +453,7 @@
   Updating the Atlas Log4J properties to include 
parameterizations
 
   
-  
+
   
 
   Updating Atlas TLS Exclude Protocols to exclude TLS 
v1.2
@@ -472,6 +472,10 @@
 
   
 
+  
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ddbd624/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 22c9a8d..840b17d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -1101,6 +1101,7 @@
   
   
   
+  
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ddbd624/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/a

ambari git commit: AMBARI-21471. ATS going down due to missing org.apache.spark.deploy.history.yarn.plugin.SparkATSPlugin (smohanty)

2017-07-13 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 d2c6d53f7 -> afea7bb72


AMBARI-21471. ATS going down due to missing 
org.apache.spark.deploy.history.yarn.plugin.SparkATSPlugin (smohanty)


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

Branch: refs/heads/branch-2.5
Commit: afea7bb72475fa3d6938aa049dd2db99f3adc133
Parents: d2c6d53
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Jul 13 22:35:28 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Jul 13 22:35:28 2017 -0700

--
 .../4.0/stack-advisor/stack_advisor_25.py   |   4 +-
 .../stacks/HDP/2.5/services/stack_advisor.py|   5 +-
 .../src/main/resources/stacks/stack_advisor.py  |  18 +++
 .../stacks/2.5/common/test_stack_advisor.py | 150 +++
 4 files changed, 106 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/afea7bb7/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
index 1f0ae18..eb7d370 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/stack-advisor/stack_advisor_25.py
@@ -734,9 +734,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 self.checkAndStopLlapQueue(services, configurations, LLAP_QUEUE_NAME)
 
 putYarnSiteProperty = self.putProperty(configurations, "yarn-site", 
services)
-stack_root = "/usr/hdp"
-if "cluster-env" in services["configurations"] and "stack_root" in 
services["configurations"]["cluster-env"]["properties"]:
-  stack_root = 
services["configurations"]["cluster-env"]["properties"]["stack_root"]
+stack_root = self.getStackRoot(services)
 
 timeline_plugin_classes_values = []
 timeline_plugin_classpath_values = []

http://git-wip-us.apache.org/repos/asf/ambari/blob/afea7bb7/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 638e79a..97c49f3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -19,6 +19,7 @@ limitations under the License.
 
 import math
 
+
 from ambari_commons.str_utils import string_set_equals
 from resource_management.core.logger import Logger
 from resource_management.core.exceptions import Fail
@@ -775,9 +776,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 self.checkAndStopLlapQueue(services, configurations, LLAP_QUEUE_NAME)
 
 putYarnSiteProperty = self.putProperty(configurations, "yarn-site", 
services)
-stack_root = "/usr/hdp"
-if cluster_env and "stack_root" in cluster_env:
-  stack_root = cluster_env["stack_root"]
+stack_root = self.getStackRoot(services)
 
 timeline_plugin_classes_values = []
 timeline_plugin_classpath_values = []

http://git-wip-us.apache.org/repos/asf/ambari/blob/afea7bb7/ambari-server/src/main/resources/stacks/stack_advisor.py
--
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/stack_advisor.py
index e393b9c..1e0d83a 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -22,6 +22,7 @@ import os
 import re
 import socket
 import traceback
+import json
 
 class StackAdvisor(object):
   """
@@ -1144,6 +1145,23 @@ class DefaultStackAdvisor(StackAdvisor):
 
 return mount_points
 
+  def getStackRoot(self, services):
+"""
+Gets the stack root associated with the stack
+:param services: the services structure containing the current 
configurations
+:return: the stack root as specified in the config or /usr/hdp
+"""
+cluster_env = self.getServicesSiteProperties(services, "cluster-env")

ambari git commit: AMBARI-21454. hive20 and wfmanager views fails to build with issue missing module babel-plugin-transform-es2015-block-scoping (Vijay Kumar via via smohanty)

2017-07-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk f27f3affb -> eb1adcbff


AMBARI-21454. hive20 and wfmanager views fails to build with issue missing 
module babel-plugin-transform-es2015-block-scoping (Vijay Kumar via via 
smohanty)


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

Branch: refs/heads/trunk
Commit: eb1adcbff32fb9440f288ccaddc997297eb8e4fb
Parents: f27f3af
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Jul 12 16:30:49 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Jul 12 16:30:49 2017 -0700

--
 contrib/views/hive20/src/main/resources/ui/package.json| 1 +
 contrib/views/wfmanager/src/main/resources/ui/package.json | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eb1adcbf/contrib/views/hive20/src/main/resources/ui/package.json
--
diff --git a/contrib/views/hive20/src/main/resources/ui/package.json 
b/contrib/views/hive20/src/main/resources/ui/package.json
index a409111..eea8cf9 100644
--- a/contrib/views/hive20/src/main/resources/ui/package.json
+++ b/contrib/views/hive20/src/main/resources/ui/package.json
@@ -24,6 +24,7 @@
 "bootstrap-daterangepicker": "2.1.24",
 "bower": "^1.7.9",
 "broccoli-asset-rev": "^2.4.2",
+"babel-plugin-transform-es2015-block-scoping": "^6.24.1",
 "ember-ajax": "^2.0.1",
 "ember-cli": "2.7.0",
 "ember-cli-app-version": "^1.0.0",

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb1adcbf/contrib/views/wfmanager/src/main/resources/ui/package.json
--
diff --git a/contrib/views/wfmanager/src/main/resources/ui/package.json 
b/contrib/views/wfmanager/src/main/resources/ui/package.json
index 25ed6c1..69f43c8 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/package.json
+++ b/contrib/views/wfmanager/src/main/resources/ui/package.json
@@ -21,6 +21,7 @@
   "devDependencies": {
 "bower": "^1.7.7",
 "broccoli-asset-rev": "^2.2.0",
+"babel-plugin-transform-es2015-block-scoping": "^6.24.1",
 "ember-ajax": "0.7.1",
 "ember-cli": "2.3.0",
 "ember-cli-app-version": "^1.0.0",

ambari git commit: AMBARI-20291 - Script-Based Alert Dispatchers support passing more parameters to script (Yao Lei via jonathanhurley)

2017-07-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 b3ec9aab4 -> cba018eb6


AMBARI-20291 - Script-Based Alert Dispatchers support passing more parameters 
to script (Yao Lei via jonathanhurley)


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

Branch: refs/heads/branch-2.5
Commit: cba018eb6d5c4f2946998d083e92448f5e3770ad
Parents: b3ec9aa
Author: Jonathan Hurley 
Authored: Mon Mar 6 11:13:34 2017 -0500
Committer: Sumit Mohanty 
Committed: Wed Jul 5 16:41:01 2017 -0700

--
 .../dispatchers/AlertScriptDispatcher.java  |  7 +++--
 .../services/AlertNoticeDispatchService.java|  8 ++
 .../dispatchers/AlertScriptDispatcherTest.java  | 28 +++-
 3 files changed, 40 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cba018eb/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
index 907588d..d65a11d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcher.java
@@ -259,13 +259,16 @@ public class AlertScriptDispatcher implements 
NotificationDispatcher {
 String alertLabel = "\"" + SHELL_ESCAPE.escape(definition.getLabel()) + 
"\"";
 String alertText = "\"" + SHELL_ESCAPE.escape(alertInfo.getAlertText()) + 
"\"";
 
+long alertTimestamp = alertInfo.getAlertTimestamp();
+String hostName = alertInfo.getHostName(); // null if alert do not run 
against host
+
 Object[] params = new Object[] { script, definitionName, alertLabel, 
serviceName,
-alertState.name(), alertText };
+alertState.name(), alertText, alertTimestamp, hostName};
 
 String foo = StringUtils.join(params, " ");
 
 // sh -c '/foo/sys_logger.py ambari_server_agent_heartbeat "Agent 
Heartbeat"
-// AMBARI CRITICAL "Something went wrong with the host"'
+// AMBARI CRITICAL "Something went wrong with the host" 111 host222'
 return new ProcessBuilder(shellCommand, shellCommandOption, foo);
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/cba018eb/ambari-server/src/main/java/org/apache/ambari/server/state/services/AlertNoticeDispatchService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/services/AlertNoticeDispatchService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/services/AlertNoticeDispatchService.java
index d4ffd4a..906a782 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/services/AlertNoticeDispatchService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/services/AlertNoticeDispatchService.java
@@ -771,6 +771,14 @@ public class AlertNoticeDispatchService extends 
AbstractScheduledService {
 }
 
 /**
+ *  Gets the time that the alert was received
+ * @return
+   */
+public long getAlertTimestamp() {
+  return m_history.getAlertTimestamp();
+}
+
+/**
  * Gets the state of the alert.
  *
  * @return

http://git-wip-us.apache.org/repos/asf/ambari/blob/cba018eb/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
index 9e0e406..78f8ba0 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
@@ -237,6 +237,8 @@ public class AlertScriptDispatcherTest {
 final String ALERT_SERVICE_NAME = "FOO_SERVICE";
 final String ALERT_TEXT = "Did you know, \"Quotes are hard!!!\"";
 final String ALERT_TEXT_ESCAPED = "Did you know, \\\"Quotes are 
hard\\!\\!\\!\\\"";
+final String ALERT_HOST = "mock_host";
+final long ALERT_TIMESTAMP = 111l;

ambari git commit: AMBARI-21335. Cannot start ambari server (Vitaly Brodetskyi via smohanty)

2017-06-23 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 34e790099 -> 3acf9082c


AMBARI-21335. Cannot start ambari server (Vitaly Brodetskyi via smohanty)


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

Branch: refs/heads/trunk
Commit: 3acf9082c4dccc06e5131496f36213e8728e2260
Parents: 34e7900
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Jun 23 18:34:55 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Jun 23 18:34:55 2017 -0700

--
 ambari-server/src/main/assemblies/server.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3acf9082/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml 
b/ambari-server/src/main/assemblies/server.xml
index 53e65fd..c26a769 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -426,6 +426,10 @@
   /usr/lib/ambari-server
   false
   runtime
+  
+org.slf4j:slf4j-jdk14
+org.slf4j:slf4j-nop
+

ambari git commit: AMBARI-21277. Fail to create solr clients in Log Search / Log Feeder with openjdk8 (Oliver Szabo via smohanty)

2017-06-19 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a2d3eb109 -> 9f5bce56d


AMBARI-21277. Fail to create solr clients in Log Search / Log Feeder with 
openjdk8 (Oliver Szabo via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 9f5bce56d27bf0457a965c17197f4fd3ad1ee7bc
Parents: a2d3eb1
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Jun 19 17:10:59 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Jun 19 17:10:59 2017 -0700

--
 ambari-logsearch/ambari-logsearch-logfeeder/pom.xml| 6 ++
 ambari-logsearch/ambari-logsearch-portal/pom.xml   | 4 
 .../apache/ambari/logsearch/common/ExternalServerClient.java   | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5bce56/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml 
b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
index 49122e8..1ad59b3 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
@@ -143,6 +143,12 @@
 org.apache.hadoop
 hadoop-common
 ${hadoop.version}
+ 
+   
+ commons-httpclient
+ commons-httpclient
+   
+ 
   
   
 org.apache.hadoop

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5bce56/ambari-logsearch/ambari-logsearch-portal/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-portal/pom.xml 
b/ambari-logsearch/ambari-logsearch-portal/pom.xml
index a439266..ec0bd43 100755
--- a/ambari-logsearch/ambari-logsearch-portal/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-portal/pom.xml
@@ -628,6 +628,10 @@
   com.sun.jersey
   jersey-server
 
+
+  commons-httpclient
+  commons-httpclient
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5bce56/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index df00c15..99844f5 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
@@ -20,13 +20,13 @@ package org.apache.ambari.logsearch.common;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.security.auth.login.CredentialException;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
 
 import org.apache.ambari.logsearch.conf.AuthPropsConfig;
 import org.apache.ambari.logsearch.util.SSLUtil;
-import org.apache.commons.httpclient.auth.InvalidCredentialsException;
 import org.apache.log4j.Logger;
 import org.glassfish.jersey.client.JerseyClient;
 import org.glassfish.jersey.client.JerseyClientBuilder;
@@ -70,7 +70,7 @@ public class ExternalServerClient {
   Response response = invocationBuilder.get();
   if (response.getStatus() != Response.Status.OK.getStatusCode()
 && response.getStatus() != Response.Status.FOUND.getStatusCode()) {
-throw new InvalidCredentialsException(String.format("External auth 
failed with status code: %d, response: %s",
+throw new CredentialException(String.format("External auth failed with 
status code: %d, response: %s",
   response.getStatus(), response.readEntity(String.class)));
   }
   return response.readEntity(klass);

ambari git commit: Revert "AMBARI-21277. Fail to create solr clients in Log Search / Log Feeder with openjdk8 (Oliver Szabo via smohanty)"

2017-06-19 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 7cf35b082 -> a2d3eb109


Revert "AMBARI-21277. Fail to create solr clients in Log Search / Log Feeder 
with openjdk8 (Oliver Szabo via smohanty)"

This reverts commit 7cf35b08245ddf560d1c8d35027f477bc6864872.


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

Branch: refs/heads/branch-2.5
Commit: a2d3eb1090af1ddf5bd99eac2e0546fc35d560c7
Parents: 7cf35b0
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Jun 19 17:10:23 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Jun 19 17:10:23 2017 -0700

--
 .../ambari-logsearch-logfeeder/pom.xml  |   6 -
 .../ambari-logsearch-logfeeder/pom.xml.orig | 265 ---
 .../ambari-logsearch-logfeeder/pom.xml.rej  |  21 --
 .../ambari-logsearch-portal/pom.xml |   4 -
 .../logsearch/common/ExternalServerClient.java  |   4 +-
 5 files changed, 2 insertions(+), 298 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a2d3eb10/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml 
b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
index 1ad59b3..49122e8 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
@@ -143,12 +143,6 @@
 org.apache.hadoop
 hadoop-common
 ${hadoop.version}
- 
-   
- commons-httpclient
- commons-httpclient
-   
- 
   
   
 org.apache.hadoop

http://git-wip-us.apache.org/repos/asf/ambari/blob/a2d3eb10/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml.orig
--
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml.orig 
b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml.orig
deleted file mode 100644
index ce784cb..000
--- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml.orig
+++ /dev/null
@@ -1,265 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-
-  
-ambari-logsearch
-org.apache.ambari
-2.0.0.0-SNAPSHOT
-  
-  4.0.0
-
-  ambari-logsearch-logfeeder
-  jar
-  Ambari Logsearch Log Feeder
-  http://maven.apache.org
-
-
-  
-UTF-8
-  
-
-  
-
-  org.apache.ambari
-  ambari-logsearch-appender
-  ${project.version}
-
-
-  org.apache.ambari
-  ambari-logsearch-config-zookeeper
-  ${project.version}
-
-
-  commons-codec
-  commons-codec
-
-
-  junit
-  junit
-  test
-
-
-  org.easymock
-  easymock
-  3.4
-  test
-
-
-  log4j
-  log4j
-  1.2.17
-
-
-  io.thekraken
-  grok
-  0.1.4
-
-
-  org.apache.solr
-  solr-solrj
-  ${solr.version}
-
-
-  org.codehaus.jackson
-  jackson-core-asl
-  1.9.13
-
-
-  org.codehaus.jackson
-  jackson-mapper-asl
-  1.9.13
-
-
-  commons-logging
-  commons-logging
-  1.1.1
-
-
-  com.google.guava
-  guava
-  18.0
-
-
-  org.slf4j
-  slf4j-api
-  1.7.20
-
-
-  org.slf4j
-  slf4j-log4j12
-  1.7.20
-
-
-  org.apache.commons
-  commons-csv
-  1.2
-
-
-  org.apache.kafka
-  kafka-clients
-  0.9.0.0
-
-
-  org.codehaus.jackson
-  jackson-xc
-  1.9.13
-
-
-  org.apache.ambari
-  ambari-metrics-common
-  ${project.version}
-
-
-  com.amazonaws
-  aws-java-sdk-s3
-  1.11.5
-
-
-  org.apache.commons
-  commons-compress
-  1.11
-
-
-  com.amazonaws
-  aws-java-sdk-iam
-  1.11.5
-
-
-  org.apache.hadoop
-  hadoop-common
-  ${hadoop.version}
-  
-
-  org.apache.curator
-  curator-framework
-
-
-  org.apache.curator
-  curator-client
-
-
-  org.apache.curator
-  curator-recipes
-
-  
-
-
-  org.apache.hadoop
-  hadoop-hdfs
-  ${hadoop.version}
-
-
-  commons-io
-  commons-io
-  ${common.io.version}
-
-  
-  
-LogFeeder
-
-  
-
-  maven-compiler-plugin
-  3.0
-
-
-

ambari git commit: AMBARI-21277. Fail to create solr clients in Log Search / Log Feeder with openjdk8 (Oliver Szabo via smohanty)

2017-06-19 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 09944fa58 -> 7cf35b082


AMBARI-21277. Fail to create solr clients in Log Search / Log Feeder with 
openjdk8 (Oliver Szabo via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 7cf35b08245ddf560d1c8d35027f477bc6864872
Parents: 09944fa
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Jun 19 16:21:46 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Jun 19 16:21:46 2017 -0700

--
 .../ambari-logsearch-logfeeder/pom.xml  |   6 +
 .../ambari-logsearch-logfeeder/pom.xml.orig | 265 +++
 .../ambari-logsearch-logfeeder/pom.xml.rej  |  21 ++
 .../ambari-logsearch-portal/pom.xml |   4 +
 .../logsearch/common/ExternalServerClient.java  |   4 +-
 5 files changed, 298 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7cf35b08/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml 
b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
index 49122e8..1ad59b3 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml
@@ -143,6 +143,12 @@
 org.apache.hadoop
 hadoop-common
 ${hadoop.version}
+ 
+   
+ commons-httpclient
+ commons-httpclient
+   
+ 
   
   
 org.apache.hadoop

http://git-wip-us.apache.org/repos/asf/ambari/blob/7cf35b08/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml.orig
--
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml.orig 
b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml.orig
new file mode 100644
index 000..ce784cb
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml.orig
@@ -0,0 +1,265 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+  
+ambari-logsearch
+org.apache.ambari
+2.0.0.0-SNAPSHOT
+  
+  4.0.0
+
+  ambari-logsearch-logfeeder
+  jar
+  Ambari Logsearch Log Feeder
+  http://maven.apache.org
+
+
+  
+UTF-8
+  
+
+  
+
+  org.apache.ambari
+  ambari-logsearch-appender
+  ${project.version}
+
+
+  org.apache.ambari
+  ambari-logsearch-config-zookeeper
+  ${project.version}
+
+
+  commons-codec
+  commons-codec
+
+
+  junit
+  junit
+  test
+
+
+  org.easymock
+  easymock
+  3.4
+  test
+
+
+  log4j
+  log4j
+  1.2.17
+
+
+  io.thekraken
+  grok
+  0.1.4
+
+
+  org.apache.solr
+  solr-solrj
+  ${solr.version}
+
+
+  org.codehaus.jackson
+  jackson-core-asl
+  1.9.13
+
+
+  org.codehaus.jackson
+  jackson-mapper-asl
+  1.9.13
+
+
+  commons-logging
+  commons-logging
+  1.1.1
+
+
+  com.google.guava
+  guava
+  18.0
+
+
+  org.slf4j
+  slf4j-api
+  1.7.20
+
+
+  org.slf4j
+  slf4j-log4j12
+  1.7.20
+
+
+  org.apache.commons
+  commons-csv
+  1.2
+
+
+  org.apache.kafka
+  kafka-clients
+  0.9.0.0
+
+
+  org.codehaus.jackson
+  jackson-xc
+  1.9.13
+
+
+  org.apache.ambari
+  ambari-metrics-common
+  ${project.version}
+
+
+  com.amazonaws
+  aws-java-sdk-s3
+  1.11.5
+
+
+  org.apache.commons
+  commons-compress
+  1.11
+
+
+  com.amazonaws
+  aws-java-sdk-iam
+  1.11.5
+
+
+  org.apache.hadoop
+  hadoop-common
+  ${hadoop.version}
+  
+
+  org.apache.curator
+  curator-framework
+
+
+  org.apache.curator
+  curator-client
+
+
+  org.apache.curator
+  curator-recipes
+
+  
+
+
+  org.apache.hadoop
+  hadoop-hdfs
+  ${hadoop.version}
+
+
+  commons-io
+  commons-io
+  ${common.io.version}
+
+  
+  
+LogFeeder
+
+  
+
+  maven-compiler-plugin
+  3.0
+
+
+  maven-dependency-plugin
+  2.8
+
+  
+
+
+
+  
+

ambari git commit: AMBARI-21226. Add two new Spark thrift server related configurations in Spark stack (Saisai Shao via smohanty)

2017-06-13 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 558d9e3da -> 2461ddbcd


AMBARI-21226. Add two new Spark thrift server related configurations in Spark 
stack (Saisai Shao via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 2461ddbcd1c4fa00b628395b60625648a9074cd9
Parents: 558d9e3
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Jun 13 19:57:06 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue Jun 13 19:57:48 2017 -0700

--
 .../configuration/spark-thrift-sparkconf.xml| 40 
 .../configuration/spark2-thrift-sparkconf.xml   | 40 
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  | 24 
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 26 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 32 ++--
 5 files changed, 142 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2461ddbc/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
new file mode 100644
index 000..001ef1e
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -0,0 +1,40 @@
+
+
+
+  
+spark.yarn.executor.failuresValidityInterval
+2h
+
+  Defines the validity interval for executor failure tracking.
+  Executor failures which are older than the validity interval will be 
ignored.
+
+
+  
+  
+spark.yarn.maxAppAttempts
+1
+
+  The maximum number of attempts that will be made to submit the 
application.
+  It should be no larger than the global number of max attempts in the 
YARN configuration.
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/2461ddbc/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
new file mode 100644
index 000..001ef1e
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
@@ -0,0 +1,40 @@
+
+
+
+  
+spark.yarn.executor.failuresValidityInterval
+2h
+
+  Defines the validity interval for executor failure tracking.
+  Executor failures which are older than the validity interval will be 
ignored.
+
+
+  
+  
+spark.yarn.maxAppAttempts
+1
+
+  The maximum number of attempts that will be made to submit the 
application.
+  It should be no larger than the global number of max attempts in the 
YARN configuration.
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/2461ddbc/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 1610bb5..564dead 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -168,5 +168,29 @@
   
 
 
+
+  
+
+  
+spark-thrift-sparkconf
+
+
+  
+
+  
+
+
+
+  
+
+  
+spark2-thrift-sparkconf
+
+
+  
+
+  
+
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2461ddbc/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 1cdd184..6b827c9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-

ambari git commit: AMBARI-21226. Add two new Spark thrift server related configurations in Spark stack (Saisai Shao via smohanty)

2017-06-13 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk df685b92d -> 24e2cacb8


AMBARI-21226. Add two new Spark thrift server related configurations in Spark 
stack (Saisai Shao via smohanty)


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

Branch: refs/heads/trunk
Commit: 24e2cacb8ede081824b9162ba124acdffa33e0ec
Parents: df685b9
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Jun 13 19:57:06 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue Jun 13 19:57:12 2017 -0700

--
 .../configuration/spark-thrift-sparkconf.xml| 40 
 .../configuration/spark2-thrift-sparkconf.xml   | 40 
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  | 24 
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 26 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 32 ++--
 5 files changed, 142 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/24e2cacb/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
new file mode 100644
index 000..001ef1e
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -0,0 +1,40 @@
+
+
+
+  
+spark.yarn.executor.failuresValidityInterval
+2h
+
+  Defines the validity interval for executor failure tracking.
+  Executor failures which are older than the validity interval will be 
ignored.
+
+
+  
+  
+spark.yarn.maxAppAttempts
+1
+
+  The maximum number of attempts that will be made to submit the 
application.
+  It should be no larger than the global number of max attempts in the 
YARN configuration.
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/24e2cacb/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
new file mode 100644
index 000..001ef1e
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
@@ -0,0 +1,40 @@
+
+
+
+  
+spark.yarn.executor.failuresValidityInterval
+2h
+
+  Defines the validity interval for executor failure tracking.
+  Executor failures which are older than the validity interval will be 
ignored.
+
+
+  
+  
+spark.yarn.maxAppAttempts
+1
+
+  The maximum number of attempts that will be made to submit the 
application.
+  It should be no larger than the global number of max attempts in the 
YARN configuration.
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/24e2cacb/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 1610bb5..564dead 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -168,5 +168,29 @@
   
 
 
+
+  
+
+  
+spark-thrift-sparkconf
+
+
+  
+
+  
+
+
+
+  
+
+  
+spark2-thrift-sparkconf
+
+
+  
+
+  
+
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/24e2cacb/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 1cdd184..6b827c9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade

ambari git commit: AMBARI-20686. Allow compilation with maven >=2.2 (Arnaud Launay via via smohanty)

2017-06-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 5bf613fa7 -> 8e467702b


AMBARI-20686. Allow compilation with maven >=2.2 (Arnaud Launay via via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 8e467702b2c81b074a298994a71f1b275f4f1cc2
Parents: 5bf613f
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Sun Jun 11 08:12:08 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Sun Jun 11 08:12:08 2017 -0700

--
 .../odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e467702/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
--
diff --git 
a/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
 
b/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
index 5dd3db4..f7bd433 100644
--- 
a/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
+++ 
b/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
@@ -17,7 +17,7 @@
   limitations under the License.
 -->
 
-  
+  odpi-ambari-mpack
   
 dir
 tar.gz

ambari git commit: AMBARI-20686. Allow compilation with maven >=2.2 (Arnaud Launay via via smohanty)

2017-06-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 62f4432cc -> 13798c27a


AMBARI-20686. Allow compilation with maven >=2.2 (Arnaud Launay via via 
smohanty)


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

Branch: refs/heads/trunk
Commit: 13798c27a4787886816aaac1a688cdb208d864b4
Parents: 62f4432
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Sun Jun 11 08:12:08 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Sun Jun 11 08:12:56 2017 -0700

--
 .../odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/13798c27/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
--
diff --git 
a/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
 
b/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
index 5dd3db4..f7bd433 100644
--- 
a/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
+++ 
b/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml
@@ -17,7 +17,7 @@
   limitations under the License.
 -->
 
-  
+  odpi-ambari-mpack
   
 dir
 tar.gz

ambari git commit: AMBARI-21017. Misc tab at Customize Services Page has 2 Livy User tags and no helper popup to identify if its Livy/Livy2 (Bikas Saha via smohanty)

2017-06-07 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c22fae548 -> 4e97069ee


AMBARI-21017. Misc tab at Customize Services Page has 2 Livy User tags and no 
helper popup to identify if its Livy/Livy2 (Bikas Saha via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 4e97069eec3c68b29912145d7b5a8c370bfa3661
Parents: c22fae5
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Jun 7 12:50:18 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Jun 7 12:54:19 2017 -0700

--
 .../stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4e97069e/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
index 751d005..201aac9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
@@ -22,7 +22,7 @@
 
 
 livy2_user
-Livy User
+Livy2 User
 livy
 USER
 
@@ -33,7 +33,7 @@
 
 
 livy2_group
-Livy Group
+Livy2 Group
 livy
 GROUP
 livy group

ambari git commit: AMBARI-21017. Misc tab at Customize Services Page has 2 Livy User tags and no helper popup to identify if its Livy/Livy2 (Bikas Saha via smohanty)

2017-06-07 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk b772b4d62 -> e801b4199


AMBARI-21017. Misc tab at Customize Services Page has 2 Livy User tags and no 
helper popup to identify if its Livy/Livy2 (Bikas Saha via smohanty)


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

Branch: refs/heads/trunk
Commit: e801b4199dd8a38ea50dd5b172fa85f49ee56966
Parents: b772b4d
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Jun 7 12:50:18 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Jun 7 12:50:27 2017 -0700

--
 .../stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e801b419/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
index 751d005..201aac9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-env.xml
@@ -22,7 +22,7 @@
 
 
 livy2_user
-Livy User
+Livy2 User
 livy
 USER
 
@@ -33,7 +33,7 @@
 
 
 livy2_group
-Livy Group
+Livy2 Group
 livy
 GROUP
 livy group

ambari git commit: AMBARI-21138. Incorrect setting of java path for druid service (slim bouguerra via smohanty)

2017-06-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 bbf116cc6 -> 07af73463


AMBARI-21138. Incorrect setting of java path for druid service (slim bouguerra 
via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 07af7346330326331e62e1b66600d4394eaf138b
Parents: bbf116c
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Jun 5 15:57:09 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Jun 5 15:57:49 2017 -0700

--
 .../common-services/DRUID/0.9.2/configuration/druid-env.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/07af7346/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
index 539ef0c..23b82e3 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
@@ -226,7 +226,7 @@
 
   # The java implementation to use.
   export JAVA_HOME={{java8_home}}
-  export PATH=$PATH:$JAVA_HOME/bin
+  export PATH=$JAVA_HOME/bin:$PATH
   export DRUID_PID_DIR={{druid_pid_dir}}
   export DRUID_LOG_DIR={{druid_log_dir}}
   export DRUID_CONF_DIR={{druid_conf_dir}}

ambari git commit: AMBARI-21138. Incorrect setting of java path for druid service (slim bouguerra via smohanty)

2017-06-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk b916e3722 -> 499814af7


AMBARI-21138. Incorrect setting of java path for druid service (slim bouguerra 
via smohanty)


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

Branch: refs/heads/trunk
Commit: 499814af75d3adfa7c5afcd1564ed79e16cb30a0
Parents: b916e37
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Jun 5 15:57:09 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Jun 5 15:57:09 2017 -0700

--
 .../common-services/DRUID/0.9.2/configuration/druid-env.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/499814af/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
index 539ef0c..23b82e3 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml
@@ -226,7 +226,7 @@
 
   # The java implementation to use.
   export JAVA_HOME={{java8_home}}
-  export PATH=$PATH:$JAVA_HOME/bin
+  export PATH=$JAVA_HOME/bin:$PATH
   export DRUID_PID_DIR={{druid_pid_dir}}
   export DRUID_LOG_DIR={{druid_log_dir}}
   export DRUID_CONF_DIR={{druid_conf_dir}}

ambari git commit: AMBARI-21151. Hiveserver2 authentication mode NOSASL not available in drop down list but appearing in tooltip description (smohanty)

2017-06-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 601a7cdcf -> b916e3722


AMBARI-21151. Hiveserver2 authentication mode NOSASL not available in drop down 
list but appearing in tooltip description (smohanty)


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

Branch: refs/heads/trunk
Commit: b916e372227f0859edcc51340f902886aaad0fd0
Parents: 601a7cd
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Jun 5 14:51:05 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Jun 5 14:56:35 2017 -0700

--
 .../common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml| 2 +-
 .../stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b916e372/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index e48d069..ab5c279 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -221,7 +221,7 @@ limitations under the License.
   
   
 hive.server2.authentication
-Authentication mode, default NONE. Options are NONE, NOSASL, 
KERBEROS, LDAP, PAM and CUSTOM
+Authentication mode, default NONE. Options are NONE, 
KERBEROS, LDAP, PAM and CUSTOM
 NONE
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/b916e372/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index 39ba8874..2073832 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -1173,7 +1173,7 @@ limitations under the License.
   
   
 hive.server2.authentication
-Authentication mode, default NONE. Options are NONE, NOSASL, 
KERBEROS, LDAP, PAM and CUSTOM
+Authentication mode, default NONE. Options are NONE, 
KERBEROS, LDAP, PAM and CUSTOM
 NONE
 HiveServer2 Authentication

ambari git commit: AMBARI-21151. Hiveserver2 authentication mode NOSASL not available in drop down list but appearing in tooltip description (smohanty)

2017-06-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 94055d25d -> bbf116cc6


AMBARI-21151. Hiveserver2 authentication mode NOSASL not available in drop down 
list but appearing in tooltip description (smohanty)


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

Branch: refs/heads/branch-2.5
Commit: bbf116cc6cfc2be23c326ff4545f9bde4651378e
Parents: 94055d2
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Jun 5 14:51:05 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Jun 5 14:51:05 2017 -0700

--
 .../common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml| 2 +-
 .../stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bbf116cc/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index 3d08867..e3fa6fd 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -217,7 +217,7 @@ limitations under the License.
   
   
 hive.server2.authentication
-Authentication mode, default NONE. Options are NONE, NOSASL, 
KERBEROS, LDAP, PAM and CUSTOM
+Authentication mode, default NONE. Options are NONE, 
KERBEROS, LDAP, PAM and CUSTOM
 NONE
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/bbf116cc/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index 856941f..d8cf961 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -1169,7 +1169,7 @@ limitations under the License.
   
   
 hive.server2.authentication
-Authentication mode, default NONE. Options are NONE, NOSASL, 
KERBEROS, LDAP, PAM and CUSTOM
+Authentication mode, default NONE. Options are NONE, 
KERBEROS, LDAP, PAM and CUSTOM
 NONE
 HiveServer2 Authentication

ambari git commit: AMBARI-21065. Update some YARN settings for HDP 2.6 stack (Siddharth Seth via smohanty)

2017-05-18 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 71ed28140 -> f7a1d4e7e


AMBARI-21065. Update some YARN settings for HDP 2.6 stack (Siddharth Seth via 
smohanty)


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

Branch: refs/heads/trunk
Commit: f7a1d4e7e7445eb49cfefabaf92ec518fc44d8ba
Parents: 71ed281
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu May 18 21:46:15 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu May 18 22:32:31 2017 -0700

--
 .../HDP/2.6/services/YARN/configuration/yarn-site.xml | 10 ++
 .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml  |  5 +
 .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml|  7 +++
 .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  1 +
 4 files changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f7a1d4e7/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
index 6aa0bae..754a2c2 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
@@ -110,4 +110,14 @@
 
 
   
+  
+yarn.nodemanager.kill-escape.launch-command-line
+slider-agent,LLAP
+
+  
+  
+yarn.nodemanager.kill-escape.user
+hive
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f7a1d4e7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 628c119..a8ac1bc 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -123,6 +123,11 @@
 yarn-site
 
   
+  
+yarn-site
+
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f7a1d4e7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index f844f98..ae7ffc5 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -334,6 +334,13 @@
 
   
 
+  
+  
+
+  Updating YARN NodeManager config for LLAP
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f7a1d4e7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
index ceb5b84..c2ae825 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
@@ -697,6 +697,7 @@
   
 
   
+

ambari git commit: AMBARI-21065. Update some YARN settings for HDP 2.6 stack (Siddharth Seth via smohanty)

2017-05-18 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 baaae7622 -> 7bbb9b23e


AMBARI-21065. Update some YARN settings for HDP 2.6 stack (Siddharth Seth via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 7bbb9b23ecd7f9d0a8835f29c0374a899f8b5dd0
Parents: baaae76
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu May 18 21:46:15 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu May 18 21:46:15 2017 -0700

--
 .../HDP/2.6/services/YARN/configuration/yarn-site.xml | 10 ++
 .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml  |  5 +
 .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml|  7 +++
 .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  1 +
 4 files changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7bbb9b23/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
index 6aa0bae..754a2c2 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
@@ -110,4 +110,14 @@
 
 
   
+  
+yarn.nodemanager.kill-escape.launch-command-line
+slider-agent,LLAP
+
+  
+  
+yarn.nodemanager.kill-escape.user
+hive
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7bbb9b23/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 628c119..a8ac1bc 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -123,6 +123,11 @@
 yarn-site
 
   
+  
+yarn-site
+
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7bbb9b23/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index f844f98..ae7ffc5 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -334,6 +334,13 @@
 
   
 
+  
+  
+
+  Updating YARN NodeManager config for LLAP
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7bbb9b23/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
index ceb5b84..c2ae825 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
@@ -697,6 +697,7 @@
   
 
   
+

ambari git commit: AMBARI-21012. Fix Livy service check and alerts script with SSL enabled (Saisai Shao via smohanty)

2017-05-16 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 7f745d5fe -> b6bc82b77


AMBARI-21012. Fix Livy service check and alerts script with SSL enabled (Saisai 
Shao via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: b6bc82b77766c2351cbaeec7760d44f006de2d7e
Parents: 7f745d5
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue May 16 19:20:24 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue May 16 19:23:33 2017 -0700

--
 .../1.2.1/package/scripts/alerts/alert_spark_livy_port.py  | 6 --
 .../common-services/SPARK/1.2.1/package/scripts/params.py  | 1 +
 .../SPARK/1.2.1/package/scripts/service_check.py   | 2 +-
 .../2.0.0/package/scripts/alerts/alert_spark2_livy_port.py | 6 --
 .../common-services/SPARK2/2.0.0/package/scripts/params.py | 1 +
 .../SPARK2/2.0.0/package/scripts/service_check.py  | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b6bc82b7/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
index f15e747..f3a63b2 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
@@ -46,6 +46,7 @@ SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
 SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}'
 SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}'
 SMOKEUSER_KEY = '{{cluster-env/smokeuser}}'
+LIVY_SSL_ENABLED_KEY = '{{livy-conf/livy.keystore}}'
 
 # The configured Kerberos executable search paths, if any
 KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = 
'{{kerberos-env/executable_search_paths}}'
@@ -57,7 +58,7 @@ def get_tokens():
 Returns a tuple of tokens in the format {{site/property}} that will be used
 to build the dictionary passed into execute
 """
-return 
(LIVY_SERVER_PORT_KEY,LIVYUSER_DEFAULT,SECURITY_ENABLED_KEY,SMOKEUSER_KEYTAB_KEY,SMOKEUSER_PRINCIPAL_KEY,SMOKEUSER_KEY)
+return 
(LIVY_SERVER_PORT_KEY,LIVYUSER_DEFAULT,SECURITY_ENABLED_KEY,SMOKEUSER_KEYTAB_KEY,SMOKEUSER_PRINCIPAL_KEY,SMOKEUSER_KEY,LIVY_SSL_ENABLED_KEY)
 
 @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
 def execute(configurations={}, parameters={}, host_name=None):
@@ -118,13 +119,14 @@ def execute(configurations={}, parameters={}, 
host_name=None):
 finally:
 kinit_lock.release()
 
+http_scheme = 'https' if LIVY_SSL_ENABLED_KEY in configurations else 'http'
 result_code = None
 try:
 start_time = time.time()
 try:
 livy_livyserver_host = str(host_name)
 
-livy_cmd = format("curl -s -o /dev/null -w'%{{http_code}}' 
--negotiate -u: -k http://{livy_livyserver_host}:{port}/sessions | grep 200 ")
+livy_cmd = format("curl -s -o /dev/null -w'%{{http_code}}' 
--negotiate -u: -k {http_scheme}://{livy_livyserver_host}:{port}/sessions | 
grep 200 ")
 
 Execute(livy_cmd,
 tries=3,

http://git-wip-us.apache.org/repos/asf/ambari/blob/b6bc82b7/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
index fd473ad..b54b565 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
@@ -243,6 +243,7 @@ if stack_version_formatted and 
check_stack_feature(StackFeature.SPARK_LIVY, stac
 livy_kerberos_principal = 
config['configurations']['livy-conf']['livy.server.launch.kerberos.principal']
 
   livy_livyserver_hosts = default("/clusterHostInfo/livy_server_hosts", [])
+  livy_http_scheme = 'https' if 'livy.keystore' in 
config['configurations']['livy-conf'] else 'http'
 
   # ats 1.5 properties
   entity_groupfs_active

ambari git commit: AMBARI-21012. Fix Livy service check and alerts script with SSL enabled (Saisai Shao via smohanty)

2017-05-16 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 704eb5254 -> 350dace64


AMBARI-21012. Fix Livy service check and alerts script with SSL enabled (Saisai 
Shao via smohanty)


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

Branch: refs/heads/trunk
Commit: 350dace643e3edad2407c80f38edad5847b47706
Parents: 704eb52
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue May 16 19:20:24 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue May 16 19:20:24 2017 -0700

--
 .../1.2.1/package/scripts/alerts/alert_spark_livy_port.py  | 6 --
 .../common-services/SPARK/1.2.1/package/scripts/params.py  | 1 +
 .../SPARK/1.2.1/package/scripts/service_check.py   | 2 +-
 .../2.0.0/package/scripts/alerts/alert_spark2_livy_port.py | 6 --
 .../common-services/SPARK2/2.0.0/package/scripts/params.py | 1 +
 .../SPARK2/2.0.0/package/scripts/service_check.py  | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/350dace6/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
index f15e747..f3a63b2 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
@@ -46,6 +46,7 @@ SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
 SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}'
 SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}'
 SMOKEUSER_KEY = '{{cluster-env/smokeuser}}'
+LIVY_SSL_ENABLED_KEY = '{{livy-conf/livy.keystore}}'
 
 # The configured Kerberos executable search paths, if any
 KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = 
'{{kerberos-env/executable_search_paths}}'
@@ -57,7 +58,7 @@ def get_tokens():
 Returns a tuple of tokens in the format {{site/property}} that will be used
 to build the dictionary passed into execute
 """
-return 
(LIVY_SERVER_PORT_KEY,LIVYUSER_DEFAULT,SECURITY_ENABLED_KEY,SMOKEUSER_KEYTAB_KEY,SMOKEUSER_PRINCIPAL_KEY,SMOKEUSER_KEY)
+return 
(LIVY_SERVER_PORT_KEY,LIVYUSER_DEFAULT,SECURITY_ENABLED_KEY,SMOKEUSER_KEYTAB_KEY,SMOKEUSER_PRINCIPAL_KEY,SMOKEUSER_KEY,LIVY_SSL_ENABLED_KEY)
 
 @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
 def execute(configurations={}, parameters={}, host_name=None):
@@ -118,13 +119,14 @@ def execute(configurations={}, parameters={}, 
host_name=None):
 finally:
 kinit_lock.release()
 
+http_scheme = 'https' if LIVY_SSL_ENABLED_KEY in configurations else 'http'
 result_code = None
 try:
 start_time = time.time()
 try:
 livy_livyserver_host = str(host_name)
 
-livy_cmd = format("curl -s -o /dev/null -w'%{{http_code}}' 
--negotiate -u: -k http://{livy_livyserver_host}:{port}/sessions | grep 200 ")
+livy_cmd = format("curl -s -o /dev/null -w'%{{http_code}}' 
--negotiate -u: -k {http_scheme}://{livy_livyserver_host}:{port}/sessions | 
grep 200 ")
 
 Execute(livy_cmd,
 tries=3,

http://git-wip-us.apache.org/repos/asf/ambari/blob/350dace6/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
index 42396bd..74fd76a 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
@@ -242,6 +242,7 @@ if stack_version_formatted and 
check_stack_feature(StackFeature.SPARK_LIVY, stac
 livy_kerberos_principal = 
config['configurations']['livy-conf']['livy.server.launch.kerberos.principal']
 
   livy_livyserver_hosts = default("/clusterHostInfo/livy_server_hosts", [])
+  livy_http_scheme = 'https' if 'livy.keystore' in 
config['configurations']['livy-conf'] else 'http'
 
   # ats 1.5 properties
   entity_groupfs_active_dir = 
config[

ambari git commit: AMBARI-21028. The credential cache for livy is messed up (Weiqing Yang via smohanty)

2017-05-16 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 9adffcf7a -> 704eb5254


AMBARI-21028. The credential cache for livy is messed up (Weiqing Yang via 
smohanty)


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

Branch: refs/heads/trunk
Commit: 704eb5254545bcdb8b7a9a60b2518124e7e4b265
Parents: 9adffcf
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue May 16 19:14:35 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue May 16 19:15:45 2017 -0700

--
 .../SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py| 2 +-
 .../SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/704eb525/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
index 746a98e..f15e747 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
@@ -82,7 +82,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 if host_name is None:
 host_name = socket.getfqdn()
 
-livyuser = LIVYUSER_DEFAULT
+livyuser = configurations[SMOKEUSER_KEY]
 
 security_enabled = False
 if SECURITY_ENABLED_KEY in configurations:

http://git-wip-us.apache.org/repos/asf/ambari/blob/704eb525/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
index 44c284f..d69f663 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
@@ -82,7 +82,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 if host_name is None:
 host_name = socket.getfqdn()
 
-livyuser = LIVYUSER_DEFAULT
+livyuser = configurations[SMOKEUSER_KEY]
 
 security_enabled = False
 if SECURITY_ENABLED_KEY in configurations:

ambari git commit: AMBARI-21028. The credential cache for livy is messed up (Weiqing Yang via smohanty)

2017-05-16 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 d1a7c7c07 -> 7f745d5fe


AMBARI-21028. The credential cache for livy is messed up (Weiqing Yang via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 7f745d5fe870cfd0c9eb7cc9dee0bbcb5c570133
Parents: d1a7c7c
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue May 16 19:14:35 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue May 16 19:14:35 2017 -0700

--
 .../SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py| 2 +-
 .../SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f745d5f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
index 746a98e..f15e747 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py
@@ -82,7 +82,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 if host_name is None:
 host_name = socket.getfqdn()
 
-livyuser = LIVYUSER_DEFAULT
+livyuser = configurations[SMOKEUSER_KEY]
 
 security_enabled = False
 if SECURITY_ENABLED_KEY in configurations:

http://git-wip-us.apache.org/repos/asf/ambari/blob/7f745d5f/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
index 44c284f..d69f663 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py
@@ -82,7 +82,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 if host_name is None:
 host_name = socket.getfqdn()
 
-livyuser = LIVYUSER_DEFAULT
+livyuser = configurations[SMOKEUSER_KEY]
 
 security_enabled = False
 if SECURITY_ENABLED_KEY in configurations:

ambari git commit: AMBARI-21015. Add RegistryClient Jaas section to storm_jaas.conf (Sriharsha Chintalapani via smohanty)

2017-05-13 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 822d54577 -> d83f733b0


AMBARI-21015. Add RegistryClient Jaas section to storm_jaas.conf (Sriharsha 
Chintalapani via smohanty)


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

Branch: refs/heads/trunk
Commit: d83f733b054e9f2ed898093012af856835d6ae1a
Parents: 822d545
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Sat May 13 00:16:07 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Sat May 13 00:17:00 2017 -0700

--
 .../STORM/0.9.1/package/templates/storm_jaas.conf.j2 | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d83f733b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
index 8116492..c22cb51 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
@@ -33,6 +33,14 @@ StormClient {
serviceName="{{nimbus_bare_jaas_principal}}"
principal="{{storm_jaas_principal}}";
 };
+RegistryClient {
+   com.sun.security.auth.module.Krb5LoginModule required
+   useKeyTab=true
+   keyTab="{{storm_keytab_path}}"
+   storeKey=true
+   useTicketCache=false
+   principal="{{storm_jaas_principal}}";
+};
 {% endif %}
 Client {
com.sun.security.auth.module.Krb5LoginModule required

ambari git commit: AMBARI-21015. Add RegistryClient Jaas section to storm_jaas.conf (Sriharsha Chintalapani via smohanty)

2017-05-13 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 85f4c8152 -> d1f2bf4f7


AMBARI-21015. Add RegistryClient Jaas section to storm_jaas.conf (Sriharsha 
Chintalapani via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: d1f2bf4f717349c75e89a3a599a2656bac4f9fbb
Parents: 85f4c81
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Sat May 13 00:16:07 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Sat May 13 00:16:07 2017 -0700

--
 .../STORM/0.9.1/package/templates/storm_jaas.conf.j2 | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d1f2bf4f/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
index 8116492..c22cb51 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm_jaas.conf.j2
@@ -33,6 +33,14 @@ StormClient {
serviceName="{{nimbus_bare_jaas_principal}}"
principal="{{storm_jaas_principal}}";
 };
+RegistryClient {
+   com.sun.security.auth.module.Krb5LoginModule required
+   useKeyTab=true
+   keyTab="{{storm_keytab_path}}"
+   storeKey=true
+   useTicketCache=false
+   principal="{{storm_jaas_principal}}";
+};
 {% endif %}
 Client {
com.sun.security.auth.module.Krb5LoginModule required

ambari git commit: AMBARI-20999. More updates to llap configs for hdp stack (Siddharth Seth via smohanty)

2017-05-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk d0a5cd4a6 -> 822d54577


AMBARI-20999. More updates to llap configs for hdp stack (Siddharth Seth via 
smohanty)


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

Branch: refs/heads/trunk
Commit: 822d54577677384f5a31eef90e2a345378fbcaf4
Parents: d0a5cd4
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri May 12 22:15:53 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri May 12 22:30:38 2017 -0700

--
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  4 +++-
 .../HIVE/configuration/tez-interactive-site.xml | 12 
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/822d5457/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 9ac7042..61bd581 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -499,8 +499,10 @@
   
 tez-interactive-site
 
-
+
 
+
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/822d5457/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
index 09416e3..6752d65 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
@@ -114,5 +114,17 @@
 The heartbeat interval between the tez AM and YARN 
RM
 
   
+  
+tez.runtime.enable.final-merge.in.output
+false
+Whether to enable a map side merge of outputs
+
+  
+  
+tez.am.task.reschedule.higher.priority
+false
+Whether rescheduled tasks should be treated at higher 
priority
+
+

ambari git commit: AMBARI-20999. More updates to llap configs for hdp stack (Siddharth Seth via smohanty)

2017-05-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a8e1a0d63 -> e75fa1c58


AMBARI-20999. More updates to llap configs for hdp stack (Siddharth Seth via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: e75fa1c58ab4ea0f2bda7bd3efe1322d616e3da8
Parents: a8e1a0d
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri May 12 22:15:53 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri May 12 22:15:53 2017 -0700

--
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  4 +++-
 .../HIVE/configuration/tez-interactive-site.xml | 12 
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e75fa1c5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index aadf6eb..35f92a7 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -492,8 +492,10 @@
   
 tez-interactive-site
 
-
+
 
+
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/e75fa1c5/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
index 09416e3..6752d65 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
@@ -114,5 +114,17 @@
 The heartbeat interval between the tez AM and YARN 
RM
 
   
+  
+tez.runtime.enable.final-merge.in.output
+false
+Whether to enable a map side merge of outputs
+
+  
+  
+tez.am.task.reschedule.higher.priority
+false
+Whether rescheduled tasks should be treated at higher 
priority
+
+

ambari git commit: AMBARI-21014. Quick Links for Spark History Server component is missing (smohanty)

2017-05-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk fb20c7c52 -> ec6e94060


AMBARI-21014. Quick Links for Spark History Server component is missing 
(smohanty)


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

Branch: refs/heads/trunk
Commit: ec6e940602608666b90d51714f5040d6eb805216
Parents: fb20c7c
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri May 12 17:56:16 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri May 12 17:57:04 2017 -0700

--
 .../common-services/SPARK/1.2.1/quicklinks/quicklinks.json  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ec6e9406/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
index 685665a..5557c53 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
@@ -12,6 +12,7 @@
 "name": "spark_history_server_ui",
 "label": "Spark History Server UI",
 "requires_user_name": "false",
+"component_name": "SPARK_JOBHISTORYSERVER",
 "url": "%@://%@:%@",
 "port":{
   "http_property": "spark.history.ui.port",

ambari git commit: AMBARI-21014. Quick Links for Spark History Server component is missing (smohanty)

2017-05-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c4691de8e -> 4d968227e


AMBARI-21014. Quick Links for Spark History Server component is missing 
(smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 4d968227e6d1370b9ab0862c0c4ef7a5bbac5032
Parents: c4691de
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri May 12 17:56:16 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri May 12 17:56:16 2017 -0700

--
 .../common-services/SPARK/1.2.1/quicklinks/quicklinks.json  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d968227/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
index 685665a..5557c53 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/quicklinks/quicklinks.json
@@ -12,6 +12,7 @@
 "name": "spark_history_server_ui",
 "label": "Spark History Server UI",
 "requires_user_name": "false",
+"component_name": "SPARK_JOBHISTORYSERVER",
 "url": "%@://%@:%@",
 "port":{
   "http_property": "spark.history.ui.port",

ambari git commit: AMBARI-20999. More updates to llap configs for hdp stack (Siddharth via smohanty)

2017-05-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 023c819a3 -> f7e9af87c


AMBARI-20999. More updates to llap configs for hdp stack (Siddharth  via 
smohanty)


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

Branch: refs/heads/trunk
Commit: f7e9af87c75d8641a96b8b097b7b44f0a9f13538
Parents: 023c819
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu May 11 17:03:27 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu May 11 17:10:35 2017 -0700

--
 .../server/upgrade/UpgradeCatalog250.java   | 72 
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 15 
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 12 
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  2 +
 .../configuration/hive-interactive-site.xml | 11 ++-
 .../HIVE/configuration/tez-interactive-site.xml | 13 
 .../server/upgrade/UpgradeCatalog250Test.java   | 23 +--
 7 files changed, 52 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f7e9af87/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 058acb2..1740e25 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
@@ -200,7 +200,6 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 updateHadoopEnvConfigs();
 updateKafkaConfigs();
 updateHIVEInteractiveConfigs();
-updateHiveLlapConfigs();
 unInstallAllZeppelinViews();
 updateZeppelinConfigs();
 updateAtlasConfigs();
@@ -495,56 +494,6 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 }
   }
 
-  protected void updateHiveLlapConfigs() throws AmbariException {
-AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
-Clusters clusters = ambariManagementController.getClusters();
-
-if (clusters != null) {
-  Map<String, Cluster> clusterMap = clusters.getClusters();
-
-  if (clusterMap != null && !clusterMap.isEmpty()) {
-for (final Cluster cluster : clusterMap.values()) {
-  Set installedServices = cluster.getServices().keySet();
-
-  if (installedServices.contains("HIVE")) {
-Config hiveSite = 
cluster.getDesiredConfigByType(HIVE_INTERACTIVE_SITE);
-if (hiveSite != null) {
-  Map<String, String> hiveSiteProperties = 
hiveSite.getProperties();
-  String schedulerDelay = 
hiveSiteProperties.get("hive.llap.task.scheduler.locality.delay");
-  if (schedulerDelay != null) {
-// Property exists. Change to new default if set to -1.
-if (schedulerDelay.length() != 0) {
-  try {
-int schedulerDelayInt = Integer.parseInt(schedulerDelay);
-if (schedulerDelayInt == -1) {
-  // Old default. Set to new default.
-  updateConfigurationProperties(HIVE_INTERACTIVE_SITE, 
Collections
-
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
-false);
-}
-  } catch (NumberFormatException e) {
-// Invalid existing value. Set to new default.
-updateConfigurationProperties(HIVE_INTERACTIVE_SITE, 
Collections
-  
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
-  false);
-  }
-}
-  }
-  updateConfigurationProperties(HIVE_INTERACTIVE_SITE,
-
Collections.singletonMap("hive.mapjoin.hybridgrace.hashtable", "true"), true,
-false);
-  updateConfigurationProperties("tez-interactive-site",
-
Collections.singletonMap("tez.session.am.dag.submit.timeout.secs", "1209600"), 
true,
-

ambari git commit: AMBARI-20999. More updates to llap configs for hdp stack (Siddharth via smohanty)

2017-05-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 ef6c72da3 -> 7f2f40e33


AMBARI-20999. More updates to llap configs for hdp stack (Siddharth  via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 7f2f40e33dd66e49192efd46c6e7a11c31b3c643
Parents: ef6c72d
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu May 11 17:03:27 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu May 11 17:03:27 2017 -0700

--
 .../server/upgrade/UpgradeCatalog250.java   | 73 
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 15 
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 12 
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  2 +
 .../configuration/hive-interactive-site.xml | 11 ++-
 .../HIVE/configuration/tez-interactive-site.xml | 13 
 .../server/upgrade/UpgradeCatalog250Test.java   | 23 +-
 7 files changed, 52 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f2f40e3/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 c415a2b..53abe01 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
@@ -200,7 +200,6 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 updateHadoopEnvConfigs();
 updateKafkaConfigs();
 updateHIVEInteractiveConfigs();
-updateHiveLlapConfigs();
 unInstallAllZeppelinViews();
 updateZeppelinConfigs();
 updateAtlasConfigs();
@@ -762,57 +761,6 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 return content;
   }
 
-  protected void updateHiveLlapConfigs() throws AmbariException {
-AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
-Clusters clusters = ambariManagementController.getClusters();
-
-if (clusters != null) {
-  Map<String, Cluster> clusterMap = clusters.getClusters();
-
-  if (clusterMap != null && !clusterMap.isEmpty()) {
-for (final Cluster cluster : clusterMap.values()) {
-  Set installedServices = cluster.getServices().keySet();
-
-  if (installedServices.contains("HIVE")) {
-Config hiveSite = 
cluster.getDesiredConfigByType(HIVE_INTERACTIVE_SITE);
-if (hiveSite != null) {
-  Map<String, String> hiveSiteProperties = 
hiveSite.getProperties();
-  String schedulerDelay = 
hiveSiteProperties.get("hive.llap.task.scheduler.locality.delay");
-  if (schedulerDelay != null) {
-// Property exists. Change to new default if set to -1.
-if (schedulerDelay.length() != 0) {
-  try {
-int schedulerDelayInt = Integer.parseInt(schedulerDelay);
-if (schedulerDelayInt == -1) {
-  // Old default. Set to new default.
-  updateConfigurationProperties(HIVE_INTERACTIVE_SITE, 
Collections
-  
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
-  false);
-}
-  } catch (NumberFormatException e) {
-// Invalid existing value. Set to new default.
-updateConfigurationProperties(HIVE_INTERACTIVE_SITE, 
Collections
-
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
-false);
-  }
-}
-  }
-  updateConfigurationProperties(HIVE_INTERACTIVE_SITE,
-  
Collections.singletonMap("hive.mapjoin.hybridgrace.hashtable", "true"), true,
-  false);
-  updateConfigurationProperties("tez-interactive-site",
-  
Collections.singletonMap("tez.session.am.dag.submit.timeout.secs", "1209600"), 
true,
-  false);
-  // Explicitly skipping hive.llap.allow.permanent.fns during 
upgr

ambari git commit: AMBARI-20982. StackAdvisor error - Slider (Metastore Heap Size) has small range of value from 512 mb to 2048 mb [upgrade from 2.1.x to 2.4.3] (Dmytro Grinenko via smohanty)

2017-05-10 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 05e5cc8c2 -> 36fbb6163


AMBARI-20982. StackAdvisor error - Slider (Metastore Heap Size) has small range 
of value from 512 mb to 2048 mb [upgrade from 2.1.x to 2.4.3] (Dmytro Grinenko 
via smohanty)


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

Branch: refs/heads/branch-2.4
Commit: 36fbb6163e304a5532f300477fd9d60f2a1584c2
Parents: 05e5cc8
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed May 10 11:05:27 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed May 10 11:05:27 2017 -0700

--
 .../stacks/HDP/2.0.6/services/stack_advisor.py  | 11 -
 .../stacks/2.0.6/common/test_stack_advisor.py   | 52 
 2 files changed, 62 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/36fbb616/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 928fa92..4ac17af 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -359,7 +359,16 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 
 self.updateMountProperties("hdfs-site", hdfs_mount_properties, 
configurations, services, hosts)
 
-dataDirs = hdfsSiteProperties['dfs.datanode.data.dir'].split(",")
+dataDirs = ["/hadoop/hdfs/namenode"]
+
+if configurations and "hdfs-site" in configurations and \
+"dfs.datanode.data.dir" in configurations["hdfs-site"]["properties"] 
and \
+configurations["hdfs-site"]["properties"]["dfs.datanode.data.dir"] is 
not None:
+  dataDirs = 
configurations["hdfs-site"]["properties"]["dfs.datanode.data.dir"].split(",")
+
+elif hdfsSiteProperties and "dfs.datanode.data.dir" in hdfsSiteProperties 
and \
+hdfsSiteProperties["dfs.datanode.data.dir"] is not None:
+  dataDirs = hdfsSiteProperties["dfs.datanode.data.dir"].split(",")
 
 # dfs.datanode.du.reserved should be set to 10-15% of volume size
 # For each host selects maximum size of the volume. Then gets minimum for 
all hosts.

http://git-wip-us.apache.org/repos/asf/ambari/blob/36fbb616/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
index 927f0de..e7a1737 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
@@ -1502,6 +1502,58 @@ class TestHDP206StackAdvisor(TestCase):
 self.stackAdvisor.recommendHDFSConfigurations(configurations, clusterData, 
services3, hosts)
 self.assertEquals(configurations, expected)
 
+hosts = {
+  "items": [
+{
+  "href": "/api/v1/hosts/host1",
+  "Hosts": {
+"cpu_count": 1,
+"host_name": "c6401.ambari.apache.org",
+"os_arch": "x86_64",
+"os_type": "centos6",
+"ph_cpu_count": 1,
+"public_host_name": "public.c6401.ambari.apache.org",
+"rack_info": "/default-rack",
+"total_mem": 2097152,
+"disk_info": [{
+  "available" : "21039512",
+  "device" : "/dev/vda1",
+  "used" : "3316924",
+  "percent" : "14%",
+  "size" : "2516",
+  "type" : "ext4",
+  "mountpoint" : "/"
+},
+  {
+"available" : "244732200",
+"device" : "/dev/vdb",
+"used" : "60508",
+"percent" : "1%",
+

ambari git commit: AMBARI-20968.Pig and CapSched views are not loading (Akhil PB via smohanty)

2017-05-10 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 cfbaf17aa -> 05e5cc8c2


AMBARI-20968.Pig and CapSched views are not loading (Akhil PB via smohanty)


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

Branch: refs/heads/branch-2.4
Commit: 05e5cc8c2fee622b1b05dcd1670f45290f97455b
Parents: cfbaf17
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed May 10 10:48:37 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed May 10 10:48:37 2017 -0700

--
 .../src/main/resources/ui/app/app.js| 14 +-
 .../ui/app/utils/hive-explainer/renderer.js.rej | 17 +++
 .../app/utils/hive-explainer/transformer.js.rej | 50 
 .../src/main/resources/ui/pig-web/app/app.js| 14 +-
 4 files changed, 93 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/05e5cc8c/contrib/views/capacity-scheduler/src/main/resources/ui/app/app.js
--
diff --git a/contrib/views/capacity-scheduler/src/main/resources/ui/app/app.js 
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/app.js
index 4349538..a816528 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/app.js
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/app.js
@@ -31,4 +31,16 @@ Ember.Application.initializer({
   }
 });
 
-module.exports = Em.Application.create();
+module.exports = Em.Application.create({
+  Resolver: Ember.DefaultResolver.extend({
+resolveTemplate: function(parsedName) {
+  var resolvedTemplate = this._super(parsedName);
+  var templateName = 'templates/' + 
parsedName.fullNameWithoutType.replace(/\./g, '/');
+  if (resolvedTemplate) {
+return resolvedTemplate;
+  } else {
+return Ember.TEMPLATES[templateName];
+  }
+}
+  })
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/05e5cc8c/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js.rej
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js.rej
 
b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js.rej
new file mode 100644
index 000..df32348
--- /dev/null
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js.rej
@@ -0,0 +1,17 @@
+***
+*** 134,140 
+  
+  }
+  function isSingleReducerAvailable(data){
+-   let reducerCount = data.vertices.filter(function(item){
+  return item['_vertex'].indexOf("Reducer") === 0;
+});
+if(reducerCount && reducerCount.length === 1) {
+--- 134,140 
+  
+  }
+  function isSingleReducerAvailable(data){
++   let reducerCount = data.verticesData.filter(function(item){
+  return item['_vertex'].indexOf("Reducer") === 0;
+});
+if(reducerCount && reducerCount.length === 1) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/05e5cc8c/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js.rej
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js.rej
 
b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js.rej
new file mode 100644
index 000..e95bd0c
--- /dev/null
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js.rej
@@ -0,0 +1,50 @@
+***
+*** 28,34 
+  getFetchVertex(fetch),
+];
+  
+-   let edges = [];
+if(tez) {
+  edges = getEdges(tez, vertices);
+  edges = getEdgesWithCorrectedUnion(edges);
+--- 28,34 
+  getFetchVertex(fetch),
+];
+  
++   let edges = [], verticesData;
+if(tez) {
+  edges = getEdges(tez, vertices);
+  edges = getEdgesWithCorrectedUnion(edges);
+***
+*** 38,44 
+vertices = doEnhance(vertices);
+  
+vertices = getProcessedVertices(vertices, edges);
+- 
+const {adjustedVertices, adjustedEdges} = 
getAdjustedVerticesAndEdges(vertices, edges);
+vertices = adjustedVertices;
+edges = adjustedEdges;
+--- 38,44 
+vertices = doEnhance(vertices);
+  
+vertices = getProcessedVertices(vertices, edges);
++   verticesData = vertices;
+const {adjustedVertices, adjustedEdges} = 
getAdjustedVerticesAndEdges(vertices, edges);
+vertices = adjustedVertices;
+edges = adjustedEdges;
+***
+*** 60,65 
+  tree,
+  node

ambari git commit: AMBARI-20595. There is a syntax error in install script hence ambari doesn't pick the python 2.7 if system python path is not present (Aman Poonia via smohanty)

2017-05-09 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk aa78a1724 -> 436c91284


AMBARI-20595. There is a syntax error in install script hence ambari doesn't 
pick the python 2.7 if system python path is not present (Aman Poonia via 
smohanty)


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

Branch: refs/heads/trunk
Commit: 436c912844657347b5a80f89dedd6d537db82867
Parents: aa78a17
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue May 9 12:05:04 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue May 9 12:06:46 2017 -0700

--
 ambari-agent/conf/unix/install-helper.sh  | 2 +-
 ambari-server/conf/unix/install-helper.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/436c9128/ambari-agent/conf/unix/install-helper.sh
--
diff --git a/ambari-agent/conf/unix/install-helper.sh 
b/ambari-agent/conf/unix/install-helper.sh
index fef634f..c30aab1 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -90,7 +90,7 @@ do_install(){
   rm -f "$PYTHON_WRAPER_TARGET"
 
   AMBARI_PYTHON=""
-  python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7", 
"/usr/bin/python2.6" )
+  python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7" 
"/usr/bin/python2.6" )
   for python_binary in "${python_binaries[@]}"
   do
 $python_binary -c "import sys ; ver = sys.version_info ; sys.exit(not (ver 
>= (2,6) and ver<(3,0)))" 1>/dev/null 2>/dev/null

http://git-wip-us.apache.org/repos/asf/ambari/blob/436c9128/ambari-server/conf/unix/install-helper.sh
--
diff --git a/ambari-server/conf/unix/install-helper.sh 
b/ambari-server/conf/unix/install-helper.sh
index 7b29d06..6d7b3c7 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -86,7 +86,7 @@ do_install(){
   rm -f "$PYTHON_WRAPER_TARGET"
 
   AMBARI_PYTHON=""
-  python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7", 
"/usr/bin/python2.6" )
+  python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7" 
"/usr/bin/python2.6" )
   for python_binary in "${python_binaries[@]}"
   do
 $python_binary -c "import sys ; ver = sys.version_info ; sys.exit(not (ver 
>= (2,6) and ver<(3,0)))" 1>/dev/null 2>/dev/null

ambari git commit: AMBARI-20595. There is a syntax error in install script hence ambari doesn't pick the python 2.7 if system python path is not present (Aman Poonia via smohanty)

2017-05-09 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 e5bfb5a8d -> e12518654


AMBARI-20595. There is a syntax error in install script hence ambari doesn't 
pick the python 2.7 if system python path is not present (Aman Poonia via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: e12518654ef378232e5ae8e4d9b488df4703cc8d
Parents: e5bfb5a
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue May 9 12:05:04 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue May 9 12:05:04 2017 -0700

--
 ambari-agent/conf/unix/install-helper.sh  | 2 +-
 ambari-server/conf/unix/install-helper.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e1251865/ambari-agent/conf/unix/install-helper.sh
--
diff --git a/ambari-agent/conf/unix/install-helper.sh 
b/ambari-agent/conf/unix/install-helper.sh
index 0e32d0a..ee5b62b 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -89,7 +89,7 @@ do_install(){
   rm -f "$PYTHON_WRAPER_TARGET"
 
   AMBARI_PYTHON=""
-  python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7", 
"/usr/bin/python2.6" )
+  python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7" 
"/usr/bin/python2.6" )
   for python_binary in "${python_binaries[@]}"
   do
 $python_binary -c "import sys ; ver = sys.version_info ; sys.exit(not (ver 
>= (2,6) and ver<(3,0)))" 1>/dev/null 2>/dev/null

http://git-wip-us.apache.org/repos/asf/ambari/blob/e1251865/ambari-server/conf/unix/install-helper.sh
--
diff --git a/ambari-server/conf/unix/install-helper.sh 
b/ambari-server/conf/unix/install-helper.sh
index 8def27a..e9ab202 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -83,7 +83,7 @@ do_install(){
   rm -f "$PYTHON_WRAPER_TARGET"
 
   AMBARI_PYTHON=""
-  python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7", 
"/usr/bin/python2.6" )
+  python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7" 
"/usr/bin/python2.6" )
   for python_binary in "${python_binaries[@]}"
   do
 $python_binary -c "import sys ; ver = sys.version_info ; sys.exit(not (ver 
>= (2,6) and ver<(3,0)))" 1>/dev/null 2>/dev/null

ambari git commit: AMBARI-15754. configs.sh expands ***** in config values to a local file list, causing broken config files (Asger Askov Blekinge via smohanty)

2017-04-18 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 f613941aa -> 14c6114f4


AMBARI-15754. configs.sh expands * in config values to a local file list, 
causing broken config files (Asger Askov Blekinge via smohanty)


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

Branch: refs/heads/branch-2.4
Commit: 14c6114f4d50323f51cc4ebeb08782cec4f698a9
Parents: f613941
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Feb 23 14:01:35 2017 -0800
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue Apr 18 14:34:02 2017 -0700

--
 ambari-server/src/main/resources/scripts/configs.sh | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/14c6114f/ambari-server/src/main/resources/scripts/configs.sh
--
diff --git a/ambari-server/src/main/resources/scripts/configs.sh 
b/ambari-server/src/main/resources/scripts/configs.sh
index ba02d2d..3b57d2e 100755
--- a/ambari-server/src/main/resources/scripts/configs.sh
+++ b/ambari-server/src/main/resources/scripts/configs.sh
@@ -168,7 +168,7 @@ doConfigUpdate () {
   finalJson="{ \"Clusters\": { \"desired_config\": {\"type\": 
\"$SITE\", \"tag\":\"$newTag\", $newProperties}}}"
   newFile="doSet_$newTag.json"
   echo "## PUTting json into: $newFile"
-  echo $finalJson > $newFile
+  echo "$finalJson" > $newFile
   curl -k -u $USERID:$PASSWD -X PUT -H "X-Requested-By: ambari" 
"$AMBARIURL/api/v1/clusters/$CLUSTER" --data @$newFile
   currentSiteTag
   echo "## NEW Site:$SITE, Tag:$SITETAG";
@@ -193,7 +193,7 @@ doConfigFileUpdate () {
   newProperties=`cat $FILENAME`;
   finalJson="{ \"Clusters\": { \"desired_config\": {\"type\": \"$SITE\", 
\"tag\":\"$newTag\", $newProperties}}}"
   newFile="doSet_$newTag.json"
-  echo $finalJson>$newFile
+  echo "$finalJson" > $newFile
   echo "## PUTting file:\"$FILENAME\" into config(type:\"$SITE\", 
tag:$newTag) via $newFile"
   curl -k -u $USERID:$PASSWD -X PUT -H "X-Requested-By: ambari" 
"$AMBARIURL/api/v1/clusters/$CLUSTER" --data @$newFile
   currentSiteTag
@@ -240,9 +240,9 @@ doGet () {
 fi
 if [ "$propertiesStarted" -gt "0" ]; then
   if [ -z $FILENAME ]; then
-echo $line
+echo "$line"
   else
-echo $line >> $FILENAME
+echo "$line" >> $FILENAME
   fi
 fi
 if [ "`echo $line | grep -E "{$"`" ]; then

ambari git commit: AMBARI-20451 Storm Ambari view fails with SSL enabled Storm UI. (Sanket Shah via Sriharsha Chintalapani).

2017-04-17 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 91be87c28 -> ae50dab16


AMBARI-20451 Storm Ambari view fails with SSL enabled Storm UI. (Sanket
Shah via Sriharsha Chintalapani).


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

Branch: refs/heads/branch-2.4
Commit: ae50dab16458cad08956a05a541c1d71f1534fd9
Parents: 91be87c
Author: Sriharsha Chintalapani 
Authored: Tue Mar 14 15:01:05 2017 -0700
Committer: Sumit Mohanty 
Committed: Mon Apr 17 17:35:00 2017 -0700

--
 contrib/views/storm/src/main/resources/scripts/utils/Utils.js | 2 +-
 contrib/views/storm/src/main/resources/view.xml   | 7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ae50dab1/contrib/views/storm/src/main/resources/scripts/utils/Utils.js
--
diff --git a/contrib/views/storm/src/main/resources/scripts/utils/Utils.js 
b/contrib/views/storm/src/main/resources/scripts/utils/Utils.js
index 8b329c5..05f992b 100644
--- a/contrib/views/storm/src/main/resources/scripts/utils/Utils.js
+++ b/contrib/views/storm/src/main/resources/scripts/utils/Utils.js
@@ -38,7 +38,7 @@ define(['require',
 success: function(response){
 var props = response.ViewInstanceInfo.properties;
 if(props['storm.host'] && props['storm.port']){
-url += 
"http://"+props['storm.host']+":"+props['storm.port'];
+url += (props['storm.sslEnabled'] === "true" ? "https://; 
: "http://;)+props['storm.host']+":"+props['storm.port'];
 } else {
 Utils.notifyError("Failed to get storm hostname and 
port.");
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ae50dab1/contrib/views/storm/src/main/resources/view.xml
--
diff --git a/contrib/views/storm/src/main/resources/view.xml 
b/contrib/views/storm/src/main/resources/view.xml
index e2c1a3c..0e83ec2 100644
--- a/contrib/views/storm/src/main/resources/view.xml
+++ b/contrib/views/storm/src/main/resources/view.xml
@@ -34,4 +34,11 @@ limitations under the License. Kerberos, LDAP, Custom. 
Binary/Htt
8744
true
   
+  
+   storm.sslEnabled
+   Enter true if SSL is enabled for Storm else 
false.
+   SSL Enabled
+   false
+   true
+

ambari git commit: Revert "AMBARI-20509. Incorrect webhbase host and port for Knox Topology (Sandeep More via smohanty)"

2017-04-13 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6cf930b11 -> e4db0c2dc


Revert "AMBARI-20509. Incorrect webhbase host and port for Knox Topology 
(Sandeep More via smohanty)"

This reverts commit 187cded16dca661c41514a430c20d2d5f87a91e4.


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

Branch: refs/heads/branch-2.5
Commit: e4db0c2dc26a8f8ff887262fb334649db73ebefc
Parents: 6cf930b
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Apr 13 16:00:32 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Apr 13 16:00:32 2017 -0700

--
 .../stacks/HDP/2.6/services/KNOX/configuration/topology.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db0c2d/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
index f27aac7..df4c1b4 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
@@ -100,7 +100,7 @@
 
 service
 roleWEBHBASE/role
-
urlhttp://{{hbase_rest_server}}:{{hbase_rest_port}}/url;
+
urlhttp://{{hbase_master_host}}:{{hbase_master_port}}/url;
 /service
 
 service

ambari git commit: Revert "AMBARI-20263. Knox default topology config is wrong for Hbase service (Sandeep More via smohanty)"

2017-04-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 0d3d23276 -> 0140f7ad9


Revert "AMBARI-20263. Knox default topology config is wrong for Hbase service 
(Sandeep More via smohanty)"

This reverts commit d547d5dcc16c7824cbfe5afd9e33dc4913415d77.


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

Branch: refs/heads/branch-2.5
Commit: 0140f7ad9666c425022023b13d7abc9d0ba2043a
Parents: 0d3d232
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Apr 12 17:17:11 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Apr 12 17:17:11 2017 -0700

--
 .../common-services/KNOX/0.5.0.2.2/configuration/topology.xml | 2 +-
 .../KNOX/0.5.0.2.2/package/scripts/params_linux.py| 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0140f7ad/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
index bf0ab8f..3e56c3d 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
@@ -100,7 +100,7 @@
 
 service
 roleWEBHBASE/role
-
urlhttp://{{hbase_rest_server}}:{{hbase_rest_port}}/url;
+
urlhttp://{{hbase_master_host}}:{{hbase_master_port}}/url;
 /service
 
 service

http://git-wip-us.apache.org/repos/asf/ambari/blob/0140f7ad/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 3fb6af9..5a2ef19 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -212,18 +212,13 @@ if type(webhcat_server_hosts) is list:
 else:
   webhcat_server_host = webhcat_server_hosts
 
+hbase_master_port = default('/configurations/hbase-site/hbase.rest.port', 
"8080")
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", None)
 if type(hbase_master_hosts) is list:
   hbase_master_host = hbase_master_hosts[0]
 else:
   hbase_master_host = hbase_master_hosts
 
-hbase_rest_port = default('/configurations/hbase-site/hbase.rest.port', 
"60080")
-hbase_rest_server = 
default('/configurations/hbase-site/hbase.rest.server.host', None)
-
-if hbase_rest_server is None:
-  hbase_rest_server = hbase_master_host
-
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]

ambari git commit: AMBARI-20522. Upgrade support for druid components (Nishant Bangarwa via ncole)

2017-04-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 cc3493b3d -> 0d3d23276


AMBARI-20522. Upgrade support for druid components (Nishant Bangarwa via ncole)


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

Branch: refs/heads/branch-2.5
Commit: 0d3d23276c4ca6b1c2f642cb69dcc42d188a7523
Parents: cc3493b
Author: Nate Cole 
Authored: Wed Mar 22 16:50:45 2017 -0400
Committer: Sumit Mohanty 
Committed: Wed Apr 12 17:06:26 2017 -0700

--
 .../common-services/DRUID/0.9.2/metainfo.xml|  7 +++
 .../DRUID/0.9.2/package/scripts/druid_node.py   | 16 -
 .../DRUID/0.9.2/package/scripts/params.py   |  2 +
 .../DRUID/0.9.2/package/scripts/superset.py | 42 +
 .../HDP/2.6/upgrades/host-upgrade-2.6.xml   | 45 ++
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 64 
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 54 +
 7 files changed, 215 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0d3d2327/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
index c0859f2..404545c 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
@@ -29,6 +29,7 @@
   Druid Coordinator
   MASTER
   1+
+  true
   
 
   HDFS/HDFS_CLIENT
@@ -52,6 +53,7 @@
   Druid Overlord
   MASTER
   1+
+  true
   
 
   HDFS/HDFS_CLIENT
@@ -75,6 +77,7 @@
   Druid Historical
   SLAVE
   1+
+  true
   
 
   HDFS/HDFS_CLIENT
@@ -98,6 +101,7 @@
   Druid Broker
   MASTER
   1+
+  true
   
 
   HDFS/HDFS_CLIENT
@@ -121,6 +125,7 @@
   Druid MiddleManager
   SLAVE
   1+
+  true
   
 
   HDFS/HDFS_CLIENT
@@ -144,6 +149,7 @@
   Druid Router
   MASTER
   1+
+  true
   
 
   HDFS/HDFS_CLIENT
@@ -167,6 +173,7 @@
   Druid Superset
   MASTER
   1+
+  true
   
 scripts/superset.py
 PYTHON

http://git-wip-us.apache.org/repos/asf/ambari/blob/0d3d2327/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
index 6c1cc20..7c6bf39 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
@@ -22,8 +22,11 @@ from resource_management import Script
 from resource_management.core.logger import Logger
 from resource_management.core.resources.system import Execute
 from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions import stack_select
+from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions.stack_features import 
check_stack_feature
 from resource_management.libraries.functions.check_process_status import 
check_process_status
-
 from resource_management.libraries.functions.show_logs import show_logs
 from druid import druid, get_daemon_cmd, getPid
 
@@ -45,7 +48,16 @@ class DruidBase(Script):
 druid(upgrade_type=upgrade_type, nodeType=self.nodeType)
 
   def pre_upgrade_restart(self, env, upgrade_type=None):
-return
+node_type_lower = self.nodeType.lower()
+Logger.info(format("Executing druid-{node_type_lower} Upgrade 
pre-restart"))
+import params
+
+env.set_params(params)
+
+if params.stack_version and 
check_stack_feature(StackFeature.ROLLING_UPGRADE, params.stack_version):
+  stack_select.select(self.get_component_name(), params.stack_version)
+if params.stack_version and

ambari git commit: AMBARI-20549. upgrade ambari-web and ambari-admin frontend-maven-plugin to latest >= 1.3 to make use of ignore proxy feature. (jaimin)

2017-04-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 e84270e52 -> cc3493b3d


AMBARI-20549. upgrade ambari-web and ambari-admin frontend-maven-plugin to 
latest >= 1.3 to make use of ignore proxy feature. (jaimin)


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

Branch: refs/heads/branch-2.5
Commit: cc3493b3d9dc3002260b67479dec685202bd2fa3
Parents: e84270e
Author: Jaimin Jetly 
Authored: Fri Mar 24 11:17:47 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 12 16:59:57 2017 -0700

--
 ambari-admin/pom.xml | 3 ++-
 ambari-web/pom.xml   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cc3493b3/ambari-admin/pom.xml
--
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 97d5fd4..8dac1bf 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -61,11 +61,12 @@
   
 com.github.eirslett
 frontend-maven-plugin
-0.0.16
+1.3
 
   v4.5.0
   2.15.0
   src/main/resources/ui/admin-web/
+  
false
 
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc3493b3/ambari-web/pom.xml
--
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 6c84688..6182a60 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -126,11 +126,12 @@
   
 com.github.eirslett
 frontend-maven-plugin
-0.0.16
+1.3
 
   v4.5.0
   2.15.0
   ${basedir}
+  
false

ambari git commit: AMBARI-20750. Remove multiprocessing-based StatusCommandsExecutor (Eugene Chekanskiy via smohanty)

2017-04-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 05b429714 -> e5940693b


AMBARI-20750. Remove multiprocessing-based StatusCommandsExecutor (Eugene 
Chekanskiy via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: e5940693b968ba2cc0e84af3cce4a80ad013cfef
Parents: 05b4297
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Apr 12 12:35:15 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Apr 12 12:38:00 2017 -0700

--
 .../ambari_agent/StatusCommandsExecutor.py  | 278 +--
 1 file changed, 1 insertion(+), 277 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e5940693/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py 
b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
index 5a8e4ce..b2a65ff 100644
--- a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
@@ -83,280 +83,4 @@ class 
SingleProcessStatusCommandsExecutor(StatusCommandsExecutor):
   def kill(self, reason=None, can_relaunch=True):
 pass
 
-class MultiProcessStatusCommandsExecutor(StatusCommandsExecutor):
-  def __init__(self, config, actionQueue):
-self.config = config
-self.actionQueue = actionQueue
-
-self.can_relaunch = True
-
-# used to prevent queues from been used during creation of new one to 
prevent threads messing up with combination of
-# old and new queues
-self.usage_lock = threading.RLock()
-# protects against simultaneous killing/creating from different threads.
-self.kill_lock = threading.RLock()
-
-self.status_command_timeout = int(self.config.get('agent', 
'status_command_timeout', 5))
-self.customServiceOrchestrator = self.actionQueue.customServiceOrchestrator
-
-self.worker_process = None
-self.mustDieEvent = multiprocessing.Event()
-self.timedOutEvent = multiprocessing.Event()
-
-# multiprocessing stuff that need to be cleaned every time
-self.mp_result_queue = multiprocessing.Queue()
-self.mp_result_logs = multiprocessing.Queue()
-self.mp_task_queue = multiprocessing.Queue()
-
-  def _drain_queue(self, target_queue, max_time=5, max_empty_count=15, 
read_break=.001):
-"""
-Read everything that available in queue. Using not reliable 
multiprocessing.Queue methods(qsize, empty), so contains
-extremely dumb protection against blocking too much at this method: will 
try to get all possible items for not more
-than ``max_time`` seconds; will return after ``max_empty_count`` calls of 
``target_queue.get(False)`` that raised
-``Queue.Empty`` exception. Notice ``read_break`` argument, with default 
values this method will be able to read
-~4500 ``range(1,1)`` objects for 5 seconds. So don't fill queue too 
fast.
-
-:param target_queue: queue to read from
-:param max_time: maximum time to spend in this method call
-:param max_empty_count: maximum allowed ``Queue.Empty`` in a row
-:param read_break: time to wait before next read cycle iteration
-:return: list of resulting objects
-"""
-results = []
-_empty = 0
-_start = time.time()
-with self.usage_lock:
-  try:
-while (not target_queue.empty() or target_queue.qsize() > 0) and 
time.time() - _start < max_time and _empty < max_empty_count:
-  try:
-results.append(target_queue.get(False))
-_empty = 0
-time.sleep(read_break) # sleep a little to get more accurate empty 
and qsize results
-  except Queue.Empty:
-_empty += 1
-  except IOError:
-pass
-  except UnicodeDecodeError:
-pass
-  except IOError:
-pass
-return results
-
-  def _log_message(self, level, message, exception=None):
-"""
-Put log message to logging queue. Must be used only for logging from child 
process(in _worker_process_target).
-
-:param level:
-:param message:
-:param exception:
-:return:
-"""
-result_message = "StatusCommandExecutor reporting at {0}: 
".format(time.time()) + message
-self.mp_result_logs.put((level, result_message, exception))
-
-  def _process_logs(self):
-"""
-Get all available at this moment logs and prints them to l

ambari git commit: AMBARI-20750. Remove multiprocessing-based StatusCommandsExecutor (Eugene Chekanskiy via smohanty)

2017-04-12 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk ef34cb4ee -> 5ef0c99a9


AMBARI-20750. Remove multiprocessing-based StatusCommandsExecutor (Eugene 
Chekanskiy via smohanty)


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

Branch: refs/heads/trunk
Commit: 5ef0c99a9d477b63f4e7213d058c9ab2d3ac2feb
Parents: ef34cb4
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Apr 12 12:35:15 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Apr 12 12:35:15 2017 -0700

--
 .../ambari_agent/StatusCommandsExecutor.py  | 279 +--
 1 file changed, 2 insertions(+), 277 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5ef0c99a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py 
b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
index 142e7ca..f42e134 100644
--- a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
@@ -83,280 +83,5 @@ class 
SingleProcessStatusCommandsExecutor(StatusCommandsExecutor):
   def kill(self, reason=None, can_relaunch=True):
 pass
 
-class MultiProcessStatusCommandsExecutor(StatusCommandsExecutor):
-  def __init__(self, config, actionQueue):
-self.config = config
-self.actionQueue = actionQueue
-
-self.can_relaunch = True
-
-# used to prevent queues from been used during creation of new one to 
prevent threads messing up with combination of
-# old and new queues
-self.usage_lock = threading.RLock()
-# protects against simultaneous killing/creating from different threads.
-self.kill_lock = threading.RLock()
-
-self.status_command_timeout = int(self.config.get('agent', 
'status_command_timeout', 5))
-self.customServiceOrchestrator = self.actionQueue.customServiceOrchestrator
-
-self.worker_process = None
-self.mustDieEvent = multiprocessing.Event()
-self.timedOutEvent = multiprocessing.Event()
-
-# multiprocessing stuff that need to be cleaned every time
-self.mp_result_queue = multiprocessing.Queue()
-self.mp_result_logs = multiprocessing.Queue()
-self.mp_task_queue = multiprocessing.Queue()
-
-  def _drain_queue(self, target_queue, max_time=5, max_empty_count=15, 
read_break=.001):
-"""
-Read everything that available in queue. Using not reliable 
multiprocessing.Queue methods(qsize, empty), so contains
-extremely dumb protection against blocking too much at this method: will 
try to get all possible items for not more
-than ``max_time`` seconds; will return after ``max_empty_count`` calls of 
``target_queue.get(False)`` that raised
-``Queue.Empty`` exception. Notice ``read_break`` argument, with default 
values this method will be able to read
-~4500 ``range(1,1)`` objects for 5 seconds. So don't fill queue too 
fast.
-
-:param target_queue: queue to read from
-:param max_time: maximum time to spend in this method call
-:param max_empty_count: maximum allowed ``Queue.Empty`` in a row
-:param read_break: time to wait before next read cycle iteration
-:return: list of resulting objects
-"""
-results = []
-_empty = 0
-_start = time.time()
-with self.usage_lock:
-  try:
-while (not target_queue.empty() or target_queue.qsize() > 0) and 
time.time() - _start < max_time and _empty < max_empty_count:
-  try:
-results.append(target_queue.get(False))
-_empty = 0
-time.sleep(read_break) # sleep a little to get more accurate empty 
and qsize results
-  except Queue.Empty:
-_empty += 1
-  except IOError:
-pass
-  except UnicodeDecodeError:
-pass
-  except IOError:
-pass
-return results
-
-  def _log_message(self, level, message, exception=None):
-"""
-Put log message to logging queue. Must be used only for logging from child 
process(in _worker_process_target).
-
-:param level:
-:param message:
-:param exception:
-:return:
-"""
-result_message = "StatusCommandExecutor reporting at {0}: 
".format(time.time()) + message
-self.mp_result_logs.put((level, result_message, exception))
-
-  def _process_logs(self):
-"""
-Get all available at this moment logs and prints them to logger.
-"

ambari git commit: AMBARI-20612. Fetching running application logs results in java.io.IOException (Madhuvanthi Radhakrishnan via smohanty)

2017-04-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6e256d9f0 -> 413db00ff


AMBARI-20612. Fetching running application logs results in java.io.IOException 
(Madhuvanthi Radhakrishnan via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 413db00ffe8592baef121c132189ff054fa6c630
Parents: 6e256d9
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Mar 28 21:40:37 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Apr 5 13:04:41 2017 -0700

--
 .../upgrades/FixYarnWebServiceUrl.java  | 103 +++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |   5 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |   5 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |   7 +
 .../upgrades/FixYarnWebServiceUrlTest.java  | 305 +++
 8 files changed, 446 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/413db00f/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
new file mode 100644
index 000..ae2631a
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
@@ -0,0 +1,103 @@
+/**
+ * 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.serveraction.upgrades;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.serveraction.AbstractServerAction;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+
+import com.google.inject.Inject;
+
+/**
+ * yarn.log.server.web-service.url is added in HDP 2.6
+ * It takes value from yarn.timeline-service.webapp.address if the 
yarn.http.policy is HTTP_ONLY
+ * and takes value from yarn.timeline-service.webapp.https.address if the 
yarn.http.policy is HTTPS_ONLY.
+ * This class is used when moving from HDP-2.3/HDP-2.4/HDP-2.5 to HDP2.6
+ */
+public class FixYarnWebServiceUrl extends AbstractServerAction {
+private static final String SOURCE_CONFIG_TYPE = "yarn-site";
+private static final String YARN_TIMELINE_WEBAPP_HTTPADDRESS = 
"yarn.timeline-service.webapp.address";
+private static final String YARN_TIMELINE_WEBAPP_HTTPSADDRESS = 
"yarn.timeline-service.webapp.https.address";
+private static final String YARN_LOGSERVER_WEBSERVICE_URL = 
"yarn.log.server.web-service.url";
+private static final String YARN_HTTP_POLICY = "yarn.http.policy";
+private static final String HTTP = "HTTP_ONLY";
+private static final String HTTPS = "HTTPS_ONLY";
+
+@Inject
+private Clusters clusters;
+
+@Override
+public CommandReport execute(ConcurrentMap<String, Object> 
requestSharedDataContext)
+throws AmbariException, InterruptedException{
+
+String clusterName = getExecutionCommand().getClusterName();
+Cluster cluster = clusters.getCluster(clusterName);
+Config config = cluster.getDesiredConfigByType(SOURCE_CONFIG_TYPE);
+
+if (config == null) {
+return

ambari git commit: AMBARI-20568. Update hash aggregation settings for llap in hdp stack (Siddharth Seth via smohanty)

2017-04-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a9a23e22a -> 6e256d9f0


AMBARI-20568. Update hash aggregation settings for llap in hdp stack (Siddharth 
Seth via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 6e256d9f09c16f79f912889f50dfb3bcf19aa232
Parents: a9a23e2
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 24 16:05:04 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Apr 5 13:01:16 2017 -0700

--
 .../HIVE/configuration/hive-interactive-site.xml | 19 +++
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml   |  6 ++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml  |  7 +++
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml  |  1 +
 4 files changed, 33 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6e256d9f/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
index e11bb18..52d5db4 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
@@ -703,4 +703,23 @@ limitations under the License.
 
 
   
+  
+hive.map.aggr.hash.min.reduction
+0.99
+
+  Hash aggregation will be turned off if the ratio between hash  table 
size and input rows is bigger than this number.
+  Set to 1 to make sure hash aggregation is never turned off.
+
+
+  
+  
+hive.vectorized.groupby.maxentries
+100
+
+  Max number of entries in the vector group by aggregation hashtables.
+  Exceeding this will trigger a flush irrelevant of memory pressure 
condition.
+
+
+  
+
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e256d9f/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 95040aa..9e4abb3 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -458,6 +458,12 @@
 
   
 
+  
+hive-interactive-site
+
+
+  
+
   
 hive-interactive-site
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e256d9f/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 4c7faf1..ba78742 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -685,6 +685,13 @@
   Updating the Hive Log4J2 properties to include 
parameterizations
 
   
+
+  
+
+  Updating Hash Aggregation settings for LLAP
+
+  
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e256d9f/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 11d24c9..a0b438e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -834,6 +834,7 @@
   
   
   
+

[3/3] ambari git commit: AMBARI-20570. Remove property atlas.cluster.name from hive-site for fresh deployments (smohanty)

2017-04-05 Thread smohanty 
AMBARI-20570. Remove property atlas.cluster.name from hive-site for fresh 
deployments (smohanty)


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

Branch: refs/heads/branch-2.5
Commit: a9a23e22afd4b92226baed28af43aa33aeb7ba59
Parents: 7fbec01
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 24 20:31:18 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Apr 5 12:57:29 2017 -0700

--
 .../stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml| 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a23e22/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
index cd19519..f0b945a 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
@@ -24,4 +24,9 @@ limitations under the License.
 true
 
   
+  
+atlas.cluster.name
+
+true
+

[1/3] ambari git commit: AMBARI-20555. Add Ambari cluster name for Ranger-Tagsync to sync generated atlas tags (Vishal Suvagia via smohanty)

2017-04-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 44b5155fc -> a9a23e22a


AMBARI-20555. Add Ambari cluster name for Ranger-Tagsync to sync generated 
atlas tags (Vishal Suvagia via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 1730747cf0da3a35dd85f4864e04d389d25cad30
Parents: 44b5155
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 24 06:53:22 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Apr 5 12:56:18 2017 -0700

--
 .../common-services/RANGER/0.4.0/package/scripts/params.py  | 5 -
 .../RANGER/0.7.0/configuration/ranger-tagsync-site.xml  | 9 +
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1730747c/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index 0fae23e..094d239 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -442,4 +442,7 @@ ranger_truststore_alias = 
default('/configurations/ranger-admin-site/ranger.trus
 https_enabled = 
config['configurations']['ranger-admin-site']['ranger.service.https.attrib.ssl.enabled']
 http_enabled = 
config['configurations']['ranger-admin-site']['ranger.service.http.enabled']
 https_keystore_password = 
config['configurations']['ranger-admin-site']['ranger.service.https.attrib.keystore.pass']
-truststore_password = 
config['configurations']['ranger-admin-site']['ranger.truststore.password']
\ No newline at end of file
+truststore_password = 
config['configurations']['ranger-admin-site']['ranger.truststore.password']
+
+# need this to capture cluster name for ranger tagsync
+cluster_name = config['clusterName']
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/1730747c/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
index d186625..6391bd4 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
@@ -31,4 +31,13 @@
 Keystore and truststore information used for tagsync, 
required if tagsync to atlas communication is SSL enabled
 
   
+  
+ranger.tagsync.atlas.default.cluster.name
+{{cluster_name}}
+Capture cluster name
+
+  true
+
+
+  
 
\ No newline at end of file

[2/3] ambari git commit: AMBARI-20556. Add SPARK_CONF_DIR in livy-env when upgrading from HDP 2.5 to 2.6 (Jeff Zhang via alejandro)

2017-04-05 Thread smohanty 
AMBARI-20556. Add SPARK_CONF_DIR in livy-env when upgrading from HDP 2.5 to 2.6 
(Jeff Zhang via alejandro)


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

Branch: refs/heads/branch-2.5
Commit: 7fbec01c4eb1f947ca03fae4c6f83081cec26f10
Parents: 1730747
Author: Alejandro Fernandez 
Authored: Fri Mar 24 15:48:36 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 12:57:01 2017 -0700

--
 .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml| 4 
 .../resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 
 .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml   | 1 +
 3 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 4a6e98b..95040aa 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -75,6 +75,10 @@
 
 
   
+  
+livy-env
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 97fb768..4c7faf1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -564,6 +564,10 @@
 
   
 
+  
+
+  
+
   
 
   Add queue customization property

http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index fe25928..11d24c9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -881,6 +881,7 @@
   
 
   
+

[2/2] ambari git commit: AMBARI-20554. Fix minimum recommended value for slider and Tez AM for HSI.

2017-04-05 Thread smohanty 
AMBARI-20554. Fix minimum recommended value for slider and Tez AM for HSI.


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

Branch: refs/heads/branch-2.5
Commit: 44b5155fc0bdebd359143063524d90f14bf8572a
Parents: 84ba22a
Author: Swapan Shridhar 
Authored: Thu Mar 23 18:29:06 2017 -0700
Committer: Sumit Mohanty 
Committed: Wed Apr 5 12:50:34 2017 -0700

--
 .../stacks/HDP/2.5/services/stack_advisor.py  | 10 --
 .../stacks/2.5/common/test_stack_advisor.py   | 18 +-
 2 files changed, 13 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/44b5155f/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 3100125..b6aca4c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -1495,12 +1495,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 
 :type yarn_min_container_size int
 """
-if yarn_min_container_size > 1024:
+if yarn_min_container_size >= 1024:
   return 1024
-if yarn_min_container_size >= 256 and yarn_min_container_size <= 1024:
-  return yarn_min_container_size
-if yarn_min_container_size < 256:
-  return 256
+else:
+  return 512
 
   def calculate_tez_am_container_size(self, services, total_cluster_capacity, 
is_cluster_create_opr=False, enable_hive_interactive_1st_invocation=False):
 """
@@ -1511,7 +1509,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 calculated_tez_am_resource_memory_mb = None
 if is_cluster_create_opr or enable_hive_interactive_1st_invocation:
   if total_cluster_capacity <= 4096:
-calculated_tez_am_resource_memory_mb = 256
+calculated_tez_am_resource_memory_mb = 512
   elif total_cluster_capacity > 4096 and total_cluster_capacity <= 98304:
 calculated_tez_am_resource_memory_mb = 1024
   elif total_cluster_capacity > 98304:

http://git-wip-us.apache.org/repos/asf/ambari/blob/44b5155f/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index 42047d9..8576dcc 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -1401,19 +1401,19 @@ class TestHDP25StackAdvisor(TestCase):
 
self.assertTrue(configurations['hive-interactive-env']['properties']['num_llap_nodes'],
 3)
 
self.assertTrue(configurations['hive-interactive-env']['properties']['num_llap_nodes_for_llap_daemons'],
 3)
 
-
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
 '9548')
+
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
 '9207')
 
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
 '1')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
 '1')
 
-
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
 '8524')
+
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
 '8183')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
 'true')
 
 
self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
 '819')
 
self.assertEqual(configurations['hive-interactive-env']['properties']['hive_heapsize'],
 '2048')
 
self.assertEqual(configurations['hive-interactive-env']['property_attributes']['num_llap_nodes'],
 {'read_only': 'true', 'minimum': '1', 'maximum': '1'})
 
-
self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'],
 '341')
+
self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'],
 '682')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.auto.convert.join.noconditionaltask.size'],
 '286261248')

[1/2] ambari git commit: AMBARI-20537. Some config changes for LLAP to avoid daemon getting killed (Prasanth Jayachandran via smohanty)

2017-04-05 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4bb66330c -> 44b5155fc


AMBARI-20537. Some config changes for LLAP to avoid daemon getting killed 
(Prasanth Jayachandran via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 84ba22a711bf89b3286c155ec99f638414079d6b
Parents: 4bb6633
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Mar 23 18:11:55 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Apr 5 12:49:41 2017 -0700

--
 .../2.5/services/HIVE/configuration/hive-interactive-env.xml| 2 +-
 .../2.5/services/HIVE/configuration/tez-interactive-site.xml| 5 +
 .../2.6/services/HIVE/configuration/hive-interactive-env.xml| 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/84ba22a7/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index 07d21af..f3e7be1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -201,7 +201,7 @@
   
   
 llap_java_opts
--XX:+AlwaysPreTouch {% if java_version > 7 %}-XX:+UseG1GC 
-XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts 
-XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=40 
-XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails 
-verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif 
%}
+-XX:+AlwaysPreTouch {% if java_version > 7 %}-Xss512k -XX:+UseG1GC 
-XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts 
-XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=40 
-XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails 
-verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif 
%}
 Java opts for llap daemons
 LLAP daemon java opts
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84ba22a7/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
index e914d69..c1a42b0 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
@@ -178,4 +178,9 @@
 3600
 
   
+  
+tez.runtime.shuffle.parallel.copies
+8
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84ba22a7/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
index a99caba..ada4859 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
@@ -44,7 +44,7 @@
   
   
 llap_java_opts
--XX:+AlwaysPreTouch {% if java_version > 7 %}-XX:+UseG1GC 
-XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts 
-XX:InitiatingHeapOccupancyPercent=40 -XX:G1ReservePercent=20 
-XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc 
-XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif 
%}{{heap_dump_opts}}
+-XX:+AlwaysPreTouch {% if java_version > 7 %}-Xss512k -XX:+UseG1GC 
-XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts 
-XX:InitiatingHeapOccupancyPercent=40 -XX:G1ReservePercent=20 
-XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc 
-XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif 
%}{{heap_dump_opts}}
 Java opts for llap application
 LLAP app java opts

ambari git commit: AMBARI-20649. Add public repo URLs for HDP-2.6 repo (smohanty)

2017-03-31 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 7b8ca7f69 -> 320a8f5b4


AMBARI-20649. Add public repo URLs for HDP-2.6 repo (smohanty)


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

Branch: refs/heads/trunk
Commit: 320a8f5b4ee9581663836d05489eabb9cf195c52
Parents: 7b8ca7f
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 31 16:40:37 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Mar 31 16:41:24 2017 -0700

--
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/320a8f5b/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml
--
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml
index 34abae5..81a70a5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml
@@ -19,7 +19,7 @@
   
http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -33,7 +33,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos7/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/centos7/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -47,7 +47,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11sp3/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/suse11sp3/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -61,7 +61,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/sles12/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/sles12/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -75,7 +75,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/ubuntu12/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -89,7 +89,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/debian7/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/debian7/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -103,7 +103,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu14/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/ubuntu14/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -117,7 +117,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu14/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/ubuntu16/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true

ambari git commit: AMBARI-20649. Add public repo URLs for HDP-2.6 repo (smohanty)

2017-03-31 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 8058ccebe -> cc1b9cb66


AMBARI-20649. Add public repo URLs for HDP-2.6 repo (smohanty)


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

Branch: refs/heads/branch-2.5
Commit: cc1b9cb66274c9d4618142c5e80ea87ee2bc5f89
Parents: 8058cce
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 31 16:40:37 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Mar 31 16:40:37 2017 -0700

--
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cc1b9cb6/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml
--
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml
index 34abae5..81a70a5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/repos/repoinfo.xml
@@ -19,7 +19,7 @@
   
http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -33,7 +33,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos7/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/centos7/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -47,7 +47,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11sp3/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/suse11sp3/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -61,7 +61,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/sles12/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/sles12/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -75,7 +75,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/ubuntu12/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -89,7 +89,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/debian7/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/debian7/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -103,7 +103,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu14/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/ubuntu14/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true
@@ -117,7 +117,7 @@
   
   
 
-  
http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu14/2.x/updates/2.6.0.0
+  
http://public-repo-1.hortonworks.com/HDP/ubuntu16/2.x/updates/2.6.0.3
   HDP-2.6
   HDP
   true

ambari git commit: AMBARI-20543. In case of IBM Power, test_CompressionTool[lzo] fails with lzo.GPLNativeCodeLoader: Could not load native gpl library (Andrew Onishuk via smohanty)

2017-03-30 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 9f03180cb -> ee24a25d1


AMBARI-20543. In case of IBM Power, test_CompressionTool[lzo] fails with 
lzo.GPLNativeCodeLoader: Could not load native gpl library (Andrew Onishuk via 
smohanty)


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

Branch: refs/heads/trunk
Commit: ee24a25d161453d7f42348f8ddfbe81459ac7665
Parents: 9f03180
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Mar 30 14:37:24 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Mar 30 14:38:39 2017 -0700

--
 .../common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml| 2 +-
 .../common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml   | 2 +-
 .../YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml| 2 +-
 .../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml  | 2 +-
 .../stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml  | 2 +-
 .../stacks/HDP/2.4/services/HDFS/configuration/hadoop-env.xml  | 2 +-
 .../stacks/HDP/2.6/services/HDFS/configuration/hadoop-env.xml  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ee24a25d/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
index 89d5001..4b4008d 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
@@ -368,7 +368,7 @@ fi
 export HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}
 
 #Mostly required for hadoop 2.0
-export 
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64
+export 
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64:/usr/hdp/current/hadoop-client/lib/native/Linux-{{architecture}}-64
 
 {% if is_datanode_max_locked_memory_set %}
 # Fix temporary bug, when ulimit from conf files is not picked up, without 
full relogin. 

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee24a25d/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 d7031e1..d883ec2 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
@@ -174,7 +174,7 @@
   
   
 tez.am.env
-
LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64
+
LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64:/usr/hdp/current/hadoop-client/lib/native/Linux-{{architecture}}-64
 
 Additional execution environment entries for tez. This is not an 
additive property. You must preserve the original value if
 you want to have access to native libraries.

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee24a25d/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
index bda7bcb..e2ef1b1 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
@@ -438,7 +438,7 @@
   
   
 mapreduce.admin.user.env
-
LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64
+
LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64:/usr/hdp/current/hadoop-client/lib/native/Linux-{{architecture}}-64
 
   Additional execution environment entries for map and reduce task 
processes.
   This is not an additiv

ambari git commit: AMBARI-20543. In case of IBM Power, test_CompressionTool[lzo] fails with lzo.GPLNativeCodeLoader: Could not load native gpl library (Andrew Onishuk via smohanty)

2017-03-30 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 61f667b1f -> 437cbdd94


AMBARI-20543. In case of IBM Power, test_CompressionTool[lzo] fails with 
lzo.GPLNativeCodeLoader: Could not load native gpl library (Andrew Onishuk via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 437cbdd946fc4c276a0ad0dbd6490a2c2f73a729
Parents: 61f667b
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Mar 30 14:37:24 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Mar 30 14:37:24 2017 -0700

--
 .../common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml| 2 +-
 .../common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml   | 2 +-
 .../YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml| 2 +-
 .../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml  | 2 +-
 .../stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml  | 2 +-
 .../stacks/HDP/2.4/services/HDFS/configuration/hadoop-env.xml  | 2 +-
 .../stacks/HDP/2.6/services/HDFS/configuration/hadoop-env.xml  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/437cbdd9/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
index 89d5001..4b4008d 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
@@ -368,7 +368,7 @@ fi
 export HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}
 
 #Mostly required for hadoop 2.0
-export 
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64
+export 
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64:/usr/hdp/current/hadoop-client/lib/native/Linux-{{architecture}}-64
 
 {% if is_datanode_max_locked_memory_set %}
 # Fix temporary bug, when ulimit from conf files is not picked up, without 
full relogin. 

http://git-wip-us.apache.org/repos/asf/ambari/blob/437cbdd9/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 d7031e1..d883ec2 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
@@ -174,7 +174,7 @@
   
   
 tez.am.env
-
LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64
+
LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64:/usr/hdp/current/hadoop-client/lib/native/Linux-{{architecture}}-64
 
 Additional execution environment entries for tez. This is not an 
additive property. You must preserve the original value if
 you want to have access to native libraries.

http://git-wip-us.apache.org/repos/asf/ambari/blob/437cbdd9/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
index bda7bcb..e2ef1b1 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
@@ -438,7 +438,7 @@
   
   
 mapreduce.admin.user.env
-
LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64
+
LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-{{architecture}}-64:/usr/hdp/current/hadoop-client/lib/native/Linux-{{architecture}}-64
 
   Additional execution environment entries for map and reduce task 
processes.
   This is

ambari git commit: AMBARI-20612. Fetching running application logs results in java.io.IOException (Madhuvanthi Radhakrishnan via smohanty)

2017-03-28 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk f18fad368 -> 090330943


AMBARI-20612. Fetching running application logs results in java.io.IOException 
(Madhuvanthi Radhakrishnan via smohanty)


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

Branch: refs/heads/trunk
Commit: 0903309437b9ddea06244bd2836e071b74b56176
Parents: f18fad3
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Tue Mar 28 21:40:37 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Tue Mar 28 21:40:37 2017 -0700

--
 .../upgrades/FixYarnWebServiceUrl.java  | 103 +++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |   5 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |   5 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |   7 +
 .../upgrades/FixYarnWebServiceUrlTest.java  | 305 +++
 8 files changed, 446 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09033094/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
new file mode 100644
index 000..ae2631a
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixYarnWebServiceUrl.java
@@ -0,0 +1,103 @@
+/**
+ * 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.serveraction.upgrades;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.serveraction.AbstractServerAction;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+
+import com.google.inject.Inject;
+
+/**
+ * yarn.log.server.web-service.url is added in HDP 2.6
+ * It takes value from yarn.timeline-service.webapp.address if the 
yarn.http.policy is HTTP_ONLY
+ * and takes value from yarn.timeline-service.webapp.https.address if the 
yarn.http.policy is HTTPS_ONLY.
+ * This class is used when moving from HDP-2.3/HDP-2.4/HDP-2.5 to HDP2.6
+ */
+public class FixYarnWebServiceUrl extends AbstractServerAction {
+private static final String SOURCE_CONFIG_TYPE = "yarn-site";
+private static final String YARN_TIMELINE_WEBAPP_HTTPADDRESS = 
"yarn.timeline-service.webapp.address";
+private static final String YARN_TIMELINE_WEBAPP_HTTPSADDRESS = 
"yarn.timeline-service.webapp.https.address";
+private static final String YARN_LOGSERVER_WEBSERVICE_URL = 
"yarn.log.server.web-service.url";
+private static final String YARN_HTTP_POLICY = "yarn.http.policy";
+private static final String HTTP = "HTTP_ONLY";
+private static final String HTTPS = "HTTPS_ONLY";
+
+@Inject
+private Clusters clusters;
+
+@Override
+public CommandReport execute(ConcurrentMap<String, Object> 
requestSharedDataContext)
+throws AmbariException, InterruptedException{
+
+String clusterName = getExecutionCommand().getClusterName();
+Cluster cluster = clusters.getCluster(clusterName);
+Config config = cluster.getDesiredConfigByType(SOURCE_CONFIG_TYPE);
+
+if (config == null) {
+return

ambari git commit: AMBARI-20575. JAVA_LIBRARY_PATH in hadoop-env.sh is different on host and downloaded configs (Andrew Onischuk via smohanty)

2017-03-26 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 8648139f9 -> 55fdd7d98


AMBARI-20575. JAVA_LIBRARY_PATH in hadoop-env.sh is different on host and 
downloaded configs (Andrew Onischuk via smohanty)


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

Branch: refs/heads/trunk
Commit: 55fdd7d988f01eb022b28f2a80963256644b1d4e
Parents: 8648139
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Sun Mar 26 16:56:41 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Sun Mar 26 16:56:41 2017 -0700

--
 .../resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/55fdd7d9/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index d1eeaa5..cab9102 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -36,12 +36,15 @@ from resource_management.libraries.functions.expect import 
expect
 from resource_management.libraries.functions import StackFeature
 from resource_management.libraries.functions.stack_features import 
check_stack_feature
 from resource_management.libraries.functions.stack_features import 
get_stack_feature_version
+from resource_management.libraries.functions.get_architecture import 
get_architecture
 from ambari_commons.constants import AMBARI_SUDO_BINARY
 
 
 config = Script.get_config()
 tmp_dir = Script.get_tmp_dir()
 
+architecture = get_architecture()
+
 dfs_type = default("/commandParams/dfs_type", "")
 
 artifact_dir = format("{tmp_dir}/AMBARI-artifacts/")

ambari git commit: AMBARI-20570. Remove property atlas.cluster.name from hive-site for fresh deployments (smohanty)

2017-03-24 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 82d81ea9d -> b96b81525


AMBARI-20570. Remove property atlas.cluster.name from hive-site for fresh 
deployments (smohanty)


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

Branch: refs/heads/trunk
Commit: b96b81525d72dd61a4865ef0e9ae7361b557ccd0
Parents: 82d81ea
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 24 20:31:18 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Mar 24 20:31:18 2017 -0700

--
 .../HIVE/2.1.0.3.0/configuration/hive-site.xml   | 11 ---
 .../HDP/2.5/services/HIVE/configuration/hive-site.xml|  5 +
 2 files changed, 5 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b96b8152/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml
index 98dbe8d..edbbc9d 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml
@@ -53,17 +53,6 @@ limitations under the License.
 
   
   
-atlas.cluster.name
-{{cluster_name}}
-
-  
-application-properties
-atlas.enableTLS
-  
-
-
-  
-  
 hive.metastore.sasl.enabled
 false
 If true, the metastore thrift interface will be secured with 
SASL.

http://git-wip-us.apache.org/repos/asf/ambari/blob/b96b8152/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
index cd19519..f0b945a 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
@@ -24,4 +24,9 @@ limitations under the License.
 true
 
   
+  
+atlas.cluster.name
+
+true
+

ambari git commit: AMBARI-20568. Update hash aggregation settings for llap in hdp stack (Siddharth Seth via smohanty)

2017-03-24 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk fc6bab15d -> 82d81ea9d


AMBARI-20568. Update hash aggregation settings for llap in hdp stack (Siddharth 
Seth via smohanty)


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

Branch: refs/heads/trunk
Commit: 82d81ea9d55a9e777091100bf84d1b162dbf528e
Parents: fc6bab1
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 24 16:05:04 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Mar 24 16:05:12 2017 -0700

--
 .../HIVE/configuration/hive-interactive-site.xml | 19 +++
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml   |  6 ++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml  |  7 +++
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml  |  1 +
 4 files changed, 33 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/82d81ea9/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
index e11bb18..52d5db4 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
@@ -703,4 +703,23 @@ limitations under the License.
 
 
   
+  
+hive.map.aggr.hash.min.reduction
+0.99
+
+  Hash aggregation will be turned off if the ratio between hash  table 
size and input rows is bigger than this number.
+  Set to 1 to make sure hash aggregation is never turned off.
+
+
+  
+  
+hive.vectorized.groupby.maxentries
+100
+
+  Max number of entries in the vector group by aggregation hashtables.
+  Exceeding this will trigger a flush irrelevant of memory pressure 
condition.
+
+
+  
+
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/82d81ea9/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 941e28a..f908654 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -470,6 +470,12 @@
 
   
 
+  
+hive-interactive-site
+
+
+  
+
   
 hive-interactive-site
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/82d81ea9/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 5ee6ba4..c2ec6fd 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -683,6 +683,13 @@
   Updating the Hive Log4J2 properties to include 
parameterizations
 
   
+
+  
+
+  Updating Hash Aggregation settings for LLAP
+
+  
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/82d81ea9/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 7c31e57..381d6cc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -818,6 +818,7 @@
   
   
   
+

ambari git commit: AMBARI-20555. Add Ambari cluster name for Ranger-Tagsync to sync generated atlas tags (Vishal Suvagia via smohanty)

2017-03-24 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 80b874004 -> 7fc539ffd


AMBARI-20555. Add Ambari cluster name for Ranger-Tagsync to sync generated 
atlas tags (Vishal Suvagia via smohanty)


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

Branch: refs/heads/trunk
Commit: 7fc539ffda2158850c7f1c70987e15dbd48162c0
Parents: 80b8740
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 24 06:53:22 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Mar 24 06:53:28 2017 -0700

--
 .../common-services/RANGER/0.4.0/package/scripts/params.py  | 5 -
 .../RANGER/0.7.0/configuration/ranger-tagsync-site.xml  | 9 +
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7fc539ff/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index 0fae23e..094d239 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -442,4 +442,7 @@ ranger_truststore_alias = 
default('/configurations/ranger-admin-site/ranger.trus
 https_enabled = 
config['configurations']['ranger-admin-site']['ranger.service.https.attrib.ssl.enabled']
 http_enabled = 
config['configurations']['ranger-admin-site']['ranger.service.http.enabled']
 https_keystore_password = 
config['configurations']['ranger-admin-site']['ranger.service.https.attrib.keystore.pass']
-truststore_password = 
config['configurations']['ranger-admin-site']['ranger.truststore.password']
\ No newline at end of file
+truststore_password = 
config['configurations']['ranger-admin-site']['ranger.truststore.password']
+
+# need this to capture cluster name for ranger tagsync
+cluster_name = config['clusterName']
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/7fc539ff/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
index d186625..6391bd4 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-tagsync-site.xml
@@ -31,4 +31,13 @@
 Keystore and truststore information used for tagsync, 
required if tagsync to atlas communication is SSL enabled
 
   
+  
+ranger.tagsync.atlas.default.cluster.name
+{{cluster_name}}
+Capture cluster name
+
+  true
+
+
+  
 
\ No newline at end of file

[2/2] ambari git commit: Revert "AMBARI-20263. Knox default topology config is wrong for Hbase service (Sandeep More via smohanty)"

2017-03-22 Thread smohanty 
Revert "AMBARI-20263. Knox default topology config is wrong for Hbase service 
(Sandeep More via smohanty)"

This reverts commit 7e624b55ccac6c04fa9caf5eddbb4aa9282fd473.


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

Branch: refs/heads/trunk
Commit: 4a9dee6102d2989bf0e023c5d5c2c5b1b2d56958
Parents: 8fc7db1
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Wed Mar 22 14:41:57 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Wed Mar 22 14:41:57 2017 -0700

--
 .../common-services/KNOX/0.5.0.2.2/configuration/topology.xml | 2 +-
 .../KNOX/0.5.0.2.2/package/scripts/params_linux.py| 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4a9dee61/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
index bf0ab8f..3e56c3d 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
@@ -100,7 +100,7 @@
 
 service
 roleWEBHBASE/role
-
urlhttp://{{hbase_rest_server}}:{{hbase_rest_port}}/url;
+
urlhttp://{{hbase_master_host}}:{{hbase_master_port}}/url;
 /service
 
 service

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a9dee61/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 1224a9f..8beb2c0 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -211,18 +211,13 @@ if type(webhcat_server_hosts) is list:
 else:
   webhcat_server_host = webhcat_server_hosts
 
+hbase_master_port = default('/configurations/hbase-site/hbase.rest.port', 
"8080")
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", None)
 if type(hbase_master_hosts) is list:
   hbase_master_host = hbase_master_hosts[0]
 else:
   hbase_master_host = hbase_master_hosts
 
-hbase_rest_port = default('/configurations/hbase-site/hbase.rest.port', 
"60080")
-hbase_rest_server = 
default('/configurations/hbase-site/hbase.rest.server.host', None)
-
-if hbase_rest_server is None:
-  hbase_rest_server = hbase_master_host
-
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]

ambari git commit: AMBARI-20509. Incorrect webhbase host and port for Knox Topology (Sandeep More via smohanty)

2017-03-20 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk b00cd9951 -> 50d684a95


AMBARI-20509. Incorrect webhbase host and port for Knox Topology (Sandeep More 
via smohanty)


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

Branch: refs/heads/trunk
Commit: 50d684a95f1ee107d9a6bc1772750ea74fee39bb
Parents: b00cd99
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Mar 20 13:41:47 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Mar 20 13:44:17 2017 -0700

--
 .../stacks/HDP/2.6/services/KNOX/configuration/topology.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/50d684a9/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
index df4c1b4..f27aac7 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
@@ -100,7 +100,7 @@
 
 service
 roleWEBHBASE/role
-
urlhttp://{{hbase_master_host}}:{{hbase_master_port}}/url;
+
urlhttp://{{hbase_rest_server}}:{{hbase_rest_port}}/url;
 /service
 
 service

ambari git commit: AMBARI-20509. Incorrect webhbase host and port for Knox Topology (Sandeep More via smohanty)

2017-03-20 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a0e90f250 -> 187cded16


AMBARI-20509. Incorrect webhbase host and port for Knox Topology (Sandeep More 
via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 187cded16dca661c41514a430c20d2d5f87a91e4
Parents: a0e90f2
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Mon Mar 20 13:41:47 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Mon Mar 20 13:41:47 2017 -0700

--
 .../stacks/HDP/2.6/services/KNOX/configuration/topology.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/187cded1/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
index df4c1b4..f27aac7 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
@@ -100,7 +100,7 @@
 
 service
 roleWEBHBASE/role
-
urlhttp://{{hbase_master_host}}:{{hbase_master_port}}/url;
+
urlhttp://{{hbase_rest_server}}:{{hbase_rest_port}}/url;
 /service
 
 service

ambari git commit: AMBARI-20491. HiveServer2 Interactive Process alert not working in http mode. (Swapan Sridhar via smohanty)

2017-03-17 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 1cf462026 -> 6104300fd


AMBARI-20491. HiveServer2 Interactive Process alert not working in http mode. 
(Swapan Sridhar via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 6104300fd0b742217e6f50d36c46a390484e331c
Parents: 1cf4620
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 17 19:04:04 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Mar 17 19:05:17 2017 -0700

--
 .../package/alerts/alert_hive_interactive_thrift_port.py  | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6104300f/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
index 9bb7edf..8d48412 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
@@ -35,6 +35,7 @@ CRITICAL_MESSAGE = "Connection failed on host {0}:{1} ({2})"
 HIVE_SERVER_INTERACTIVE_THRIFT_PORT_KEY = 
'{{hive-interactive-site/hive.server2.thrift.port}}'
 HIVE_SERVER_INTERACTIVE_THRIFT_HTTP_PORT_KEY = 
'{{hive-interactive-site/hive.server2.thrift.http.port}}'
 HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_KEY = 
'{{hive-interactive-site/hive.server2.transport.mode}}'
+HIVE_SERVER_TRANSPORT_MODE_KEY = '{{hive-site/hive.server2.transport.mode}}'
 SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
 HIVE_SERVER2_INTERACTIVE_AUTHENTICATION_KEY = 
'{{hive-interactive-site/hive.server2.authentication}}'
 HIVE_SERVER2_AUTHENTICATION_KEY = '{{hive-site/hive.server2.authentication}}'
@@ -86,8 +87,8 @@ def get_tokens():
   HIVE_SERVER2_INTERACTIVE_AUTHENTICATION_KEY, 
HIVE_SERVER2_AUTHENTICATION_KEY,
   HIVE_SERVER_INTERACTIVE_PRINCIPAL_KEY, SMOKEUSER_KEYTAB_KEY, 
SMOKEUSER_PRINCIPAL_KEY,
   HIVE_SERVER_INTERACTIVE_THRIFT_HTTP_PORT_KEY, 
HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_KEY,
-  KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY, HIVE_SSL, 
HIVE_SSL_KEYSTORE_PATH, HIVE_SSL_KEYSTORE_PASSWORD,
-  HIVE_LDAP_USERNAME, HIVE_LDAP_PASSWORD)
+  HIVE_SERVER_TRANSPORT_MODE_KEY, 
KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY, HIVE_SSL,
+  HIVE_SSL_KEYSTORE_PATH, HIVE_SSL_KEYSTORE_PASSWORD, 
HIVE_LDAP_USERNAME, HIVE_LDAP_PASSWORD)
 
 
 @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
@@ -111,6 +112,8 @@ def execute(configurations={}, parameters={}, 
host_name=None):
   transport_mode = HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_DEFAULT
   if HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_KEY in configurations:
 transport_mode = configurations[HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_KEY]
+  elif HIVE_SERVER_TRANSPORT_MODE_KEY in configurations:
+transport_mode = configurations[HIVE_SERVER_TRANSPORT_MODE_KEY]
 
   port = THRIFT_PORT_DEFAULT
   if transport_mode.lower() == 'binary' and 
HIVE_SERVER_INTERACTIVE_THRIFT_PORT_KEY in configurations:

ambari git commit: AMBARI-20489. HBase service check reports success despite failures (Myroslav Papirkovskyi via smohanty)

2017-03-17 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 55e2af586 -> 6964bff88


AMBARI-20489. HBase service check reports success despite failures (Myroslav 
Papirkovskyi via smohanty)


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

Branch: refs/heads/trunk
Commit: 6964bff88d8dcb020027ce852687e3147ae724e4
Parents: 55e2af5
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Fri Mar 17 17:42:09 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Fri Mar 17 18:57:11 2017 -0700

--
 .../HBASE/0.96.0.2.0/package/scripts/service_check.py | 3 ++-
 .../test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py| 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6964bff8/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
index 6f6045c..5184ea7 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
@@ -49,7 +49,7 @@ class HbaseServiceCheckDefault(HbaseServiceCheck):
 env.set_params(params)
 
 output_file = "/apps/hbase/data/ambarismoketest"
-smokeuser_kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} 
{smokeuser_principal};") if params.security_enabled else ""
+smokeuser_kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} 
{smokeuser_principal} &&") if params.security_enabled else ""
 hbase_servicecheck_file = format("{exec_tmp_dir}/hbase-smoke.sh")
 hbase_servicecheck_cleanup_file = 
format("{exec_tmp_dir}/hbase-smoke-cleanup.sh")
 
@@ -81,6 +81,7 @@ class HbaseServiceCheckDefault(HbaseServiceCheck):
   
   Execute( grantprivelegecmd,
 user = params.hbase_user,
+logoutput = True
   )
 
 servicecheckcmd = format("{smokeuser_kinit_cmd} {hbase_cmd} --config 
{hbase_conf_dir} shell {hbase_servicecheck_file}")

http://git-wip-us.apache.org/repos/asf/ambari/blob/6964bff8/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
index f63abac..60a99ef 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
@@ -85,8 +85,9 @@ class TestServiceCheck(RMFTestCase):
 )
 self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hbase.headless.keytab hbase; /usr/lib/hbase/bin/hbase 
shell /tmp/hbase_grant_permissions.sh',
   user = 'hbase',
+  logoutput = True
 )
-self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com; 
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell /tmp/hbase-smoke.sh && 
/tmp/hbaseSmokeVerify.sh /etc/hbase/conf  /usr/lib/hbase/bin/hbase && 
/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab 
ambari...@example.com; /usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell 
/tmp/hbase-smoke-cleanup.sh',
+self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com && 
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell /tmp/hbase-smoke.sh && 
/tmp/hbaseSmokeVerify.sh /etc/hbase/conf  /usr/lib/hbase/bin/hbase && 
/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab 
ambari...@example.com && /usr/lib/hbase/bin/hbase --config /etc/hbase/conf 
shell /tmp/hbase-smoke-cleanup.sh',
   logoutput = True,
   tries = 6,
   user = 'ambari-qa',

ambari git commit: AMBARI-20469. Add a new property to yarn-site.xml yarn.log.server.web-service.url (Madhuvanthi Radhakrishnan via smohanty)

2017-03-16 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 9ed8c72f7 -> d28036e12


AMBARI-20469. Add a new property to yarn-site.xml 
yarn.log.server.web-service.url (Madhuvanthi Radhakrishnan via smohanty)


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

Branch: refs/heads/trunk
Commit: d28036e123ea129672ab9029cf32de9b4f234d5c
Parents: 9ed8c72
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Thu Mar 16 14:36:21 2017 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Thu Mar 16 14:47:06 2017 -0700

--
 ambari-server/set-hdp-repo-url.sh| 2 +-
 .../stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml | 4 ++--
 .../controller/internal/BlueprintConfigurationProcessorTest.java | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d28036e1/ambari-server/set-hdp-repo-url.sh
--
diff --git a/ambari-server/set-hdp-repo-url.sh 
b/ambari-server/set-hdp-repo-url.sh
index 6d46db0..1835705 100644
--- a/ambari-server/set-hdp-repo-url.sh
+++ b/ambari-server/set-hdp-repo-url.sh
@@ -57,7 +57,7 @@ then
 

   # all stacks get the same url
-  for ver in '1.3' '2.0' '2.1' '2.2' '2.3' '2.4' '2.5'; do
+  for ver in '1.3' '2.0' '2.1' '2.2' '2.3' '2.4' '2.5' '2.6'; do
 HDPREPO=target/classes/stacks/HDP/$ver/repos
 if [ -d $HDPREPO ]; then
   echo "Replacing $ver latest lookup url to '$LATEST_URL'"

http://git-wip-us.apache.org/repos/asf/ambari/blob/d28036e1/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
index 13017d7..acdae65 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
@@ -80,11 +80,11 @@
   
   
 yarn-site
-yarn.resourcemanager.webapp.address
+yarn.timeline-service.webapp.address
   
   
 yarn-site
-yarn.resourcemanager.webapp.https.address
+yarn.timeline-service.webapp.https.address
   
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d28036e1/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index d160050..fa2082b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -1265,6 +1265,7 @@ public class BlueprintConfigurationProcessorTest {
 yarnSiteProperties.put("yarn.timeline-service.address", expectedHostName + 
":" + expectedPortNum);
 yarnSiteProperties.put("yarn.timeline-service.webapp.address", 
expectedHostName + ":" + expectedPortNum);
 yarnSiteProperties.put("yarn.timeline-service.webapp.https.address", 
expectedHostName + ":" + expectedPortNum);
+yarnSiteProperties.put("yarn.log.server.web-service.url", expectedHostName 
+ ":" + expectedPortNum);
 
 Configuration clusterConfig = new Configuration(configProperties,
 Collections.<String, Map<String, Map<String, String>>>emptyMap());
@@ -1306,6 +1307,8 @@ public class BlueprintConfigurationProcessorTest {
 createExportedAddress(expectedPortNum, expectedHostGroupName), 
yarnSiteProperties.get("yarn.timeline-service.webapp.address"));
 assertEquals("Yarn ResourceManager timeline webapp HTTPS address was 
incorrectly exported",
 createExportedAddress(expectedPortNum, expectedHostGroupName), 
yarnSiteProperties.get("yarn.timeline-service.webapp.https.address"));
+assertEquals("Yarn ResourceManager timeline web service url was 
incorrectly exported",
+createExportedAddress(expectedPortNum, expectedHostGroupName), 
yarnSiteProperties.get("yarn.log.server.web-service.url"));
   }
 
   @Test

  1   2   3   4   5   6   7   8   9   10   >