ambari git commit: AMBARI-20369 Need hdfs-site for saving ranger audits to hdfs in namenode HA env (mugdha)

[mugdha]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6e0b234e3 -> bf4edcd76


AMBARI-20369 Need hdfs-site for saving ranger audits to hdfs in namenode HA env 
(mugdha)


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

Branch: refs/heads/branch-2.5
Commit: bf4edcd76b4e78e0a90455fc8d56c053683ad1ba
Parents: 6e0b234
Author: Mugdha Varadkar 
Authored: Thu Mar 9 15:08:05 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Mar 10 11:00:24 2017 +0530

--
 .../package/scripts/setup_ranger_knox.py  | 18 --
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py   | 15 +++
 .../0.5.0.2.3/package/scripts/params.py   |  5 -
 .../stacks/2.5/RANGER_KMS/test_kms_server.py  | 12 
 4 files changed, 47 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bf4edcd7/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
index 67a1670..c486ef7 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
@@ -19,8 +19,9 @@ limitations under the License.
 """
 from resource_management.core.logger import Logger
 from resource_management.libraries.functions.setup_ranger_plugin_xml import 
setup_core_site_for_required_plugins
-
-
+from resource_management.core.resources import File
+from resource_management.libraries.resources.xml_config import XmlConfig
+from resource_management.libraries.functions.format import format
 
 def setup_ranger_knox(upgrade_type=None):
   import params
@@ -56,6 +57,19 @@ def setup_ranger_knox(upgrade_type=None):
 )
 params.HdfsResource(None, action="execute")
 
+if params.namenode_hosts is not None and len(params.namenode_hosts) > 
1:
+  Logger.info('Ranger Knox plugin is enabled in NameNode HA 
environment along with audit to Hdfs enabled, creating hdfs-site.xml')
+  XmlConfig("hdfs-site.xml",
+conf_dir=params.knox_conf_dir,
+configurations=params.config['configurations']['hdfs-site'],
+
configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+owner=params.knox_user,
+group=params.knox_group,
+mode=0644
+  )
+else:
+  File(format('{knox_conf_dir}/hdfs-site.xml'), action="delete")
+
 if params.xml_configurations_supported:
   api_version=None
   if params.stack_supports_ranger_kerberos:

http://git-wip-us.apache.org/repos/asf/ambari/blob/bf4edcd7/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
index 1afe136..423cdec 100755
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
@@ -342,6 +342,8 @@ def kms(upgrade_type=None):
 group=params.kms_group,
 mode=0644
   )
+else:
+  File(format('{kms_conf_dir}/core-site.xml'), action="delete")
 
 def copy_jdbc_connector(stack_version=None):
   import params
@@ -504,6 +506,19 @@ def enable_kms_plugin():
   mode = 0640
   )
 
+if params.xa_audit_hdfs_is_enabled and len(params.namenode_host) > 1:
+  Logger.info('Audit to Hdfs enabled in NameNode HA environment, creating 
hdfs-site.xml')
+  XmlConfig("hdfs-site.xml",
+conf_dir=params.kms_conf_dir,
+configurations=params.config['configurations']['hdfs-site'],
+
configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+owner=params.kms_user,
+group=params.kms_group,
+mode=0644
+  )
+else:
+  File(format('{kms_conf_dir}/hdfs-site.xml'), action="delete")
+
 def setup_kms_jce():
   import params
 

ambari git commit: AMBARI-20369 Need hdfs-site for saving ranger audits to hdfs in namenode HA env (mugdha)

[mugdha]

Repository: ambari
Updated Branches:
  refs/heads/trunk dde658303 -> b4da19ea0


AMBARI-20369 Need hdfs-site for saving ranger audits to hdfs in namenode HA env 
(mugdha)


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

Branch: refs/heads/trunk
Commit: b4da19ea0b1bf87d5b91ad0520b822f00da26ab8
Parents: dde6583
Author: Mugdha Varadkar 
Authored: Thu Mar 9 15:08:05 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Mar 10 10:58:24 2017 +0530

--
 .../package/scripts/setup_ranger_knox.py  | 18 --
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py   | 15 +++
 .../0.5.0.2.3/package/scripts/params.py   |  5 -
 .../stacks/2.5/RANGER_KMS/test_kms_server.py  | 12 
 4 files changed, 47 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b4da19ea/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
index 67a1670..c486ef7 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
@@ -19,8 +19,9 @@ limitations under the License.
 """
 from resource_management.core.logger import Logger
 from resource_management.libraries.functions.setup_ranger_plugin_xml import 
setup_core_site_for_required_plugins
-
-
+from resource_management.core.resources import File
+from resource_management.libraries.resources.xml_config import XmlConfig
+from resource_management.libraries.functions.format import format
 
 def setup_ranger_knox(upgrade_type=None):
   import params
@@ -56,6 +57,19 @@ def setup_ranger_knox(upgrade_type=None):
 )
 params.HdfsResource(None, action="execute")
 
+if params.namenode_hosts is not None and len(params.namenode_hosts) > 
1:
+  Logger.info('Ranger Knox plugin is enabled in NameNode HA 
environment along with audit to Hdfs enabled, creating hdfs-site.xml')
+  XmlConfig("hdfs-site.xml",
+conf_dir=params.knox_conf_dir,
+configurations=params.config['configurations']['hdfs-site'],
+
configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+owner=params.knox_user,
+group=params.knox_group,
+mode=0644
+  )
+else:
+  File(format('{knox_conf_dir}/hdfs-site.xml'), action="delete")
+
 if params.xml_configurations_supported:
   api_version=None
   if params.stack_supports_ranger_kerberos:

http://git-wip-us.apache.org/repos/asf/ambari/blob/b4da19ea/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
index 1afe136..423cdec 100755
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
@@ -342,6 +342,8 @@ def kms(upgrade_type=None):
 group=params.kms_group,
 mode=0644
   )
+else:
+  File(format('{kms_conf_dir}/core-site.xml'), action="delete")
 
 def copy_jdbc_connector(stack_version=None):
   import params
@@ -504,6 +506,19 @@ def enable_kms_plugin():
   mode = 0640
   )
 
+if params.xa_audit_hdfs_is_enabled and len(params.namenode_host) > 1:
+  Logger.info('Audit to Hdfs enabled in NameNode HA environment, creating 
hdfs-site.xml')
+  XmlConfig("hdfs-site.xml",
+conf_dir=params.kms_conf_dir,
+configurations=params.config['configurations']['hdfs-site'],
+
configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+owner=params.kms_user,
+group=params.kms_group,
+mode=0644
+  )
+else:
+  File(format('{kms_conf_dir}/hdfs-site.xml'), action="delete")
+
 def setup_kms_jce():
   import params
 

ambari git commit: AMBARI-20385 : Grafana is storing credentials in plain text in its configuration. (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/trunk 5f3038138 -> dde658303


AMBARI-20385 : Grafana is storing credentials in plain text in its 
configuration. (avijayan)


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

Branch: refs/heads/trunk
Commit: dde6583030ddf3b28d543942b8df0216f3bec826
Parents: 5f30381
Author: Aravindan Vijayan 
Authored: Thu Mar 9 14:14:16 2017 -0800
Committer: Aravindan Vijayan 
Committed: Thu Mar 9 14:14:16 2017 -0800

--
 .../server/upgrade/UpgradeCatalog250.java   | 21 +
 .../0.1.0/configuration/ams-grafana-ini.xml |  2 +-
 .../0.1.0/package/scripts/metrics_grafana.py|  4 +-
 .../package/scripts/metrics_grafana_util.py | 42 ++
 .../server/upgrade/UpgradeCatalog250Test.java   | 87 
 5 files changed, 154 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dde65830/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 ca35c52..b217723 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
@@ -79,6 +79,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog 
{
   protected static final String GROUPS_TABLE = "groups";
   protected static final String GROUP_TYPE_COL = "group_type";
   private static final String AMS_ENV = "ams-env";
+  private static final String AMS_GRAFANA_INI = "ams-grafana-ini";
   private static final String AMS_SITE = "ams-site";
   private static final String AMS_LOG4J = "ams-log4j";
   private static final String AMS_HBASE_LOG4J = "ams-hbase-log4j";
@@ -511,6 +512,15 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 
updateConfigurationPropertiesForCluster(cluster,AMS_HBASE_LOG4J,newProperties,true,true);
   }
 
+  Config amsGrafanaIni = 
cluster.getDesiredConfigByType(AMS_GRAFANA_INI);
+  if (amsGrafanaIni != null) {
+Map amsGrafanaIniProperties = 
amsGrafanaIni.getProperties();
+String content = amsGrafanaIniProperties.get("content");
+Map newProperties = new HashMap<>();
+newProperties.put("content", updateAmsGrafanaIniContent(content));
+updateConfigurationPropertiesForCluster(cluster, AMS_GRAFANA_INI, 
newProperties, true, true);
+  }
+
 }
   }
 }
@@ -654,6 +664,17 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 }
   }
 
+  protected String updateAmsGrafanaIniContent(String content) {
+if (content == null) {
+  return null;
+}
+
+String toReplace = "admin_password = {{ams_grafana_admin_pwd}}";
+String replaceWith = ";admin_password =";
+content = content.replace(toReplace, replaceWith);
+return content;
+  }
+
   protected String updateAmsEnvContent(String content) {
 if (content == null) {
   return null;

http://git-wip-us.apache.org/repos/asf/ambari/blob/dde65830/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
index acbdf12..ee0a4ad 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
@@ -162,7 +162,7 @@ cert_key = {{ams_grafana_cert_key}}
 admin_user = {{ams_grafana_admin_user}}
 
 # default admin password, can be changed before first start of grafana,  or in 
profile settings
-admin_password = {{ams_grafana_admin_pwd}}
+;admin_password =
 
 # used for signing
 ;secret_key = SW2YcwTIb9zpOOhoPsMm

http://git-wip-us.apache.org/repos/asf/ambari/blob/dde65830/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
--
diff --git 

ambari git commit: AMBARI-20385 : Grafana is storing credentials in plain text in its configuration. (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 7c76aeb24 -> 6e0b234e3


AMBARI-20385 : Grafana is storing credentials in plain text in its 
configuration. (avijayan)


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

Branch: refs/heads/branch-2.5
Commit: 6e0b234e37aec4b9e0aaf8b325a168d7b477b98b
Parents: 7c76aeb
Author: Aravindan Vijayan 
Authored: Thu Mar 9 14:08:13 2017 -0800
Committer: Aravindan Vijayan 
Committed: Thu Mar 9 14:08:23 2017 -0800

--
 .../server/upgrade/UpgradeCatalog250.java   | 21 +
 .../0.1.0/configuration/ams-grafana-ini.xml |  2 +-
 .../0.1.0/package/scripts/metrics_grafana.py|  4 +-
 .../package/scripts/metrics_grafana_util.py | 43 ++
 .../server/upgrade/UpgradeCatalog250Test.java   | 87 
 5 files changed, 155 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6e0b234e/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 00d1c31..029009b 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
@@ -79,6 +79,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog 
{
   protected static final String GROUPS_TABLE = "groups";
   protected static final String GROUP_TYPE_COL = "group_type";
   private static final String AMS_ENV = "ams-env";
+  private static final String AMS_GRAFANA_INI = "ams-grafana-ini";
   private static final String AMS_SITE = "ams-site";
   private static final String AMS_LOG4J = "ams-log4j";
   private static final String AMS_HBASE_LOG4J = "ams-hbase-log4j";
@@ -455,6 +456,15 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 
updateConfigurationPropertiesForCluster(cluster,AMS_HBASE_LOG4J,newProperties,true,true);
   }
 
+  Config amsGrafanaIni = 
cluster.getDesiredConfigByType(AMS_GRAFANA_INI);
+  if (amsGrafanaIni != null) {
+Map amsGrafanaIniProperties = 
amsGrafanaIni.getProperties();
+String content = amsGrafanaIniProperties.get("content");
+Map newProperties = new HashMap<>();
+newProperties.put("content", updateAmsGrafanaIniContent(content));
+updateConfigurationPropertiesForCluster(cluster, AMS_GRAFANA_INI, 
newProperties, true, true);
+  }
+
 }
   }
 }
@@ -598,6 +608,17 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 }
   }
 
+  protected String updateAmsGrafanaIniContent(String content) {
+if (content == null) {
+  return null;
+}
+
+String toReplace = "admin_password = {{ams_grafana_admin_pwd}}";
+String replaceWith = ";admin_password =";
+content = content.replace(toReplace, replaceWith);
+return content;
+  }
+
   protected String updateAmsEnvContent(String content) {
 if (content == null) {
   return null;

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e0b234e/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
index da4599e..b4570b7 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml
@@ -159,7 +159,7 @@ cert_key = {{ams_grafana_cert_key}}
 admin_user = {{ams_grafana_admin_user}}
 
 # default admin password, can be changed before first start of grafana,  or in 
profile settings
-admin_password = {{ams_grafana_admin_pwd}}
+;admin_password =
 
 # used for signing
 ;secret_key = SW2YcwTIb9zpOOhoPsMm

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e0b234e/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
--
diff --git 

ambari git commit: AMBARI-20356. Description incorrect for result class (wangyaoxin via alejandro)

[alejandro]

Repository: ambari
Updated Branches:
  refs/heads/trunk 4e864047d -> 5f3038138


AMBARI-20356. Description incorrect for result class (wangyaoxin via alejandro)


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

Branch: refs/heads/trunk
Commit: 5f3038138f8431350ff3a8fe45fffd6c7e331983
Parents: 4e86404
Author: Alejandro Fernandez 
Authored: Thu Mar 9 14:02:00 2017 -0800
Committer: Alejandro Fernandez 
Committed: Thu Mar 9 14:02:02 2017 -0800

--
 .../main/java/org/apache/ambari/server/api/services/Result.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5f303813/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java
index 8355dcf..9cdcf63 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java
@@ -30,7 +30,7 @@ public interface Result {
   /**
* Obtain the results of the request invocation as a Tree structure.
*
-   * @return the results of the request a a Tree structure
+   * @return the results of the request as a Tree structure
*/
   TreeNode getResultTree();
 

ambari git commit: Revert "AMBARI-20322 HDP 3.0 TP - create Service Advisor for Slider (dsen)"

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/trunk 6cfad94cc -> 4e864047d


Revert "AMBARI-20322 HDP 3.0 TP - create Service Advisor for Slider (dsen)"

This reverts commit e3405474324d021223c3e6bb8353a50528cc0c48.


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

Branch: refs/heads/trunk
Commit: 4e864047de5028b634ace49de59579bed2a5212e
Parents: 6cfad94
Author: Jonathan Hurley 
Authored: Thu Mar 9 16:40:14 2017 -0500
Committer: Jonathan Hurley 
Committed: Thu Mar 9 16:44:22 2017 -0500

--
 .../SLIDER/0.91.0.3.0/service_advisor.py| 133 ---
 1 file changed, 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4e864047/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/service_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/service_advisor.py
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/service_advisor.py
deleted file mode 100644
index 6122f14..000
--- 
a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/service_advisor.py
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/env ambari-python-wrap
-"""
-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.
-"""
-
-# Python imports
-import imp
-import os
-import traceback
-
-
-from resource_management.core.logger import Logger
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-STACKS_DIR = os.path.join(SCRIPT_DIR, '../../../stacks/')
-PARENT_FILE = os.path.join(STACKS_DIR, 'service_advisor.py')
-
-try:
-  with open(PARENT_FILE, 'rb') as fp:
-service_advisor = imp.load_module('service_advisor', fp, PARENT_FILE, 
('.py', 'rb', imp.PY_SOURCE))
-except Exception as e:
-  traceback.print_exc()
-  print "Failed to load parent"
-
-
-class SliderServiceAdvisor(service_advisor.ServiceAdvisor):
-
-  def __init__(self, *args, **kwargs):
-self.as_super = super(SliderServiceAdvisor, self)
-self.as_super.__init__(*args, **kwargs)
-
-# Always call these methods
-self.modifyMastersWithMultipleInstances()
-self.modifyCardinalitiesDict()
-self.modifyHeapSizeProperties()
-self.modifyNotValuableComponents()
-self.modifyComponentsNotPreferableOnServer()
-self.modifyComponentLayoutSchemes()
-
-  def modifyMastersWithMultipleInstances(self):
-"""
-Modify the set of masters with multiple instances.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def modifyCardinalitiesDict(self):
-"""
-Modify the dictionary of cardinalities.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def modifyHeapSizeProperties(self):
-"""
-Modify the dictionary of heap size properties.
-Must be overriden in child class.
-"""
-self.heap_size_properties = {}
-
-  def modifyNotValuableComponents(self):
-"""
-Modify the set of components whose host assignment is based on other 
services.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def modifyComponentsNotPreferableOnServer(self):
-"""
-Modify the set of components that are not preferable on the server.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def modifyComponentLayoutSchemes(self):
-"""
-Modify layout scheme dictionaries for components.
-The scheme dictionary basically maps the number of hosts to
-host index where component should exist.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def getServiceComponentLayoutValidations(self, services, hosts):
-"""
-Get a list of errors.
-Must be overriden in child class.
-"""
-# Nothing to do
-return []
-
-  def getServiceConfigurationRecommendations(self, configurations, 
clusterData, 

ambari git commit: AMBARI-20364. UI labels for SPARK and SPARK2 users in Customize Service Misc page and Service accounts page (Mingjie Tang via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/trunk 53e77ef5e -> 6cfad94cc


AMBARI-20364. UI labels for SPARK and SPARK2 users in Customize Service Misc 
page and Service accounts page (Mingjie Tang via smohanty)


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

Branch: refs/heads/trunk
Commit: 6cfad94cc20631960b50454cc95b7e5f71ca461b
Parents: 53e77ef
Author: Sumit Mohanty 
Authored: Thu Mar 9 13:02:01 2017 -0800
Committer: Sumit Mohanty 
Committed: Thu Mar 9 13:02:38 2017 -0800

--
 .../common-services/SPARK2/2.0.0/configuration/spark2-env.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6cfad94c/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
index aa9ab50..35d364f 100755
--- 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
@@ -22,7 +22,7 @@
 
   
 spark_user
-Spark User
+Spark2 User
 spark
 USER
 
@@ -33,10 +33,10 @@
   
   
 spark_group
-Spark Group
+Spark2 Group
 spark
 GROUP
-spark group
+spark2 group
 
   user
 

ambari git commit: AMBARI-20364. UI labels for SPARK and SPARK2 users in Customize Service Misc page and Service accounts page (Mingjie Tang via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 fcad14b39 -> 7c76aeb24


AMBARI-20364. UI labels for SPARK and SPARK2 users in Customize Service Misc 
page and Service accounts page (Mingjie Tang via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 7c76aeb24d081125672722f48708901f58d9abfc
Parents: fcad14b
Author: Sumit Mohanty 
Authored: Thu Mar 9 13:02:01 2017 -0800
Committer: Sumit Mohanty 
Committed: Thu Mar 9 13:02:01 2017 -0800

--
 .../common-services/SPARK2/2.0.0/configuration/spark2-env.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7c76aeb2/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
index aa9ab50..35d364f 100755
--- 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml
@@ -22,7 +22,7 @@
 
   
 spark_user
-Spark User
+Spark2 User
 spark
 USER
 
@@ -33,10 +33,10 @@
   
   
 spark_group
-Spark Group
+Spark2 Group
 spark
 GROUP
-spark group
+spark2 group
 
   user
 

ambari git commit: AMBARI-20287 - Filter in Customize Services Page doesn't bring up all properties that matches (rzang)

[rzang]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 17ef55594 -> fcad14b39


AMBARI-20287 - Filter in Customize Services Page doesn't bring up all 
properties that matches (rzang)


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

Branch: refs/heads/branch-2.5
Commit: fcad14b39e55137912fee51a946b2b85f5140d0e
Parents: 17ef555
Author: Richard Zang 
Authored: Thu Mar 9 11:51:45 2017 -0800
Committer: Richard Zang 
Committed: Thu Mar 9 11:57:15 2017 -0800

--
 .../app/models/configs/theme/sub_section.js |   2 +-
 .../app/models/configs/theme/sub_section_tab.js |   9 +-
 .../configs/service_config_layout_tab_view.js   |   4 +-
 .../configs/theme/sub_section_tab_test.js   | 198 +++
 4 files changed, 209 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fcad14b3/ambari-web/app/models/configs/theme/sub_section.js
--
diff --git a/ambari-web/app/models/configs/theme/sub_section.js 
b/ambari-web/app/models/configs/theme/sub_section.js
index 7274569..591a3e9 100644
--- a/ambari-web/app/models/configs/theme/sub_section.js
+++ b/ambari-web/app/models/configs/theme/sub_section.js
@@ -181,7 +181,7 @@ App.SubSection = DS.Model.extend({
 var configs = this.get('configs').filter(function(c) {
   return !c.get('hiddenBySection') && c.get('isVisible');
 });
-return configs.length ? configs.everyProperty('isHiddenByFilter', true) : 
false;
+return configs.length ? configs.everyProperty('isHiddenByFilter', true) && 
!this.get('someSubSectionTabIsVisible'): false;
   }.property('configs.@each.isHiddenByFilter'),
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/fcad14b3/ambari-web/app/models/configs/theme/sub_section_tab.js
--
diff --git a/ambari-web/app/models/configs/theme/sub_section_tab.js 
b/ambari-web/app/models/configs/theme/sub_section_tab.js
index 2262882..9062457 100644
--- a/ambari-web/app/models/configs/theme/sub_section_tab.js
+++ b/ambari-web/app/models/configs/theme/sub_section_tab.js
@@ -81,7 +81,10 @@ App.SubSectionTab = DS.Model.extend({
* If there is no configs, subsection can't be hidden
* @type {boolean}
*/
-  isHiddenByFilter: Em.computed.everyBy('visibleProperties', 
'isHiddenByFilter', true),
+  isHiddenByFilter: function () {
+var configs = this.get('visibleProperties');
+return configs.length ? configs.everyProperty('isHiddenByFilter', true) : 
false;
+  }.property('configs.@each.isHiddenByFilter').volatile(),
 
   /**
* @type {boolean}
@@ -92,7 +95,9 @@ App.SubSectionTab = DS.Model.extend({
* Determines if subsection is visible
* @type {boolean}
*/
-  isVisible: Em.computed.and('!isHiddenByFilter', '!isHiddenByConfig', 
'someConfigIsVisible')
+  isVisible: function() {
+return !this.get('isHiddenByFilter') && !this.get('isHiddenByConfig') && 
this.get('someConfigIsVisible');
+  }.property('isHiddenByFilter', 'isHiddenByConfig', 
'someConfigIsVisible').volatile()
 
 });
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fcad14b3/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
--
diff --git 
a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js 
b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
index 466a88d..ccbb148 100644
--- a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
+++ b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
@@ -182,7 +182,9 @@ App.ServiceConfigLayoutTabView = 
Em.View.extend(App.ConfigOverridable, {
* @param event
*/
   setActiveSubTab: function(event) {
-if (!event.context) return;
+if (!event.context || !event.context.get('isVisible')) {
+  return false;
+}
 try {
   event.context.get('subSection.subSectionTabs').setEach('isActive', 
false);
   event.context.set('isActive', true);

http://git-wip-us.apache.org/repos/asf/ambari/blob/fcad14b3/ambari-web/test/models/configs/theme/sub_section_tab_test.js
--
diff --git a/ambari-web/test/models/configs/theme/sub_section_tab_test.js 
b/ambari-web/test/models/configs/theme/sub_section_tab_test.js
new file mode 100644
index 000..d65cd76
--- /dev/null
+++ b/ambari-web/test/models/configs/theme/sub_section_tab_test.js
@@ -0,0 +1,198 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or 

ambari git commit: AMBARI-20287 - Filter in Customize Services Page doesn't bring up all properties that matches (rzang)

[rzang]

Repository: ambari
Updated Branches:
  refs/heads/trunk c4ca3b890 -> 53e77ef5e


AMBARI-20287 - Filter in Customize Services Page doesn't bring up all 
properties that matches (rzang)


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

Branch: refs/heads/trunk
Commit: 53e77ef5e19ddfd11630323d7e94edf448c27f50
Parents: c4ca3b8
Author: Richard Zang 
Authored: Thu Mar 9 11:51:45 2017 -0800
Committer: Richard Zang 
Committed: Thu Mar 9 11:51:45 2017 -0800

--
 .../app/models/configs/theme/sub_section.js |  2 +-
 .../app/models/configs/theme/sub_section_tab.js |  9 -
 .../configs/service_config_layout_tab_view.js   |  4 +-
 .../configs/theme/sub_section_tab_test.js   | 41 +---
 4 files changed, 46 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/53e77ef5/ambari-web/app/models/configs/theme/sub_section.js
--
diff --git a/ambari-web/app/models/configs/theme/sub_section.js 
b/ambari-web/app/models/configs/theme/sub_section.js
index 7274569..591a3e9 100644
--- a/ambari-web/app/models/configs/theme/sub_section.js
+++ b/ambari-web/app/models/configs/theme/sub_section.js
@@ -181,7 +181,7 @@ App.SubSection = DS.Model.extend({
 var configs = this.get('configs').filter(function(c) {
   return !c.get('hiddenBySection') && c.get('isVisible');
 });
-return configs.length ? configs.everyProperty('isHiddenByFilter', true) : 
false;
+return configs.length ? configs.everyProperty('isHiddenByFilter', true) && 
!this.get('someSubSectionTabIsVisible'): false;
   }.property('configs.@each.isHiddenByFilter'),
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/53e77ef5/ambari-web/app/models/configs/theme/sub_section_tab.js
--
diff --git a/ambari-web/app/models/configs/theme/sub_section_tab.js 
b/ambari-web/app/models/configs/theme/sub_section_tab.js
index 2262882..9062457 100644
--- a/ambari-web/app/models/configs/theme/sub_section_tab.js
+++ b/ambari-web/app/models/configs/theme/sub_section_tab.js
@@ -81,7 +81,10 @@ App.SubSectionTab = DS.Model.extend({
* If there is no configs, subsection can't be hidden
* @type {boolean}
*/
-  isHiddenByFilter: Em.computed.everyBy('visibleProperties', 
'isHiddenByFilter', true),
+  isHiddenByFilter: function () {
+var configs = this.get('visibleProperties');
+return configs.length ? configs.everyProperty('isHiddenByFilter', true) : 
false;
+  }.property('configs.@each.isHiddenByFilter').volatile(),
 
   /**
* @type {boolean}
@@ -92,7 +95,9 @@ App.SubSectionTab = DS.Model.extend({
* Determines if subsection is visible
* @type {boolean}
*/
-  isVisible: Em.computed.and('!isHiddenByFilter', '!isHiddenByConfig', 
'someConfigIsVisible')
+  isVisible: function() {
+return !this.get('isHiddenByFilter') && !this.get('isHiddenByConfig') && 
this.get('someConfigIsVisible');
+  }.property('isHiddenByFilter', 'isHiddenByConfig', 
'someConfigIsVisible').volatile()
 
 });
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/53e77ef5/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
--
diff --git 
a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js 
b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
index 466a88d..ccbb148 100644
--- a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
+++ b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
@@ -182,7 +182,9 @@ App.ServiceConfigLayoutTabView = 
Em.View.extend(App.ConfigOverridable, {
* @param event
*/
   setActiveSubTab: function(event) {
-if (!event.context) return;
+if (!event.context || !event.context.get('isVisible')) {
+  return false;
+}
 try {
   event.context.get('subSection.subSectionTabs').setEach('isActive', 
false);
   event.context.set('isActive', true);

http://git-wip-us.apache.org/repos/asf/ambari/blob/53e77ef5/ambari-web/test/models/configs/theme/sub_section_tab_test.js
--
diff --git a/ambari-web/test/models/configs/theme/sub_section_tab_test.js 
b/ambari-web/test/models/configs/theme/sub_section_tab_test.js
index 0c3b98c..d65cd76 100644
--- a/ambari-web/test/models/configs/theme/sub_section_tab_test.js
+++ b/ambari-web/test/models/configs/theme/sub_section_tab_test.js
@@ -160,10 +160,39 @@ describe('App.SubSectionTab', function () {
 

ambari git commit: AMBARI-18892. Summary:storm DRPC_SERVER kerberos configs duplicate (Wang Yaoxin via rlevas)

[rlevas]

Repository: ambari
Updated Branches:
  refs/heads/trunk e2220ea8a -> c4ca3b890


AMBARI-18892. Summary:storm DRPC_SERVER kerberos configs duplicate (Wang Yaoxin 
via rlevas)


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

Branch: refs/heads/trunk
Commit: c4ca3b8908c9b71a88de47400aebb874e66e17b6
Parents: e2220ea
Author: Wang Yaoxin 
Authored: Thu Mar 9 12:52:37 2017 -0500
Committer: Robert Levas 
Committed: Thu Mar 9 12:58:10 2017 -0500

--
 .../common-services/STORM/0.9.1/kerberos.json   | 20 ++-
 .../common-services/STORM/1.0.1/kerberos.json   | 20 ++-
 .../data/stacks/HDP-2.1/service_components.json | 21 ++--
 3 files changed, 6 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c4ca3b89/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json
index 20cc32d..692b557 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json
@@ -90,24 +90,8 @@
   "name": "DRPC_SERVER",
   "identities": [
 {
-  "name": "nimbus_server",
-  "principal": {
-"value": "nimbus/_HOST@${realm}",
-"type": "service",
-"configuration": "storm-env/nimbus_principal_name"
-  },
-  "keytab": {
-"file": "${keytab_dir}/nimbus.service.keytab",
-"owner": {
-  "name": "${storm-env/storm_user}",
-  "access": "r"
-},
-"group": {
-  "name": "${cluster-env/user_group}",
-  "access": ""
-},
-"configuration": "storm-env/nimbus_keytab"
-  }
+  "name": "drpc_server",
+  "reference": "/STORM/NIMBUS/nimbus_server"
 }
   ]
 },

http://git-wip-us.apache.org/repos/asf/ambari/blob/c4ca3b89/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json 
b/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json
index fa2f6db..a034411 100644
--- a/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json
@@ -120,24 +120,8 @@
   "name": "DRPC_SERVER",
   "identities": [
 {
-  "name": "nimbus_server",
-  "principal": {
-"value": "nimbus/_HOST@${realm}",
-"type": "service",
-"configuration": "storm-env/nimbus_principal_name"
-  },
-  "keytab": {
-"file": "${keytab_dir}/nimbus.service.keytab",
-"owner": {
-  "name": "${storm-env/storm_user}",
-  "access": "r"
-},
-"group": {
-  "name": "${cluster-env/user_group}",
-  "access": ""
-},
-"configuration": "storm-env/nimbus_keytab"
-  }
+  "name": "drpc_server",
+  "reference": "/STORM/NIMBUS/nimbus_server"
 }
   ]
 },

http://git-wip-us.apache.org/repos/asf/ambari/blob/c4ca3b89/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
--
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json 
b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
index 0a8f20b..7d0ced4 100644
--- a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
+++ b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
@@ -2444,25 +2444,8 @@
 {
   "identities" : [
 {
-  "principal" : {
-"configuration" : "storm-env/nimbus_principal_name",
-"type" : "service",
-"local_username" : null,
-"value" : "nimbus/_HOST@${realm}"
-  },
-  

[33/50] [abbrv] ambari git commit: AMBARI-20345 - Alert Event Publisher Executor Doesn't Scale Threads (part2) (jonathanhurley)

[oleewere]

AMBARI-20345 - Alert Event Publisher Executor Doesn't Scale Threads (part2) 
(jonathanhurley)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 60095bc29b21ca92a4dfb6c3ce60f398896a0e43
Parents: 8eaaf80
Author: Jonathan Hurley 
Authored: Wed Mar 8 07:52:38 2017 -0500
Committer: Jonathan Hurley 
Committed: Wed Mar 8 07:53:44 2017 -0500

--
 .../java/org/apache/ambari/server/orm/dao/AlertsDAOCachedTest.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/60095bc2/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOCachedTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOCachedTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOCachedTest.java
index f47a997..cb5f143 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOCachedTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOCachedTest.java
@@ -17,8 +17,6 @@
  */
 package org.apache.ambari.server.orm.dao;
 
-import static org.easymock.EasyMock.expect;
-
 import java.util.List;
 
 import javax.persistence.EntityManager;

[17/50] [abbrv] ambari git commit: AMBARI-20338. Alert Definition Name with brackets marked as invalid (onechiporenko)

[oleewere]

AMBARI-20338. Alert Definition Name with brackets marked as invalid 
(onechiporenko)


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

Branch: refs/heads/branch-dev-logsearch
Commit: b9451a4b87ab680219d1790d7b2a091e9c330da0
Parents: bf25d31
Author: Oleg Nechiporenko 
Authored: Tue Mar 7 12:24:31 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Tue Mar 7 13:13:06 2017 +0200

--
 ambari-web/app/messages.js  |  2 +-
 ambari-web/app/utils/validator.js   |  2 +-
 ambari-web/test/utils/validator_test.js | 22 ++
 3 files changed, 24 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b9451a4b/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6684f32..83cc85c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1123,7 +1123,7 @@ Em.I18n.translations = {
   'alerts.definition.name': 'Alert Definition Name',
   'alerts.saveChanges': 'You have unsaved changes',
 
-  'alert.definition.name.invalid': 'Invalid input. Only alphanumerics, 
underscores, hyphens, percentage and spaces are allowed.',
+  'alert.definition.name.invalid': 'Invalid input. Only alphanumerics, 
underscores, hyphens, percentage, brackets and spaces are allowed. Value should 
be less than 255 symbols.',
   'alerts.definition.details.enable': 'Enable',
   'alerts.definition.details.disable': 'Disable',
   'alerts.definition.details.enableDisable': 'Enable / Disable',

http://git-wip-us.apache.org/repos/asf/ambari/blob/b9451a4b/ambari-web/app/utils/validator.js
--
diff --git a/ambari-web/app/utils/validator.js 
b/ambari-web/app/utils/validator.js
index 774215b..dd3d6c0 100644
--- a/ambari-web/app/utils/validator.js
+++ b/ambari-web/app/utils/validator.js
@@ -322,7 +322,7 @@ module.exports = {
* @returns {boolean}
*/
   isValidAlertName: function(value) {
-var alertNameRegex = /^[\s0-9a-z_\-%]+$/i;
+var alertNameRegex = /^[\s0-9a-z_\-%\(\)]+$/i;
 return alertNameRegex.test(value);
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b9451a4b/ambari-web/test/utils/validator_test.js
--
diff --git a/ambari-web/test/utils/validator_test.js 
b/ambari-web/test/utils/validator_test.js
index f0167da..2cb7750 100644
--- a/ambari-web/test/utils/validator_test.js
+++ b/ambari-web/test/utils/validator_test.js
@@ -500,4 +500,26 @@ describe('validator', function () {
   })
 });
   });
+
+  describe('#isValidAlertName', function () {
+
+[
+  {v: '', e: false},
+  {v: 'a', e: true},
+  {v: 'a b', e: true},
+  {v: '/', e: false},
+  {v: '/>1', e: false},
+  {v: 'a 1%', e: true},
+  {v: 'a (b)', e: true}
+].forEach(function (test) {
+
+  it(test.m || test.v, function () {
+expect(validator.isValidAlertName(test.v)).to.be.equal(test.e);
+  })
+
+});
+
+
+  });
+
 });

[26/50] [abbrv] ambari git commit: AMBARI-20180. HDFS SecurityLogger messages are logged twice (Arpit Agarwal via smohanty)

[oleewere]

AMBARI-20180. HDFS SecurityLogger messages are logged twice (Arpit Agarwal via 
smohanty)


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

Branch: refs/heads/branch-dev-logsearch
Commit: cb1ba69e721326bfb4ef3531e8a9e509f36dbb4d
Parents: ee6c5d8
Author: Sumit Mohanty 
Authored: Tue Mar 7 16:52:55 2017 -0800
Committer: Sumit Mohanty 
Committed: Tue Mar 7 16:53:57 2017 -0800

--
 .../stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml  | 1 +
 .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml  | 6 ++
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 4 
 .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml  | 5 +
 .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 5 +
 .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
 .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml  | 5 +
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 5 +
 .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
 .../HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml  | 1 +
 11 files changed, 35 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cb1ba69e/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
index 280c43a..9e48acc 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
@@ -158,6 +158,7 @@ 
hadoop.security.log.maxfilesize={{hadoop_security_log_max_backup_size}}MB
 
hadoop.security.log.maxbackupindex={{hadoop_security_log_number_of_backup_files}}
 log4j.category.SecurityLogger=${hadoop.security.logger}
 hadoop.security.log.file=SecurityAuth.audit
+log4j.additivity.SecurityLogger=false
 log4j.appender.DRFAS=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.DRFAS.File=${hadoop.log.dir}/${hadoop.security.log.file}
 log4j.appender.DRFAS.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/ambari/blob/cb1ba69e/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 96a95fb..eeb10fc 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -374,6 +374,12 @@
 hadoop-env
 
   
+
+  
+hdfs-log4j
+
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/cb1ba69e/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 40ef43d..c8f93e4 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -293,6 +293,10 @@
 
   
 
+  
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/cb1ba69e/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index fb5e584..da5265d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -672,6 +672,7 @@
   
   
   
+  
 
 
  

[13/50] [abbrv] ambari git commit: AMBARI-19433. Increase default timeout and threadpool size for the external script to work on slower machines. (jaimin)

[oleewere]

AMBARI-19433. Increase default timeout and threadpool size for the external 
script to work on slower machines. (jaimin)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 23bd4187cb8442bcc06fd20469e9f8b77158a4cf
Parents: 8e68824
Author: Jaimin Jetly 
Authored: Mon Mar 6 11:41:27 2017 -0800
Committer: Jaimin Jetly 
Committed: Mon Mar 6 11:42:18 2017 -0800

--
 .../org/apache/ambari/server/configuration/Configuration.java| 4 ++--
 .../server/controller/internal/ClientConfigResourceProvider.java | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/23bd4187/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 27ac82c..cfb4d3d 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
@@ -1754,7 +1754,7 @@ public class Configuration {
*/
   @Markdown(description = "The time, in milliseconds, until an external script 
is killed.")
   public static final ConfigurationProperty EXTERNAL_SCRIPT_TIMEOUT = 
new ConfigurationProperty<>(
-  "server.script.timeout", 5000);
+  "server.script.timeout", 1);
 
   /**
* The time, in {@link TimeUnit#MILLISECONDS}, until an external script is 
killed.
@@ -1762,7 +1762,7 @@ public class Configuration {
*/
   @Markdown(description = "The number of threads that should be allocated to 
run external script.")
   public static final ConfigurationProperty 
THREAD_POOL_SIZE_FOR_EXTERNAL_SCRIPT = new ConfigurationProperty<>(
-"server.script.threads", 4);
+"server.script.threads", 20);
 
   public static final String DEF_ARCHIVE_EXTENSION;
   public static final String DEF_ARCHIVE_CONTENT_TYPE;

http://git-wip-us.apache.org/repos/asf/ambari/blob/23bd4187/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 42e9b34..b690e3a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -479,7 +479,8 @@ public class ClientConfigResourceProvider extends 
AbstractControllerResourceProv
   throw new SystemException("No configuration files defined for any 
component" );
 }
 
-Integer threadPoolSize = configs.getExternalScriptThreadPoolSize();
+Integer totalCommands = pythonCompressFilesCmds.size() * 2;
+Integer threadPoolSize = 
Math.min(totalCommands,configs.getExternalScriptThreadPoolSize());
 ExecutorService processExecutor = 
Executors.newFixedThreadPool(threadPoolSize);
 
 // put all threads that starts process to compress each component config 
files in the executor

[40/50] [abbrv] ambari git commit: AMBARI-20330 : Unit test failures - testThreadPoolEnabledPropertyProviderDefaults & testMetricsRetrieveServiceDefaults. (avijayan)

[oleewere]

AMBARI-20330 : Unit test failures - 
testThreadPoolEnabledPropertyProviderDefaults & 
testMetricsRetrieveServiceDefaults. (avijayan)


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

Branch: refs/heads/branch-dev-logsearch
Commit: ec33f228a8213a0820af25290219fa13cabb974a
Parents: 6910263
Author: Aravindan Vijayan 
Authored: Wed Mar 8 12:41:13 2017 -0800
Committer: Aravindan Vijayan 
Committed: Wed Mar 8 12:41:23 2017 -0800

--
 .../apache/ambari/server/configuration/ConfigurationTest.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ec33f228/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
index 5f6dd72..b9288d2 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
@@ -866,7 +866,7 @@ public class ConfigurationTest {
 Assert.assertTrue(completionServiceTimeout >= 
SMALLEST_COMPLETION_SERIVCE_TIMEOUT_MS);
 Assert.assertTrue(completionServiceTimeout <= 
LARGEST_COMPLETION_SERIVCE_TIMEOUT_MS);
 Assert.assertTrue(corePoolSize <= maxPoolSize);
-Assert.assertTrue(corePoolSize > 2 && corePoolSize <= 32);
+Assert.assertTrue(corePoolSize > 2 && corePoolSize <= 128);
 Assert.assertTrue(maxPoolSize > 2 && maxPoolSize <= processorCount * 4);
 Assert.assertTrue(workerQueueSize > processorCount * 10);
   }
@@ -902,7 +902,7 @@ public class ConfigurationTest {
 Assert.assertTrue(priority > Thread.MIN_PRIORITY);
 
 Assert.assertTrue(cacheTimeout >= LOWEST_CACHE_TIMEOUT_MINUTES);
-Assert.assertTrue(corePoolSize > 2 && corePoolSize <= 32);
+Assert.assertTrue(corePoolSize > 2 && corePoolSize <= 128);
 Assert.assertTrue(maxPoolSize > 2 && maxPoolSize <= processorCount * 4);
 Assert.assertTrue(workerQueueSize >= processorCount * 10);
   }

[49/50] [abbrv] ambari git commit: AMBARI-20376. While Moving Namenode via Move Master wizard, datanodes reported as down (alexantonenko)

[oleewere]

AMBARI-20376. While Moving Namenode via Move Master wizard, datanodes reported 
as down (alexantonenko)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 221ad2830f1ce3f82508ac92a226f8d4b784fd5c
Parents: 47f9243
Author: Alex Antonenko 
Authored: Thu Mar 9 14:32:10 2017 +0200
Committer: Alex Antonenko 
Committed: Thu Mar 9 17:12:07 2017 +0200

--
 .../controllers/main/service/reassign/step6_controller.js   | 9 +
 ambari-web/app/messages.js  | 1 +
 .../app/mixins/wizard/wizardProgressPageController.js   | 6 +++---
 3 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/221ad283/ambari-web/app/controllers/main/service/reassign/step6_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step6_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
index 80f1bf6..05494d4 100644
--- a/ambari-web/app/controllers/main/service/reassign/step6_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
@@ -27,6 +27,7 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
 'putHostComponentsInMaintenanceMode',
 'stopHostComponentsInMaintenanceMode',
 'deleteHostComponents',
+'startDatanodes',
 'startAllServices'
   ],
 
@@ -97,6 +98,9 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
 } else {
   this.removeTasks(['stopHostComponentsInMaintenanceMode']);
 }
+if (!(this.get('content.reassign.component_name') === 'NAMENODE' && 
App.get('isHaEnabled'))) {
+  this.removeTasks(['startDatanodes']);
+}
   },
 
   hideRollbackButton: function () {
@@ -200,5 +204,10 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
   success: 'startPolling',
   error: 'onTaskError'
 });
+  },
+
+  startDatanodes: function () {
+this.updateComponent('DATANODE', null, 'HDFS', 'Start');
   }
+
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/221ad283/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 83cc85c..20f7757 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2396,6 +2396,7 @@ Em.I18n.translations = {
   'services.reassign.step6.tasks.installPxf.title': 'Install PXF on NameNode',
   'services.reassign.step6.tasks.stopMysqlService.title': 'Stop Mysql Server',
   'services.reassign.step6.tasks.stopHostComponentsInMaintenanceMode.title': 
'Stop {0}',
+  'services.reassign.step6.tasks.startDatanodes.title': 'Start DataNodes',
   'services.reassign.step6.status.success': 'Successfully moved {0} 
from {1} host to {2} host.',
   'services.reassign.step6.status.failed': 'Failed to move {0} from 
{1} host to {2} host.',
   'services.reassign.step6.status.info': 'Reassigning {0}. \nPlease wait for 
all tasks to be completed.',

http://git-wip-us.apache.org/repos/asf/ambari/blob/221ad283/ambari-web/app/mixins/wizard/wizardProgressPageController.js
--
diff --git a/ambari-web/app/mixins/wizard/wizardProgressPageController.js 
b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
index ced5591..9d9d000 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -604,14 +604,14 @@ App.wizardProgressPageControllerMixin = 
Em.Mixin.create(App.InstallComponent, {
* Update component status on selected hosts.
*
* @param {string} componentName
-   * @param {(string|string[])} hostName
+   * @param {(string|string[]|null)} hostName - use null to update components 
on all hosts
* @param {string} serviceName
* @param {string} context
* @param {number} taskNum
* @returns {$.ajax}
*/
   updateComponent: function (componentName, hostName, serviceName, context, 
taskNum) {
-if (!(hostName instanceof Array)) {
+if (hostName && !(hostName instanceof Array)) {
   hostName = [hostName];
 }
 var state = context.toLowerCase() == "start" ? "STARTED" : "INSTALLED";
@@ -622,7 +622,7 @@ App.wizardProgressPageControllerMixin = 
Em.Mixin.create(App.InstallComponent, {
 HostRoles: {
   state: state
 },
-query: 'HostRoles/component_name=' + componentName + 

[24/50] [abbrv] ambari git commit: AMBARI-20345 - Alert Event Publisher Executor Doesn't Scale Threads (jonathanhurley)

[oleewere]

AMBARI-20345 - Alert Event Publisher Executor Doesn't Scale Threads 
(jonathanhurley)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 07a30a12b6b7b091e735f9688ebc6934d4b9cf23
Parents: dff7754
Author: Jonathan Hurley 
Authored: Tue Mar 7 11:59:13 2017 -0500
Committer: Jonathan Hurley 
Committed: Tue Mar 7 14:43:11 2017 -0500

--
 ambari-server/docs/configuration/index.md   |  12 +-
 .../server/configuration/Configuration.java | 134 +--
 .../events/publishers/AlertEventPublisher.java  |  21 +--
 .../internal/AlertResourceProviderTest.java |   4 +-
 .../server/orm/dao/AlertsDAOCachedTest.java |   6 +-
 .../services/CachedAlertFlushServiceTest.java   |   7 +-
 6 files changed, 126 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/07a30a12/ambari-server/docs/configuration/index.md
--
diff --git a/ambari-server/docs/configuration/index.md 
b/ambari-server/docs/configuration/index.md
index 58eb7c7..f836fc9 100644
--- a/ambari-server/docs/configuration/index.md
+++ b/ambari-server/docs/configuration/index.md
@@ -54,7 +54,9 @@ The following are the properties which can be used to 
configure Ambari.
 | alerts.cache.enabled | Determines whether current alerts should be cached. 
Enabling this can increase performance on large cluster, but can also result in 
lost alert data if the cache is not flushed frequently. |`false` | 
 | alerts.cache.flush.interval | The time, in minutes, after which cached alert 
information is flushed to the database This property is related to 
`alerts.cache.enabled`. |`10` | 
 | alerts.cache.size | The size of the alert cache. This property is 
related to `alerts.cache.enabled`. |`5` | 
-| alerts.execution.scheduler.maxThreads | The number of threads used to handle 
alerts received from the Ambari Agents. The value should be increased as the 
size of the cluster increases. |`2` | 
+| alerts.execution.scheduler.threadpool.size.core | The core number of threads 
used to process incoming alert events. The value should be increased as the 
size of the cluster increases. |`2` | 
+| alerts.execution.scheduler.threadpool.size.max | The number of threads used 
to handle alerts received from the Ambari Agents. The value should be increased 
as the size of the cluster increases. |`2` | 
+| alerts.execution.scheduler.threadpool.worker.size | The number of queued 
alerts allowed before discarding old alerts which have not been handled. The 
value should be increased as the size of the cluster increases. |`2000` | 
 | alerts.snmp.dispatcher.udp.port | The UDP port to use when binding the SNMP 
dispatcher on Ambari Server startup. If no port is specified, then a random 
port will be used. | | 
 | alerts.template.file | The full path to the XML file that describes the 
different alert templates. | | 
 | ambari.display.url | The URL to use when creating messages which should 
include the Ambari Server URL.The following are examples of valid 
values:`http://ambari.apache.org:8080` | | 
@@ -244,8 +246,8 @@ The following are the properties which can be used to 
configure Ambari.
 | server.property-provider.threadpool.size.core | The core number of threads 
that will be used to retrieve data from federated datasources, such as remote 
JMX endpoints. |`16` | 
 | server.property-provider.threadpool.size.max | The maximum number of threads 
that will be used to retrieve data from federated datasources, such as remote 
JMX endpoints. |`32` | 
 | server.property-provider.threadpool.worker.size | The maximum size of 
pending federated datasource requests, such as those to JMX endpoints, which 
can be queued before rejecting new requests. |`2147483647` | 
-| server.script.threads | The number of threads that should be allocated to 
run external script. |`4` | 
-| server.script.timeout | The time, in milliseconds, until an external script 
is killed. |`5000` | 
+| server.script.threads | The number of threads that should be allocated to 
run external script. |`20` | 
+| server.script.timeout | The time, in milliseconds, until an external script 
is killed. |`1` | 
 | server.stage.command.execution_type | How to execute commands in one stage 
|`STAGE` | 
 | server.stages.parallel | Determines whether operations in different 
execution requests can be run concurrently. |`true` | 
 | server.startup.web.timeout | The time, in seconds, that the ambari-server 
Python script will wait for Jetty to startup before returning an error code. 

[31/50] [abbrv] ambari git commit: AMBARI-20337.Need to show timer while loading coordinator name while bundle creation.(Madhan Mohan Reddy via gauravn7)

[oleewere]

AMBARI-20337.Need to show timer while loading coordinator name while bundle 
creation.(Madhan Mohan Reddy via gauravn7)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 934f3f18277b3cb48e1e8c9a16836aebdec1d1b0
Parents: ba04d22
Author: Gaurav Nagar 
Authored: Wed Mar 8 17:24:45 2017 +0530
Committer: Gaurav Nagar 
Committed: Wed Mar 8 17:24:45 2017 +0530

--
 .../ui/app/components/bundle-coord-config.js| 28 +---
 .../app/templates/components/bundle-config.hbs  |  4 +--
 .../components/bundle-coord-config.hbs  |  5 +++-
 3 files changed, 30 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/934f3f18/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-coord-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-coord-config.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-coord-config.js
index 2280f82..c2ac96b 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-coord-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-coord-config.js
@@ -26,6 +26,7 @@ const Validations = buildValidations({
   })
 });
 export default Ember.Component.extend(Validations, {
+  propertyExtractor : Ember.inject.service('property-extractor'),
   initialize : function(){
 this.on('fileSelected',function(fileName){
   this.set(this.get('filePathModel'), fileName);
@@ -52,8 +53,8 @@ export default Ember.Component.extend(Validations, {
   }
 }).done(function(data){
   deferred.resolve(data);
-}).fail(function(){
-  deferred.reject();
+}).fail(function(data){
+  deferred.reject(data);
 });
 return deferred;
   },
@@ -95,13 +96,32 @@ export default Ember.Component.extend(Validations, {
 },
 showCoordinatorName(){
   this.set('coordinatorName', null);
-  var deferred = this.readFromHdfs(this.get('coordinator.appPath'));
+  this.set('errorMsg', '');
+  if (this.get('coordinator.appPath') === '') {
+return;
+  }
+  var path = this.get('appendFileName')(this.get('coordinator.appPath'), 
'coord');
+  if (this.get('propertyExtractor').containsParameters(path)) {
+this.set('containsParameteriedPaths', true);
+this.set('parameterizedPathWarning', 'Coordinator path contains 
variables');
+return;
+  } else {
+this.set('containsParameteriedPaths', false);
+this.set('parameterizedPathWarning', '');
+  }
+  this.set('coordNameFetchingInProgress', true);
+  var deferred = this.readFromHdfs(path);
   deferred.promise.then(function(data){
 var x2js = new X2JS();
 var coordJson = x2js.xml_str2json(data);
 this.set('coordinator.name', coordJson["coordinator-app"]._name);
-  }.bind(this)).catch(function(){
+this.set('coordNameFetchingInProgress', false);
+  }.bind(this)).catch(function(data){
+console.error(data);
 this.set('coordinatorName', null);
+this.set('errorMsg', 'There is some problem while fetching coordinator 
name.');
+this.set('data', data);
+this.set('coordNameFetchingInProgress', false);
   }.bind(this));
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/934f3f18/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
index 2d374a5..39ab06d 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-config.hbs
@@ -103,10 +103,10 @@
 {{#field-error model=this field='bundle.coordinators' 
showErrorMessage=showErrorMessage}}{{/field-error}}
 
   {{#if coordinatorCreateMode}}
-  {{#bundle-coord-config coordinator=currentCoordinator 
openTab="openTab" openFileBrowser="openFileBrowser" add="addCoordinator" 
cancel="cancelCoordinatorOperation" 
createMode=coordinatorCreateMode}}{{/bundle-coord-config}}
+  {{#bundle-coord-config coordinator=currentCoordinator 
openTab="openTab" openFileBrowser="openFileBrowser" add="addCoordinator" 

[36/50] [abbrv] ambari git commit: Revert "AMBARI-20357. [Hive2] JS error in udf delete (pallavkul)"

[oleewere]

Revert "AMBARI-20357. [Hive2] JS error in udf delete (pallavkul)"

This reverts commit 63dad097a730d6403f052e0083fa0e665de26f25.


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

Branch: refs/heads/branch-dev-logsearch
Commit: a307ba7bc86444151c59284f45bce351f16f49f6
Parents: 546225f
Author: pallavkul 
Authored: Wed Mar 8 22:14:57 2017 +0530
Committer: pallavkul 
Committed: Wed Mar 8 22:14:57 2017 +0530

--
 .../resources/ui/app/components/udf-item.js | 148 ++-
 .../resources/ui/app/routes/queries/query.js|   4 +-
 .../src/main/resources/ui/app/routes/udfs.js|  18 +--
 .../main/resources/ui/app/routes/udfs/new.js| 138 +++--
 .../resources/ui/app/services/auto-refresh.js   |   2 +-
 .../ui/app/templates/components/udf-item.hbs|  26 ++--
 .../main/resources/ui/app/templates/udfs.hbs|   3 -
 7 files changed, 118 insertions(+), 221 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a307ba7b/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
index 3e6e623..44f56e5 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
@@ -17,9 +17,8 @@
  */
 
 import Ember from 'ember';
-import UILoggerMixin from '../mixins/ui-logger';
 
-export default Ember.Component.extend(UILoggerMixin, {
+export default Ember.Component.extend({
 
   store: Ember.inject.service(),
 
@@ -31,43 +30,10 @@ export default Ember.Component.extend(UILoggerMixin, {
   showDeleteUdfModal: false,
   expandedValue: null,
   udfId: null,
-  editUdfId: Ember.computed('udf', function () {
-return this.get('udf.id');
-  }),
-  editUdfName: Ember.computed('udf', function () {
-return this.get('udf.name');
-  }),
-  editUdfClassName: Ember.computed('udf', function () {
-return this.get('udf.classname');
-  }),
-  editOwner: Ember.computed('udf', function () {
-return this.get('udf.owner');
-  }),
-  editFileResource: Ember.computed('udf', function () {
-return this.get('udf.fileResource');
-  }),
   fileResourceList:[],
   selectedFileResource: null,
   isAddingNewFileResource: false,
 
-  validate(udfName, udfClassName, resourceName, resourcePath){
-if (Ember.isEmpty(udfName)) {
-  this.get('logger').danger('UDF Name can not be empty.');
-  return false;
-}
-
-if (Ember.isEmpty(udfClassName)) {
-  this.get('logger').danger('UDF Class Name can not be empty.');
-  return false;
-}
-
-if (Ember.isEmpty(resourceName) || Ember.isEmpty(resourcePath)) {
-  this.get('logger').danger('File Resource can not be empty.');
-  return false;
-}
-return true;
-  },
-
   actions: {
 toggleExpandUdf(fileResourceId) {
 
@@ -93,30 +59,14 @@ export default Ember.Component.extend(UILoggerMixin, {
 this.set('expandedEdit', true);
 this.set('valueLoading', true);
 
-this.get('store').findAll('file-resource').then((data) => {
-  let fileResourceList = [];
-  data.forEach(x => {
-let localFileResource = {'id': x.get('id'),
-  'name': x.get('name'),
-  'path': x.get('path'),
-  'owner': x.get('owner')
-};
-fileResourceList.push(localFileResource);
-  });
+this.get('store').find('fileResource', fileResourceId).then((data) => {
+  this.set('udfFileResourceName', data.get('name'));
+  this.set('udfFileResourcePath', data.get('path'));
+});
 
-  fileResourceList.filterBy('id', fileResourceId).map((data) => {
-this.set('udfFileResourceName', data.name);
-this.set('udfFileResourcePath', data.path);
 
-this.get('store').find('udf', udfId).then((data) => {
-this.set('editUdfId', udfId);
-this.set('editUdfName', data.get('name'));
-this.set('editUdfClassName', data.get('classname'));
-this.set('editOwner', data.get('owner'));
-  });
-  });
-});
 this.send('setFileResource', fileResourceId);
+
   }
 },
 
@@ -125,38 +75,39 @@ export default Ember.Component.extend(UILoggerMixin, {
 },
 
 saveUDf(name, classname, udfid, udfFileResourceName, udfFileResourcePath){
+

[47/50] [abbrv] ambari git commit: AMBARI-20359. Not able to import workflow with fs action node (Madhan Mohan Reddy via pallavkul)

[oleewere]

AMBARI-20359. Not able to import workflow with fs action node (Madhan Mohan 
Reddy via pallavkul)


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

Branch: refs/heads/branch-dev-logsearch
Commit: c476629345c05896a445f005e94f2ab605510362
Parents: 9583386
Author: pallavkul 
Authored: Thu Mar 9 20:25:50 2017 +0530
Committer: pallavkul 
Committed: Thu Mar 9 20:28:13 2017 +0530

--
 .../src/main/resources/ui/app/domain/workflow-importer.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c4766293/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
index ccf8209..a076e3e 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
@@ -106,7 +106,7 @@ var WorkflowImporter= Ember.Object.extend({
   if (nodeHandler){
 if (Ember.isArray(workflowAppJson[key])){
   workflowAppJson[key].forEach(function(jsonObj){
-var node=nodeHandler.handleImportNode(key,jsonObj,workflow);
+var node=nodeHandler.handleImportNode(key,jsonObj,workflow,xmlDoc);
 nodeMap.set(jsonObj._name,{json:jsonObj,node:node});
   });
 }else{

[18/50] [abbrv] ambari git commit: AMBARI-20319 Server startup script keeps waiting even if DB consistency has failed

[oleewere]

AMBARI-20319 Server startup script keeps waiting even if DB consistency has 
failed


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

Branch: refs/heads/branch-dev-logsearch
Commit: 4df38c35f42a632dd822c6c59e4e520f6caad8fd
Parents: b9451a4
Author: Balazs Bence Sari 
Authored: Tue Mar 7 11:30:12 2017 +0100
Committer: lpuskas 
Committed: Tue Mar 7 13:32:28 2017 +0100

--
 .../ambari/server/controller/AmbariServer.java  |  4 +++
 .../src/main/python/ambari_server/utils.py  | 14 +++---
 .../src/main/python/ambari_server_main.py   | 28 +---
 3 files changed, 32 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4df38c35/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index b5acdce..17d9695 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -1004,6 +1004,10 @@ public class AmbariServer {
   ComponentSSLConfiguration.instance().init(server.configs);
   server.run();
 } catch (Throwable t) {
+  // Writing to system console is needed because loggers may not get 
flushed on exit and diagnostic information
+  // may get lost.
+  System.err.println("An unexpected error occured during starting Ambari 
Server.");
+  t.printStackTrace();
   LOG.error("Failed to run the Ambari Server", t);
   if (server != null) {
 server.stop();

http://git-wip-us.apache.org/repos/asf/ambari/blob/4df38c35/ambari-server/src/main/python/ambari_server/utils.py
--
diff --git a/ambari-server/src/main/python/ambari_server/utils.py 
b/ambari-server/src/main/python/ambari_server/utils.py
index 6408285..b51e37e 100644
--- a/ambari-server/src/main/python/ambari_server/utils.py
+++ b/ambari-server/src/main/python/ambari_server/utils.py
@@ -122,7 +122,10 @@ def save_pid(pid, pidfile):
 
 def save_main_pid_ex(pids, pidfile, exclude_list=[], skip_daemonize=False):
   """
-Save pid which is not included to exclude_list to pidfile.
+Saves and returns the first (and supposingly only) pid from the list of 
pids
+which is not included in the exclude_list.
+
+pidfile is the name of the file to save the pid to
 
 exclude_list contains list of full executable paths which should be 
excluded
   """
@@ -133,7 +136,7 @@ def save_main_pid_ex(pids, pidfile, exclude_list=[], 
skip_daemonize=False):
   for item in pids:
 if pid_exists(item["pid"]) and (item["exe"] not in exclude_list):
   pfile.write("%s\n" % item["pid"])
-  pid_saved = True
+  pid_saved = item["pid"]
   logger.info("Ambari server started with PID " + str(item["pid"]))
 if pid_exists(item["pid"]) and (item["exe"] in exclude_list) and not 
skip_daemonize:
   try:
@@ -157,7 +160,7 @@ def get_live_pids_count(pids):
   """
   return len([pid for pid in pids if pid_exists(pid)])
 
-def wait_for_ui_start(ambari_server_ui_port, timeout=1):
+def wait_for_ui_start(ambari_server_ui_port, pid, timeout=1):
 
   tstart = time.time()
   while int(time.time()-tstart) <= timeout:
@@ -173,7 +176,10 @@ def wait_for_ui_start(ambari_server_ui_port, timeout=1):
 
 sys.stdout.write('.')
 sys.stdout.flush()
-time.sleep(1)
+if pid_exists(pid):
+  time.sleep(1)
+else:
+  break
 
   return False
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4df38c35/ambari-server/src/main/python/ambari_server_main.py
--
diff --git a/ambari-server/src/main/python/ambari_server_main.py 
b/ambari-server/src/main/python/ambari_server_main.py
index 0cd19cc..0eb4243 100644
--- a/ambari-server/src/main/python/ambari_server_main.py
+++ b/ambari-server/src/main/python/ambari_server_main.py
@@ -21,6 +21,7 @@ import os
 import subprocess
 import sys
 import logging
+import time
 
 from ambari_commons.exceptions import FatalException
 from ambari_commons.logging_utils import get_debug_mode, print_warning_msg, 
print_info_msg, set_debug_mode_from_options
@@ -115,6 +116,8 @@ CHECK_DATABASE_SKIPPED_PROPERTY = "check_database_skipped"
 
 AMBARI_SERVER_DIE_MSG = "Ambari Server java process died with 

[48/50] [abbrv] ambari git commit: AMBARI-20362: Enable Authentication in Zeppelin out of Box (Prabhjyot Singh via r-kamath)

[oleewere]

AMBARI-20362: Enable Authentication in Zeppelin out of Box (Prabhjyot Singh via 
r-kamath)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 47f924334b850e572298fbd8700a993cdb19065c
Parents: c476629
Author: Renjith Kamath 
Authored: Thu Mar 9 20:40:19 2017 +0530
Committer: Renjith Kamath 
Committed: Thu Mar 9 20:40:19 2017 +0530

--
 .../configuration/zeppelin-shiro-ini.xml| 71 ++--
 1 file changed, 49 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/47f92433/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 3e2da1e..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
@@ -24,39 +24,66 @@
 [users]
 # List of users with their password allowed to access Zeppelin.
 # To use a different strategy (LDAP / Database / ...) check the shiro doc at 
http://shiro.apache.org/configuration.html#Configuration-INISections
-#admin = password1
-#user1 = password2, role1, role2
-#user2 = password3, role3
-#user3 = password4, role2
+admin = admin, admin
+user1 = user1, role1, role2
+user2 = user2, role3
+user3 = user3, role2
 
 # Sample LDAP configuration, for user Authentication, currently tested for 
single Realm
 [main]
-#activeDirectoryRealm = org.apache.zeppelin.server.ActiveDirectoryGroupRealm
-#activeDirectoryRealm.systemUsername = 
CN=Administrator,CN=Users,DC=HW,DC=EXAMPLE,DC=COM
-#activeDirectoryRealm.systemPassword = Password1!
-#activeDirectoryRealm.hadoopSecurityCredentialPath = 
jceks://user/zeppelin/zeppelin.jceks
-#activeDirectoryRealm.searchBase = CN=Users,DC=HW,DC=TEST,DC=COM
-#activeDirectoryRealm.url = ldap://ad-nano.test.example.com:389
-#activeDirectoryRealm.groupRolesMap = ""
-#activeDirectoryRealm.authorizationCachingEnabled = true
-
-#ldapRealm = org.apache.shiro.realm.ldap.JndiLdapRealm
-#ldapRealm.userDnTemplate = uid={0},cn=users,cn=accounts,dc=example,dc=com
-#ldapRealm.contextFactory.url = ldap://ldaphost:389
+### A sample for configuring Active Directory Realm
+#activeDirectoryRealm = org.apache.zeppelin.realm.ActiveDirectoryGroupRealm
+#activeDirectoryRealm.systemUsername = userNameA
+
+#use either systemPassword or hadoopSecurityCredentialPath, more details in 
http://zeppelin.apache.org/docs/latest/security/shiroauthentication.html
+#activeDirectoryRealm.systemPassword = passwordA
+#activeDirectoryRealm.hadoopSecurityCredentialPath = 
jceks://file/user/zeppelin/zeppelin.jceks
+#activeDirectoryRealm.searchBase = CN=Users,DC=SOME_GROUP,DC=COMPANY,DC=COM
+#activeDirectoryRealm.url = ldap://ldap.test.com:389
+#activeDirectoryRealm.groupRolesMap = 
"CN=admin,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"admin","CN=finance,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"finance","CN=hr,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"hr"
+#activeDirectoryRealm.authorizationCachingEnabled = false
+
+### A sample for configuring LDAP Directory Realm
+#ldapRealm = org.apache.zeppelin.realm.LdapGroupRealm
+## search base for ldap groups (only relevant for LdapGroupRealm):
+#ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
+#ldapRealm.contextFactory.url = ldap://ldap.test.com:389
+#ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
 #ldapRealm.contextFactory.authenticationMechanism = SIMPLE
-#sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager
-#securityManager.sessionManager = $sessionManager
+
+### A sample PAM configuration
+#pamRealm=org.apache.zeppelin.realm.PamRealm
+#pamRealm.service=sshd
+
+
+sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager
+### If caching of user is required then uncomment below lines
+cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager
+securityManager.cacheManager = $cacheManager
+
+securityManager.sessionManager = $sessionManager
 # 86,400,000 milliseconds = 24 hour
-#securityManager.sessionManager.globalSessionTimeout = 8640
+securityManager.sessionManager.globalSessionTimeout = 8640
 shiro.loginUrl = /api/login
 
+[roles]
+role1 = *

[16/50] [abbrv] ambari git commit: AMBARI-20303. HiveView2.0: Issues in worksheet (Venkata Sairam via pallavkul)

[oleewere]

AMBARI-20303. HiveView2.0: Issues in worksheet (Venkata Sairam via pallavkul)


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

Branch: refs/heads/branch-dev-logsearch
Commit: bf25d310f6755c50b12a6fafa02fd097c02d9658
Parents: 7f9a512
Author: pallavkul 
Authored: Tue Mar 7 14:25:58 2017 +0530
Committer: pallavkul 
Committed: Tue Mar 7 14:27:29 2017 +0530

--
 .../main/resources/ui/app/models/worksheet.js   |  1 +
 .../src/main/resources/ui/app/routes/queries.js |  5 +-
 .../main/resources/ui/app/routes/queries/new.js |  9 ++-
 .../resources/ui/app/routes/queries/query.js| 85 +++-
 .../src/main/resources/ui/app/styles/app.scss   |  5 ++
 .../main/resources/ui/app/templates/queries.hbs | 11 ++-
 .../ui/app/templates/queries/query.hbs  | 35 +++-
 7 files changed, 140 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bf25d310/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
index f820ea0..12a681c 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
@@ -38,6 +38,7 @@ export default DS.Model.extend({
   logFile: DS.attr('string', {defaultValue: ""}),
   logResults: DS.attr('string', {defaultValue: ""}),
   isQueryRunning: DS.attr('boolean', {defaultValue: false}),
+  isQueryDirty: DS.attr('boolean', {defaultValue: false}),
   isQueryResultContainer: DS.attr('boolean', {defaultValue: false}),
   visualExplainJson: DS.attr({defaultValue: null}),
   lastResultRoute: DS.attr({defaultValue: ""}),

http://git-wip-us.apache.org/repos/asf/ambari/blob/bf25d310/contrib/views/hive20/src/main/resources/ui/app/routes/queries.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/queries.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries.js
index 4ef3834..8c7c17c 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries.js
@@ -19,9 +19,12 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
-
+  'worksheetCount': 1,
   actions: {
 createNewWorksheet(){
+  let id = this.get('worksheetCount');
+  this.get('controller').set('worksheetCount',parseInt(id)+1);
+  this.set('worksheetCount',parseInt(id)+1);
   this.transitionTo('queries.new');
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/bf25d310/contrib/views/hive20/src/main/resources/ui/app/routes/queries/new.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/new.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/new.js
index 7bd2214..b48b8df 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/new.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/new.js
@@ -21,11 +21,18 @@ import Ember from 'ember';
 export default Ember.Route.extend({
   beforeModel() {
 let existingWorksheets = this.store.peekAll('worksheet');
-let newWorksheetName = `worksheet${existingWorksheets.get('length') + 1}`;
+let newWorksheetName = 'worksheet';
+if(!this.controllerFor("queries").worksheetCount) {
+  newWorksheetName = newWorksheetName + 1;
+} else {
+  let id = parseInt(this.controllerFor("queries").worksheetCount);
+  newWorksheetName = newWorksheetName + id;
+}
 let newWorksheetTitle = newWorksheetName.capitalize();
 this.store.createRecord('worksheet', {
   id: newWorksheetName,
   title: newWorksheetTitle,
+  isQueryDirty: false,
   //query: 'select 1;',
   //owner: 'admin',
   selected: true

http://git-wip-us.apache.org/repos/asf/ambari/blob/bf25d310/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index 062f93a..e1ab620 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -80,7 +80,6 @@ 

[23/50] [abbrv] ambari git commit: AMBARI-20253. HiveView2.0: Auto refresh not working.(dipayanb)

[oleewere]

AMBARI-20253. HiveView2.0: Auto refresh not working.(dipayanb)


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

Branch: refs/heads/branch-dev-logsearch
Commit: dff7754b7cb718de7e3bcfaac7afa0a4ce936afe
Parents: a92b7c8
Author: Dipayan Bhowmick 
Authored: Wed Mar 8 01:02:16 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Wed Mar 8 01:02:16 2017 +0530

--
 .../main/resources/ui/app/routes/databases.js   |  23 +++
 .../ui/app/routes/databases/database/tables.js  |  57 ++-
 .../app/routes/databases/database/tables/new.js |  18 ++-
 .../resources/ui/app/services/auto-refresh.js   | 148 +++
 .../app/templates/databases/database/tables.hbs |   1 +
 .../main/resources/ui/app/transforms/date.js|  50 +++
 .../src/main/resources/ui/config/environment.js |   6 +-
 7 files changed, 289 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dff7754b/contrib/views/hive20/src/main/resources/ui/app/routes/databases.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/databases.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/databases.js
index e5efbe9..02dbcac 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/databases.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/databases.js
@@ -18,9 +18,32 @@
 
 import Ember from 'ember';
 import UILoggerMixin from '../mixins/ui-logger';
+import ENV from 'ui/config/environment';
 
 export default Ember.Route.extend(UILoggerMixin, {
   tableOperations: Ember.inject.service(),
+  autoRefresh: Ember.inject.service(),
+
+  activate() {
+if(ENV.APP.SHOULD_AUTO_REFRESH_DATABASES) {
+  this.get('autoRefresh').startDatabasesAutoRefresh(() => {
+console.log("Databases AutoRefresh started");
+  }, this._databasesRefreshed.bind(this));
+}
+
+  },
+
+  deactivate() {
+this.get('autoRefresh').stopDatabasesAutoRefresh();
+  },
+
+  _databasesRefreshed() {
+let model = this.store.peekAll('database');
+if(this.controller) {
+  console.log(model.get('length'));
+  this.setupController(this.controller, model);
+}
+  },
 
   model() {
 return this.store.findAll('database', {reload: true});

http://git-wip-us.apache.org/repos/asf/ambari/blob/dff7754b/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables.js
 
b/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables.js
index d4a39cb..f5940e3 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables.js
@@ -17,8 +17,46 @@
  */
 
 import Ember from 'ember';
+import ENV from 'ui/config/environment';
+import UILoggerMixin from '../../../mixins/ui-logger';
+
+export default Ember.Route.extend(UILoggerMixin, {
+  autoRefresh: Ember.inject.service(),
+
+  activate() {
+if(ENV.APP.SHOULD_AUTO_REFRESH_TABLES) {
+  let selectedDatabase = this.modelFor('databases.database');
+  
this.get('autoRefresh').startTablesAutoRefresh(selectedDatabase.get('name'),
+this.tableRefreshStarting.bind(this), this.tableRefreshed.bind(this));
+}
+  },
+
+  deactivate() {
+
this.get('autoRefresh').stopTablesAutoRefresh(this.controller.get('database.name'));
+  },
+
+  tableRefreshStarting(databaseName) {
+this.controller.set('tableRefreshing', true);
+  },
+
+  tableRefreshed(databaseName, deletedTablesCount) {
+this.controller.set('tableRefreshing', false);
+let currentTablesForDatabase = 
this.store.peekAll('table').filterBy('database.name', databaseName);
+let paramsForTable = this.paramsFor('databases.database.tables.table');
+let currentTableNamesForDatabase = currentTablesForDatabase.mapBy('name');
+if (currentTableNamesForDatabase.length <= 0  || 
!currentTableNamesForDatabase.contains(paramsForTable.name)) {
+  if(deletedTablesCount !== 0) {
+this.get('logger').info(`Current selected table 
'${paramsForTable.name}' has been deleted from Hive Server. Transitioning 
out.`);
+this.transitionTo('databases.database', databaseName);
+return;
+  }
+}
+if(currentTablesForDatabase.get('length') > 0) {
+  this.selectTable(currentTablesForDatabase);
+  this.controller.set('model', currentTablesForDatabase);
+

[46/50] [abbrv] ambari git commit: AMBARI-20332. Few ambari agent unit tests are failing (aonishuk)

[oleewere]

AMBARI-20332. Few ambari agent unit tests are failing (aonishuk)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 95833865c3b2bb006ae44b355a3c597bd2cef3d7
Parents: e1cdfe4
Author: Andrew Onishuk 
Authored: Thu Mar 9 16:31:01 2017 +0200
Committer: Andrew Onishuk 
Committed: Thu Mar 9 16:31:01 2017 +0200

--
 .../resource_management/TestDatanodeHelper.py   | 16 
 .../stacks/2.0.6/YARN/test_yarn_service_check.py|  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/95833865/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
--
diff --git 
a/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py 
b/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
index f22c8e9..071bd05 100644
--- a/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
+++ b/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
@@ -176,46 +176,46 @@ class TestDatanodeHelper(TestCase):
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = True, 
curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # root, no history file, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # non root, no history file, manage_dirs_on_root = False
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=True, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # unmounted to root, manage_dirs_on_root = True
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder('/grid/0/data', '/grid/0', True, 
dirs_unmounted, [], False, '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # unmounted to root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/grid/0/data', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # same mount = root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # same mount = root, manage_dirs_on_root = True
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = True, 
curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # mount changed to non root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder('/grid/0/data', '/', True, 
dirs_unmounted, [], False, 

[10/50] [abbrv] ambari git commit: AMBARI-20308 - Atlas service check fails during EU on wire encrypted cluster (jonathanhurley)

[oleewere]

AMBARI-20308 - Atlas service check fails during EU on wire encrypted cluster 
(jonathanhurley)


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

Branch: refs/heads/branch-dev-logsearch
Commit: d8901e26c3f5cf45011d700cb44d73ea67c86d20
Parents: e895659
Author: Jonathan Hurley 
Authored: Fri Mar 3 13:00:58 2017 -0500
Committer: Jonathan Hurley 
Committed: Mon Mar 6 12:42:26 2017 -0500

--
 .../configuration/application-properties.xml| 42 
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 12 ++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 16 +---
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  6 +++
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml |  6 +++
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 +
 .../configuration/application-properties.xml|  3 +-
 7 files changed, 79 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d8901e26/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
new file mode 100644
index 000..366ecf6
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+  
+  
+atlas.ssl.exclude.protocols
+Excluded Wire Encryption Protocols
+TLSv1.2
+
+  true
+
+A comma-separate list of the wire encryption protocols to 
exclude when TLS is enabled. Some versions of cURL do not work with 
TLSv1.2.
+
+  
+application-properties
+atlas.enableTLS
+  
+
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/d8901e26/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 93e0149..37f2a82 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
@@ -136,6 +136,18 @@
 
   
 
+
+
+  
+  
+  
+application-properties
+
+
+
+  
+
+

 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/d8901e26/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
index 5b37375..e7ada04 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
@@ -75,7 +75,7 @@
   
 FLUME_HANDLER
   
-  
+
   
 ACCUMULO_TRACER
 ACCUMULO_GC
@@ -300,6 +300,12 @@
   
 
   
+  
+  
+
+  Updating Atlas TLS Exclude Protocols to exclude TLS 
v1.2
+
+  
 
 
 
 
   false
@@ -671,7 +677,7 @@
 FLUME_HANDLER
   
 
-
+
 
   false
   true
@@ -700,7 +706,7 @@
 
 
   UPGRADE
-  
+
   
 
   
@@ -770,7 +776,7 @@
 setup_ranger_java_patches
   
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d8901e26/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 55e8924..fe297c3 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
@@ -431,6 +431,12 @@
   Updating the Atlas Log4J properties to include 

[27/50] [abbrv] ambari git commit: AMBARI-20355 : WFM view : Import/Export asset label changes(Venkata Sairam via nitirajrathore)

[oleewere]

AMBARI-20355 : WFM view : Import/Export asset label changes(Venkata Sairam via 
nitirajrathore)


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

Branch: refs/heads/branch-dev-logsearch
Commit: f66a663ad9722d808a1b656939fab9a7ae269d17
Parents: cb1ba69
Author: Nitiraj Singh Rathore 
Authored: Wed Mar 8 14:54:39 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Wed Mar 8 14:56:09 2017 +0530

--
 .../ui/app/templates/components/flow-designer.hbs   | 12 ++--
 .../ui/app/templates/components/workflow-actions.hbs|  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f66a663a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
index b5c3807..f4d3876 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
@@ -37,8 +37,8 @@
   
   
 
-  
-  Import from 
HDFS
+  
+  Import from 
Shared File System
   
   
 {{#file-picker fileLoaded="fileLoaded" preview=false}}
@@ -231,16 +231,16 @@
 {{/file-picker}}
   
 
-
+
 
 
-
+
   
 
-
+
 
 
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/f66a663a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
index 75ec872..8907fdd 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
@@ -35,8 +35,8 @@

 
   {{/if}}
-Import 
asset
-Import asset from HDFS
+Import Asset 
from Local Ambari Database
+Import Asset from Shared File System
   
   
 Hive 

[45/50] [abbrv] ambari git commit: AMBARI-20367: Update Zeppelin version on Ambari-2.5 from 0.6.2 to 0.7.0 (Prabhjyot Singh via r-kamath)

[oleewere]

AMBARI-20367: Update Zeppelin version on Ambari-2.5 from 0.6.2 to 0.7.0 
(Prabhjyot Singh via r-kamath)


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

Branch: refs/heads/branch-dev-logsearch
Commit: e1cdfe4492c9bd8d9aa1a4151af5badfd93e6d95
Parents: 4534e0a
Author: Renjith Kamath 
Authored: Thu Mar 9 19:57:06 2017 +0530
Committer: Renjith Kamath 
Committed: Thu Mar 9 19:59:28 2017 +0530

--
 .../main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e1cdfe44/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
index 59a0ae8..2e2996b 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
@@ -21,7 +21,7 @@
   
 
   ZEPPELIN
-  0.6.2
+  0.7.0
 
   
 

[50/50] [abbrv] ambari git commit: AMBARI-20349. When SPNEGO authentication is enabled for Hadoop in a cluster with NN HA, PXF Process alert fails (rlevas)

[oleewere]

AMBARI-20349. When SPNEGO authentication is enabled for Hadoop in a cluster 
with NN HA, PXF Process alert fails (rlevas)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 245fd5cf3689097fdcdde6a75c39de9d38e0bde8
Parents: 221ad28
Author: Robert Levas 
Authored: Thu Mar 9 10:25:53 2017 -0500
Committer: Robert Levas 
Committed: Thu Mar 9 10:25:53 2017 -0500

--
 .../PXF/3.0.0/package/alerts/api_status.py  | 36 ++--
 1 file changed, 25 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/245fd5cf/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
index d0ed0a4..dcdb372 100644
--- 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
+++ 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
@@ -24,15 +24,17 @@ import socket
 import urllib2
 import urllib
 
+from resource_management.core import shell
 from resource_management.libraries.functions.curl_krb_request import 
curl_krb_request
+from resource_management.libraries.functions.get_kinit_path import 
get_kinit_path
 from resource_management.libraries.functions.namenode_ha_utils import 
get_active_namenode
 from resource_management.libraries.script.config_dictionary import 
ConfigDictionary
 from resource_management.core.environment import Environment
 
 CLUSTER_ENV_SECURITY = '{{cluster-env/security_enabled}}'
-HADOOP_ENV_HDFS_USER = '{{hadoop-env/hdfs_user}}'
-HADOOP_ENV_HDFS_USER_KEYTAB = '{{hadoop-env/hdfs_user_keytab}}'
-HADOOP_ENV_HDFS_PRINCIPAL_NAME = '{{hadoop-env/hdfs_principal_name}}'
+ACTING_USER = 'pxf'
+KEYTAB_FILE = '{{pxf-site/pxf.service.kerberos.keytab}}'
+PRINCIPAL_NAME = '{{pxf-site/pxf.service.kerberos.principal}}'
 HDFS_SITE = '{{hdfs-site}}'
 
 
@@ -58,9 +60,9 @@ commonPXFHeaders = {
 
 def get_tokens():
   return (CLUSTER_ENV_SECURITY,
-  HADOOP_ENV_HDFS_USER,
-  HADOOP_ENV_HDFS_USER_KEYTAB,
-  HADOOP_ENV_HDFS_PRINCIPAL_NAME,
+  ACTING_USER,
+  KEYTAB_FILE,
+  PRINCIPAL_NAME,
   HDFS_SITE)
 
 def _get_delegation_token(namenode_address, user, keytab, principal, 
kinit_path):
@@ -130,21 +132,33 @@ def _get_pxf_protocol_version(base_url):
 
   raise Exception("version could not be found in response " + response)
 
+
+def _ensure_kerberos_authentication(user, principal, keytab_file, kinit_path):
+  kinit_path_local = get_kinit_path(kinit_path)
+  shell.checked_call("{0} -kt {1} {2} > /dev/null".format(kinit_path_local, 
keytab_file, principal),
+ user=user)
+
 def execute(configurations={}, parameters={}, host_name=None):
   BASE_URL = "http://{0}:{1}/pxf/".format(host_name, PXF_PORT)
   try:
 # Get delegation token if security is enabled
 if CLUSTER_ENV_SECURITY in configurations and 
configurations[CLUSTER_ENV_SECURITY].lower() == "true":
+  resolved_principal = configurations[PRINCIPAL_NAME]
+  if resolved_principal is not None:
+resolved_principal = resolved_principal.replace('_HOST', host_name)
+
   if 'dfs.nameservices' in configurations[HDFS_SITE]:
-namenode_address = 
get_active_namenode(ConfigDictionary(configurations[HDFS_SITE]), 
configurations[CLUSTER_ENV_SECURITY], configurations[HADOOP_ENV_HDFS_USER])[1]
+if configurations[CLUSTER_ENV_SECURITY]:
+  _ensure_kerberos_authentication(configurations[ACTING_USER], 
resolved_principal, configurations[KEYTAB_FILE], None)
+namenode_address = 
get_active_namenode(ConfigDictionary(configurations[HDFS_SITE]), 
configurations[CLUSTER_ENV_SECURITY], configurations[ACTING_USER])[1]
   else:
 namenode_address = 
configurations[HDFS_SITE]['dfs.namenode.http-address']
 
   token = _get_delegation_token(namenode_address,
- configurations[HADOOP_ENV_HDFS_USER],
- 
configurations[HADOOP_ENV_HDFS_USER_KEYTAB],
- 
configurations[HADOOP_ENV_HDFS_PRINCIPAL_NAME],
- None)
+configurations[ACTING_USER],
+configurations[KEYTAB_FILE],
+

[14/50] [abbrv] ambari git commit: AMBARI-20317. Update stack advisor logic for getting enable atlas hook flag value (Mugdha Varadkar via smohanty)

[oleewere]

AMBARI-20317. Update stack advisor logic for getting enable atlas hook flag 
value (Mugdha Varadkar via smohanty)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 1b8b91dc87a0694cb7b3aa3a55829a90b202bb35
Parents: 23bd418
Author: Sumit Mohanty 
Authored: Mon Mar 6 11:30:05 2017 -0800
Committer: Sumit Mohanty 
Committed: Mon Mar 6 11:53:04 2017 -0800

--
 .../1.4.4.2.0/configuration/sqoop-site.xml  |  4 +++
 .../stacks/HDP/2.3/services/stack_advisor.py| 31 ++--
 2 files changed, 19 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b8b91dc/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml
 
b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml
index 5d87c4d..5c9804b 100644
--- 
a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml
@@ -40,6 +40,10 @@
 sqoop-env
 sqoop.atlas.hook
   
+  
+application-properties
+atlas.rest.address
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b8b91dc/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index f18bfe9..6d0ce38 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -257,7 +257,6 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 else:
   hooks_value = ""
 
-
 hive_hooks = [x.strip() for x in hooks_value.split(",")]
 hive_hooks = [x for x in hive_hooks if x != ""]
 is_atlas_present_in_cluster = "ATLAS" in servicesList
@@ -268,11 +267,10 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 else:
   putHiveEnvProperty("hive.atlas.hook", "false")
 
-if ('hive-env' in services['configurations']) and ('hive.atlas.hook' in 
services['configurations']['hive-env']['properties']):
-  if 'hive-env' in configurations and 'hive.atlas.hook' in 
configurations['hive-env']['properties']:
-enable_atlas_hook = 
configurations['hive-env']['properties']['hive.atlas.hook'] == "true"
-  elif 'hive-env' in services['configurations'] and 'hive.atlas.hook' in 
services['configurations']['hive-env']['properties']:
-enable_atlas_hook = 
services['configurations']['hive-env']['properties']['hive.atlas.hook'] == 
"true"
+if 'hive-env' in configurations and 'hive.atlas.hook' in 
configurations['hive-env']['properties']:
+  enable_atlas_hook = 
configurations['hive-env']['properties']['hive.atlas.hook'] == "true"
+elif 'hive-env' in services['configurations'] and 'hive.atlas.hook' in 
services['configurations']['hive-env']['properties']:
+  enable_atlas_hook = 
services['configurations']['hive-env']['properties']['hive.atlas.hook'] == 
"true"
 
 if enable_atlas_hook:
   # Append atlas hook if not already present.
@@ -852,14 +850,16 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 else:
   putSqoopEnvProperty("sqoop.atlas.hook", "false")
 
-if ('sqoop-env' in services['configurations']) and ('sqoop.atlas.hook' in 
services['configurations']['sqoop-env']['properties']):
-  if 'sqoop-env' in configurations and 'sqoop.atlas.hook' in 
configurations['sqoop-env']['properties']:
-enable_atlas_hook = 
configurations['sqoop-env']['properties']['sqoop.atlas.hook'] == "true"
-  elif 'sqoop-env' in services['configurations'] and 'sqoop.atlas.hook' in 
services['configurations']['sqoop-env']['properties']:
-enable_atlas_hook = 
services['configurations']['sqoop-env']['properties']['sqoop.atlas.hook'] == 
"true"
+if 'sqoop-env' in configurations and 'sqoop.atlas.hook' in 
configurations['sqoop-env']['properties']:
+  enable_atlas_hook = 
configurations['sqoop-env']['properties']['sqoop.atlas.hook'] == "true"
+elif 'sqoop-env' in services['configurations'] and 'sqoop.atlas.hook' in 
services['configurations']['sqoop-env']['properties']:
+  

[37/50] [abbrv] ambari git commit: AMBARI-20357. [Hive2] JS error in udf delete (pallavkul)

[oleewere]

AMBARI-20357. [Hive2] JS error in udf delete (pallavkul)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 6631ad53609da987e716bc08c04ded44986a7b77
Parents: a307ba7
Author: pallavkul 
Authored: Wed Mar 8 22:57:02 2017 +0530
Committer: pallavkul 
Committed: Wed Mar 8 23:00:44 2017 +0530

--
 .../resources/ui/app/components/udf-item.js | 150 +--
 .../resources/ui/app/routes/queries/query.js|   4 +-
 .../src/main/resources/ui/app/routes/udfs.js|   4 +-
 .../main/resources/ui/app/routes/udfs/new.js| 141 ++---
 .../resources/ui/app/services/auto-refresh.js   |   2 +-
 .../ui/app/templates/components/udf-item.hbs|  26 ++--
 6 files changed, 207 insertions(+), 120 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6631ad53/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
index 44f56e5..6005444 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
@@ -17,8 +17,9 @@
  */
 
 import Ember from 'ember';
+import UILoggerMixin from '../mixins/ui-logger';
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(UILoggerMixin, {
 
   store: Ember.inject.service(),
 
@@ -30,10 +31,43 @@ export default Ember.Component.extend({
   showDeleteUdfModal: false,
   expandedValue: null,
   udfId: null,
+  editUdfId: Ember.computed('udf', function () {
+return this.get('udf.id');
+  }),
+  editUdfName: Ember.computed('udf', function () {
+return this.get('udf.name');
+  }),
+  editUdfClassName: Ember.computed('udf', function () {
+return this.get('udf.classname');
+  }),
+  editOwner: Ember.computed('udf', function () {
+return this.get('udf.owner');
+  }),
+  editFileResource: Ember.computed('udf', function () {
+return this.get('udf.fileResource');
+  }),
   fileResourceList:[],
   selectedFileResource: null,
   isAddingNewFileResource: false,
 
+  validate(udfName, udfClassName, resourceName, resourcePath){
+if (Ember.isEmpty(udfName)) {
+  this.get('logger').danger('UDF Name can not be empty.');
+  return false;
+}
+
+if (Ember.isEmpty(udfClassName)) {
+  this.get('logger').danger('UDF Class Name can not be empty.');
+  return false;
+}
+
+if (Ember.isEmpty(resourceName) || Ember.isEmpty(resourcePath)) {
+  this.get('logger').danger('File Resource can not be empty.');
+  return false;
+}
+return true;
+  },
+
   actions: {
 toggleExpandUdf(fileResourceId) {
 
@@ -59,14 +93,30 @@ export default Ember.Component.extend({
 this.set('expandedEdit', true);
 this.set('valueLoading', true);
 
-this.get('store').find('fileResource', fileResourceId).then((data) => {
-  this.set('udfFileResourceName', data.get('name'));
-  this.set('udfFileResourcePath', data.get('path'));
-});
+this.get('store').findAll('file-resource').then((data) => {
+  let fileResourceList = [];
+  data.forEach(x => {
+let localFileResource = {'id': x.get('id'),
+  'name': x.get('name'),
+  'path': x.get('path'),
+  'owner': x.get('owner')
+};
+fileResourceList.push(localFileResource);
+  });
 
+  fileResourceList.filterBy('id', fileResourceId).map((data) => {
+this.set('udfFileResourceName', data.name);
+this.set('udfFileResourcePath', data.path);
 
+this.get('store').find('udf', udfId).then((data) => {
+this.set('editUdfId', udfId);
+this.set('editUdfName', data.get('name'));
+this.set('editUdfClassName', data.get('classname'));
+this.set('editOwner', data.get('owner'));
+  });
+  });
+});
 this.send('setFileResource', fileResourceId);
-
   }
 },
 
@@ -75,39 +125,38 @@ export default Ember.Component.extend({
 },
 
 saveUDf(name, classname, udfid, udfFileResourceName, udfFileResourcePath){
-
   let self = this;
-
-  if(!Ember.isEmpty(this.get('selectedFileResource'))){
-this.get('store').findRecord('udf', udfid).then(function(resultUdf) {
-  

[39/50] [abbrv] ambari git commit: AMBARI-20254. Service Alert Popup - Unexpected User Experience. (Vivek Subramanian via yusaku)

[oleewere]

AMBARI-20254. Service Alert Popup - Unexpected User Experience. (Vivek 
Subramanian via yusaku)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 6910263850c504195477a1d67adaa1820646975c
Parents: c5d2d5b
Author: Yusaku Sako 
Authored: Wed Mar 8 11:30:36 2017 -0800
Committer: Yusaku Sako 
Committed: Wed Mar 8 11:30:36 2017 -0800

--
 .../controllers/main/service/info/summary.js| 43 
 .../app/models/alerts/alert_definition.js   | 10 +
 ambari-web/app/styles/alerts.less   | 10 -
 .../main/service/info/service_alert_popup.hbs   | 19 -
 4 files changed, 44 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/69102638/ambari-web/app/controllers/main/service/info/summary.js
--
diff --git a/ambari-web/app/controllers/main/service/info/summary.js 
b/ambari-web/app/controllers/main/service/info/summary.js
index b3d7b35..7327255 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -369,7 +369,7 @@ App.MainServiceInfoSummaryController = 
Em.Controller.extend(App.WidgetSectionMix
 return App.ModalPopup.show({
   header: 
Em.I18n.t('services.service.summary.alerts.popup.header').format(context.get('displayName')),
   autoHeight: false,
-  classNames: ['forty-percent-width-modal'],
+  classNames: ['sixty-percent-width-modal'],
   bodyClass: Em.View.extend({
 templateName: 
require('templates/main/service/info/service_alert_popup'),
 classNames: ['service-alerts'],
@@ -377,43 +377,36 @@ App.MainServiceInfoSummaryController = 
Em.Controller.extend(App.WidgetSectionMix
 didInsertElement: function () {
   Em.run.next(this, function () {
 App.tooltip(this.$(".timeago"));
+App.tooltip(this.$(".definition-latest-text"), {placement: 
'bottom'});
   });
 },
 willDestroyElement:function () {
   this.$(".timeago").tooltip('destroy');
+  this.$(".definition-latest-text").tooltip('destroy');
 },
 alerts: function () {
   var property = context.get('componentName') ? 'componentName' : 
'serviceName';
   var serviceDefinitions = 
this.get('controller.content').filterProperty(property, context.get(property));
   // definitions should be sorted in order: critical, warning, ok, 
unknown, other
-  var definitionTypes = {
-"isCritical": [],
-"isWarning": [],
-"isOK": [],
-"isUnknown": []
-  };
-  var others = [];
+  var criticalDefinitions = [], warningDefinitions = [], okDefinitions 
= [], unknownDefinitions = [];
   serviceDefinitions.forEach(function (definition) {
-definition.set('isCollapsed', true);
-var pushed = false; // make sure each definition gets pushed only 
one time
-Object.keys(definitionTypes).forEach(function (type) {
-  if (!pushed && definition.get(type)) {
-definitionTypes[type].push(definition);
-pushed = true;
-  }
-});
-if (!pushed) {
-  others.push(definition);
+if (definition.get('isCritical')) {
+  criticalDefinitions.push(definition);
+  serviceDefinitions = serviceDefinitions.without(definition);
+} else if (definition.get('isWarning')) {
+  warningDefinitions.push(definition);
+  serviceDefinitions = serviceDefinitions.without(definition);
+} else if (definition.get('isOK')) {
+  okDefinitions.push(definition);
+  serviceDefinitions = serviceDefinitions.without(definition);
+} else if (definition.get('isUnknown')) {
+  unknownDefinitions.push(definition);
+  serviceDefinitions = serviceDefinitions.without(definition);
 }
   });
-  serviceDefinitions = 
definitionTypes.isCritical.concat(definitionTypes.isWarning, 
definitionTypes.isOK, definitionTypes.isUnknown, others);
-
+  serviceDefinitions = criticalDefinitions.concat(warningDefinitions, 
okDefinitions, unknownDefinitions, serviceDefinitions);
   return serviceDefinitions;
 }.property('controller.content'),
-onToggleBlock: function (alert) {
-  this.$('#' + alert.context.clientId).toggle('blind', 500);
-

[19/50] [abbrv] ambari git commit: AMBARI-20335. Kerberos identity reference not working for ranger-audit property in hbase (rlevas)

[oleewere]

AMBARI-20335. Kerberos identity reference not working for ranger-audit property 
in hbase (rlevas)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 225edb97f91428be6426f50b794ba051df2bb65e
Parents: 4df38c3
Author: Robert Levas 
Authored: Tue Mar 7 10:03:12 2017 -0500
Committer: Robert Levas 
Committed: Tue Mar 7 10:03:12 2017 -0500

--
 .../server/upgrade/UpgradeCatalog250.java   |  57 ---
 .../stacks/HDP/2.5/services/HBASE/kerberos.json |   3 +-
 .../PERF/1.0/services/FAKEHBASE/kerberos.json   |   3 +-
 .../server/upgrade/UpgradeCatalog250Test.java   |  71 ++---
 ...test_kerberos_descriptor_2_5_infra_solr.json | 148 ++-
 5 files changed, 238 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/225edb97/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 0246229..e244925 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
@@ -469,6 +469,7 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
   addInfrSolrDescriptor(artifactDAO, artifactEntity, 
kerberosDescriptor, logSearchKerberosDescriptor, "LOGSEARCH_SERVER");
   addInfrSolrDescriptor(artifactDAO, artifactEntity, 
kerberosDescriptor, rangerKerberosDescriptor, "RANGER_ADMIN");
   KerberosServiceDescriptor stormKerberosDescriptor = 
kerberosDescriptor.getService("STORM");
+
   if (stormKerberosDescriptor != null) {
 KerberosComponentDescriptor componentDescriptor = 
stormKerberosDescriptor.getComponent("NIMBUS");
 if (componentDescriptor != null) {
@@ -476,27 +477,24 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
   if (origIdentityDescriptor != null) {
 KerberosPrincipalDescriptor origPrincipalDescriptor = 
origIdentityDescriptor.getPrincipalDescriptor();
 KerberosPrincipalDescriptor newPrincipalDescriptor = new 
KerberosPrincipalDescriptor(
-  null,
-  null,
-  (origPrincipalDescriptor == null) ?
-
"ranger-storm-audit/xasecure.audit.jaas.Client.option.principal" : 
origPrincipalDescriptor.getConfiguration(),
-  null
+null,
+null,
+(origPrincipalDescriptor == null) ?
+
"ranger-storm-audit/xasecure.audit.jaas.Client.option.principal" : 
origPrincipalDescriptor.getConfiguration(),
+null
 );
 KerberosKeytabDescriptor origKeytabDescriptor = 
origIdentityDescriptor.getKeytabDescriptor();
 KerberosKeytabDescriptor newKeytabDescriptor = new 
KerberosKeytabDescriptor(
-  null,
-  null,
-  null,
-  null,
-  null,
-  (origKeytabDescriptor == null) ?
-
"ranger-storm-audit/xasecure.audit.jaas.Client.option.keyTab" : 
origKeytabDescriptor.getConfiguration(),
-  false);
+null,
+null,
+null,
+null,
+null,
+(origKeytabDescriptor == null) ?
+
"ranger-storm-audit/xasecure.audit.jaas.Client.option.keyTab" : 
origKeytabDescriptor.getConfiguration(),
+false);
 
componentDescriptor.removeIdentity("/STORM/NIMBUS/nimbus_server");
 componentDescriptor.putIdentity(new 
KerberosIdentityDescriptor("/STORM/storm_components", null, 
newPrincipalDescriptor, newKeytabDescriptor, null));
-
-artifactEntity.setArtifactData(kerberosDescriptor.toMap());
-artifactDAO.merge(artifactEntity);
   }
 }
   }
@@ -508,11 +506,32 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
   Map properties = 
yarnSiteConfigDescriptor.getProperties();
   if (properties != null && 
properties.containsKey(YARN_LCE_CGROUPS_MOUNT_PATH)) {
 

[01/50] [abbrv] ambari git commit: Revert "AMBARI-20275. Credential Store should be enabled by default on fresh installs (Madhuvanthi Radhakrishnan via smohanty)" [Forced Update!]

[oleewere]

Repository: ambari
Updated Branches:
  refs/heads/branch-dev-logsearch 80094e91b -> 245fd5cf3 (forced update)


Revert "AMBARI-20275. Credential Store should be enabled by default on fresh 
installs (Madhuvanthi Radhakrishnan via smohanty)"

This reverts commit 9ce7d709e26b3d598c1d21b5bf84e345eaf50d98.


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

Branch: refs/heads/branch-dev-logsearch
Commit: 34eafc341782ecf8795eaa0b8f78477db2db9e38
Parents: 23a2715
Author: Sumit Mohanty 
Authored: Sat Mar 4 08:36:57 2017 -0800
Committer: Sumit Mohanty 
Committed: Sat Mar 4 08:36:57 2017 -0800

--
 .../main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml| 1 -
 .../src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml   | 2 +-
 .../src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/34eafc34/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
index fa9548b..245a94d 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
@@ -28,7 +28,6 @@
   
 true
 true
-true
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/34eafc34/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
index f2a1161..4230dd4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
@@ -23,7 +23,7 @@
   1.2.1.2.5
   
 true
-true
+false
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/34eafc34/ambari-server/src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml
index 05b1543..75aa9d9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml
@@ -22,7 +22,7 @@
   OOZIE
   
 true
-true
+false
   
   common-services/OOZIE/4.2.0.2.5
 

[34/50] [abbrv] ambari git commit: AMBARI-20357. [Hive2] JS error in udf delete (pallavkul)

[oleewere]

AMBARI-20357. [Hive2] JS error in udf delete (pallavkul)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 63dad097a730d6403f052e0083fa0e665de26f25
Parents: 60095bc
Author: pallavkul 
Authored: Wed Mar 8 20:50:09 2017 +0530
Committer: pallavkul 
Committed: Wed Mar 8 20:51:44 2017 +0530

--
 .../resources/ui/app/components/udf-item.js | 148 +--
 .../resources/ui/app/routes/queries/query.js|   4 +-
 .../src/main/resources/ui/app/routes/udfs.js|  18 ++-
 .../main/resources/ui/app/routes/udfs/new.js| 138 ++---
 .../resources/ui/app/services/auto-refresh.js   |   2 +-
 .../ui/app/templates/components/udf-item.hbs|  26 ++--
 .../main/resources/ui/app/templates/udfs.hbs|   3 +
 7 files changed, 221 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/63dad097/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
index 44f56e5..3e6e623 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/udf-item.js
@@ -17,8 +17,9 @@
  */
 
 import Ember from 'ember';
+import UILoggerMixin from '../mixins/ui-logger';
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(UILoggerMixin, {
 
   store: Ember.inject.service(),
 
@@ -30,10 +31,43 @@ export default Ember.Component.extend({
   showDeleteUdfModal: false,
   expandedValue: null,
   udfId: null,
+  editUdfId: Ember.computed('udf', function () {
+return this.get('udf.id');
+  }),
+  editUdfName: Ember.computed('udf', function () {
+return this.get('udf.name');
+  }),
+  editUdfClassName: Ember.computed('udf', function () {
+return this.get('udf.classname');
+  }),
+  editOwner: Ember.computed('udf', function () {
+return this.get('udf.owner');
+  }),
+  editFileResource: Ember.computed('udf', function () {
+return this.get('udf.fileResource');
+  }),
   fileResourceList:[],
   selectedFileResource: null,
   isAddingNewFileResource: false,
 
+  validate(udfName, udfClassName, resourceName, resourcePath){
+if (Ember.isEmpty(udfName)) {
+  this.get('logger').danger('UDF Name can not be empty.');
+  return false;
+}
+
+if (Ember.isEmpty(udfClassName)) {
+  this.get('logger').danger('UDF Class Name can not be empty.');
+  return false;
+}
+
+if (Ember.isEmpty(resourceName) || Ember.isEmpty(resourcePath)) {
+  this.get('logger').danger('File Resource can not be empty.');
+  return false;
+}
+return true;
+  },
+
   actions: {
 toggleExpandUdf(fileResourceId) {
 
@@ -59,14 +93,30 @@ export default Ember.Component.extend({
 this.set('expandedEdit', true);
 this.set('valueLoading', true);
 
-this.get('store').find('fileResource', fileResourceId).then((data) => {
-  this.set('udfFileResourceName', data.get('name'));
-  this.set('udfFileResourcePath', data.get('path'));
-});
+this.get('store').findAll('file-resource').then((data) => {
+  let fileResourceList = [];
+  data.forEach(x => {
+let localFileResource = {'id': x.get('id'),
+  'name': x.get('name'),
+  'path': x.get('path'),
+  'owner': x.get('owner')
+};
+fileResourceList.push(localFileResource);
+  });
 
+  fileResourceList.filterBy('id', fileResourceId).map((data) => {
+this.set('udfFileResourceName', data.name);
+this.set('udfFileResourcePath', data.path);
 
+this.get('store').find('udf', udfId).then((data) => {
+this.set('editUdfId', udfId);
+this.set('editUdfName', data.get('name'));
+this.set('editUdfClassName', data.get('classname'));
+this.set('editOwner', data.get('owner'));
+  });
+  });
+});
 this.send('setFileResource', fileResourceId);
-
   }
 },
 
@@ -75,39 +125,38 @@ export default Ember.Component.extend({
 },
 
 saveUDf(name, classname, udfid, udfFileResourceName, udfFileResourcePath){
-
   let self = this;
-
-  if(!Ember.isEmpty(this.get('selectedFileResource'))){
-

[44/50] [abbrv] ambari git commit: AMBARI-20373. Complete button after move masters is grayed out even after move has completed (akovalenko)

[oleewere]

AMBARI-20373. Complete button after move masters is grayed out even after move 
has completed (akovalenko)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 4534e0a5aa91f34b44ac32e492cc960d91c07046
Parents: c52027c
Author: Aleksandr Kovalenko 
Authored: Thu Mar 9 13:14:53 2017 +0200
Committer: Aleksandr Kovalenko 
Committed: Thu Mar 9 16:25:57 2017 +0200

--
 ambari-web/app/routes/reassign_master_routes.js | 33 
 1 file changed, 13 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4534e0a5/ambari-web/app/routes/reassign_master_routes.js
--
diff --git a/ambari-web/app/routes/reassign_master_routes.js 
b/ambari-web/app/routes/reassign_master_routes.js
index d5cbadb..9bc7d06 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -292,22 +292,21 @@ module.exports = App.WizardRoute.extend({
 
 next: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep6 = 
router.get('reassignMasterWizardStep6Controller');
-  if (!reassignMasterWizardStep6.get('isSubmitDisabled')) {
-controller.finish();
-controller.get('popup').hide();
-App.clusterStatus.setClusterStatus({
-  clusterName: 
router.get('reassignMasterController.content.cluster.name'),
-  clusterState: 'DEFAULT',
-  localdb: App.db.data
-}, {alwaysCallback: function () {
+  controller.finish();
+  controller.get('popup').hide();
+  App.clusterStatus.setClusterStatus({
+clusterName: 
router.get('reassignMasterController.content.cluster.name'),
+clusterState: 'DEFAULT',
+localdb: App.db.data
+  }, {
+alwaysCallback: function () {
   controller.get('popup').hide();
   router.transitionTo('main.index');
-  Em.run.next(function() {
+  Em.run.next(function () {
 location.reload();
   });
-}});
-  }
+}
+  });
 },
 
 unroutePath: function () {
@@ -331,18 +330,12 @@ module.exports = App.WizardRoute.extend({
 
 next: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep7 = 
router.get('reassignMasterWizardStep7Controller');
-  if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
-controller.resetOnClose(controller, 'main.index');
-  }
+  controller.resetOnClose(controller, 'main.index');
 },
 
 complete: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep7 = 
router.get('reassignMasterWizardStep7Controller');
-  if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
-controller.resetOnClose(controller, 'main.index');
-  }
+  controller.resetOnClose(controller, 'main.index');
 },
 
 unroutePath: function () {

[38/50] [abbrv] ambari git commit: AMBARI-20361 - Stack Upgrade tests fail during Hive Metastore restart due to missing hive-site.jceks file (jonathanhurley)

[oleewere]

AMBARI-20361 - Stack Upgrade tests fail during Hive Metastore restart due to 
missing hive-site.jceks file (jonathanhurley)


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

Branch: refs/heads/branch-dev-logsearch
Commit: c5d2d5b03073215667a3a70989600c5a99bf1e9a
Parents: 6631ad5
Author: Jonathan Hurley 
Authored: Wed Mar 8 11:00:44 2017 -0500
Committer: Jonathan Hurley 
Committed: Wed Mar 8 13:32:48 2017 -0500

--
 .../src/main/python/resource_management/core/source.py  | 5 +++--
 ambari-server/src/test/python/stacks/utils/RMFTestCase.py   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c5d2d5b0/ambari-common/src/main/python/resource_management/core/source.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/source.py 
b/ambari-common/src/main/python/resource_management/core/source.py
index cee6f57..e31f7d6 100644
--- a/ambari-common/src/main/python/resource_management/core/source.py
+++ b/ambari-common/src/main/python/resource_management/core/source.py
@@ -72,16 +72,17 @@ class StaticFile(Source):
   basedir = self.env.config.basedir
   path = os.path.join(basedir, "files", self.name)
   
-if not os.path.isfile(path) and not os.path.islink(path):
+if not sudo.path_isfile(path) and not sudo.path_lexists(path):
   raise Fail("{0} Source file {1} is not found".format(repr(self), path))
 
 return self.read_file(path)
 
+
   @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
   def read_file(self, path):
-from resource_management.core import sudo
 return sudo.read_file(path)
 
+
   @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
   def read_file(self, path):
 with open(path, "rb") as fp:

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5d2d5b0/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
--
diff --git a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py 
b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
index 9240d38..7dd3990 100644
--- a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
+++ b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
@@ -325,6 +325,7 @@ def StaticFile(name, **kwargs):
   with RMFTestCase.env:
 from resource_management.core.source import StaticFile
 from resource_management.core import sudo
+sudo.path_isfile = lambda path: True
 sudo.read_file = lambda path: 'dummy_output'
 return StaticFile(name, **kwargs)
   

[20/50] [abbrv] ambari git commit: AMBARI-20339. JS Lint warning removal (pallavkul)

[oleewere]

AMBARI-20339. JS Lint warning removal (pallavkul)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 3bc3d6861a634c775a87881ab4eda67d06b676bc
Parents: 225edb9
Author: pallavkul 
Authored: Tue Mar 7 20:36:25 2017 +0530
Committer: pallavkul 
Committed: Tue Mar 7 20:37:49 2017 +0530

--
 .../hive20/src/main/resources/ui/.jshintrc  |  2 +
 .../resources/ui/app/adapters/file-resource.js  |  1 -
 .../resources/ui/app/adapters/hdfs-viewer.js|  1 +
 .../src/main/resources/ui/app/adapters/job.js   |  5 +-
 .../src/main/resources/ui/app/adapters/query.js |  5 +-
 .../resources/ui/app/adapters/saved-query.js|  1 -
 .../resources/ui/app/adapters/table-info.js |  2 +-
 .../src/main/resources/ui/app/adapters/table.js |  2 +-
 .../src/main/resources/ui/app/adapters/udf.js   |  8 ---
 .../resources/ui/app/adapters/upload-table.js   |  4 +-
 .../resources/ui/app/components/create-table.js |  2 +-
 .../resources/ui/app/components/edit-table.js   |  6 +-
 .../ui/app/components/export-result.js  |  2 +-
 .../ui/app/components/fileresource-item.js  |  5 +-
 .../resources/ui/app/components/job-item.js |  1 +
 .../resources/ui/app/components/list-filter.js  |  2 +-
 .../ui/app/components/notification-message.js   |  4 +-
 .../resources/ui/app/components/query-editor.js |  2 +-
 .../ui/app/components/query-result-table.js |  9 ++-
 .../app/components/table-advanced-settings.js   |  4 +-
 .../resources/ui/app/components/udf-item.js |  7 +--
 .../main/resources/ui/app/components/udf-new.js |  2 +-
 .../ui/app/components/validated-text-field.js   |  2 +-
 .../ui/app/components/visual-explain.js |  2 +-
 .../main/resources/ui/app/configs/datatypes.js  |  2 +-
 .../ui/app/controllers/service-check.js |  8 +--
 .../resources/ui/app/helpers/extract-value.js   |  2 +-
 .../ui/app/helpers/format-column-size.js|  2 +-
 .../resources/ui/app/models/table-property.js   |  2 +-
 .../hive20/src/main/resources/ui/app/router.js  |  2 +-
 .../app/routes/databases/database/tables/new.js |  2 +-
 .../databases/database/tables/table/edit.js |  1 +
 .../databases/database/tables/upload-table.js   | 58 +---
 .../src/main/resources/ui/app/routes/jobs.js|  6 +-
 .../resources/ui/app/routes/queries/query.js| 17 +++---
 .../ui/app/routes/queries/query/log.js  |  4 +-
 .../resources/ui/app/routes/savedqueries.js |  4 +-
 .../main/resources/ui/app/routes/settings.js|  6 +-
 .../src/main/resources/ui/app/routes/udfs.js|  2 +-
 .../src/main/resources/ui/app/services/jobs.js  |  6 +-
 .../src/main/resources/ui/app/services/query.js | 12 ++--
 .../resources/ui/app/services/saved-queries.js  | 14 ++---
 .../resources/ui/app/services/service-check.js  |  2 +-
 .../resources/ui/app/services/stats-service.js  |  6 +-
 .../ui/app/services/table-operations.js | 22 
 .../src/main/resources/ui/app/services/udf.js   | 25 +++--
 .../components/table-advanced-settings.hbs  |  8 ---
 .../ui/app/utils/hive-explainer/enhancer.js |  2 +-
 .../app/utils/hive-explainer/renderer-force.js  | 21 +++
 .../ui/app/utils/hive-explainer/renderer.js | 34 +++-
 .../ui/app/utils/hive-explainer/transformer.js  | 10 ++--
 51 files changed, 176 insertions(+), 185 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3bc3d686/contrib/views/hive20/src/main/resources/ui/.jshintrc
--
diff --git a/contrib/views/hive20/src/main/resources/ui/.jshintrc 
b/contrib/views/hive20/src/main/resources/ui/.jshintrc
index d421faa..8cedd57 100644
--- a/contrib/views/hive20/src/main/resources/ui/.jshintrc
+++ b/contrib/views/hive20/src/main/resources/ui/.jshintrc
@@ -2,6 +2,8 @@
   "predef": [
 "document",
 "window",
+"d3",
+"CodeMirror",
 "-Promise"
   ],
   "browser": true,

http://git-wip-us.apache.org/repos/asf/ambari/blob/3bc3d686/contrib/views/hive20/src/main/resources/ui/app/adapters/file-resource.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/adapters/file-resource.js 
b/contrib/views/hive20/src/main/resources/ui/app/adapters/file-resource.js
index a25adc7..7f6ab80 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/adapters/file-resource.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/adapters/file-resource.js
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import Ember from 'ember';
 import 

[08/50] [abbrv] ambari git commit: AMBARI-20309. HBase Master CPU Utilization Alert is in unknown state due to kinit error (rlevas)

[oleewere]

http://git-wip-us.apache.org/repos/asf/ambari/blob/e8956590/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
index 529ac5c..ad01e07 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
@@ -21,12 +21,16 @@ package org.apache.ambari.server.upgrade;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
 import com.google.inject.AbstractModule;
 import com.google.inject.Binder;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.Provider;
+
 import junit.framework.Assert;
 import junit.framework.AssertionFailedError;
 
@@ -69,6 +73,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import javax.persistence.EntityManager;
+
 import java.io.File;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -76,6 +81,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -144,7 +150,7 @@ public class UpgradeCatalog250Test {
   private Clusters clusters;
 
   @Mock(type = MockType.NICE)
-  private  Cluster cluster;
+  private Cluster cluster;
 
   @Mock(type = MockType.NICE)
   private Injector injector;
@@ -181,16 +187,16 @@ public class UpgradeCatalog250Test {
 Capture capturedComponentVersionColumns = 
newCapture();
 
 dbAccessor.createTable(eq(UpgradeCatalog250.COMPONENT_VERSION_TABLE), 
capture(capturedComponentVersionColumns),
-  eq((String[]) null));
+eq((String[]) null));
 
 dbAccessor.addPKConstraint(eq(UpgradeCatalog250.COMPONENT_VERSION_TABLE),
-  eq(UpgradeCatalog250.COMPONENT_VERSION_PK), eq("id"));
+eq(UpgradeCatalog250.COMPONENT_VERSION_PK), eq("id"));
 dbAccessor.addFKConstraint(eq(UpgradeCatalog250.COMPONENT_VERSION_TABLE),
-  eq(UpgradeCatalog250.COMPONENT_VERSION_FK_COMPONENT), eq("component_id"),
-  eq(UpgradeCatalog250.COMPONENT_TABLE), eq("id"), eq(false));
+eq(UpgradeCatalog250.COMPONENT_VERSION_FK_COMPONENT), 
eq("component_id"),
+eq(UpgradeCatalog250.COMPONENT_TABLE), eq("id"), eq(false));
 dbAccessor.addFKConstraint(eq(UpgradeCatalog250.COMPONENT_VERSION_TABLE),
-  eq(UpgradeCatalog250.COMPONENT_VERSION_FK_REPO_VERSION), 
eq("repo_version_id"),
-  eq("repo_version"), eq("repo_version_id"), eq(false));
+eq(UpgradeCatalog250.COMPONENT_VERSION_FK_REPO_VERSION), 
eq("repo_version_id"),
+eq("repo_version"), eq("repo_version_id"), eq(false));
 
 // servicedesiredstate table
 Capture capturedCredentialStoreEnabledCol = 
newCapture();
@@ -288,27 +294,29 @@ public class UpgradeCatalog250Test {
 Method updateAlerts = 
UpgradeCatalog250.class.getDeclaredMethod("updateStormAlerts");
 Method removeAlertDuplicates = 
UpgradeCatalog250.class.getDeclaredMethod("removeAlertDuplicates");
 Method updateKerberosDescriptorArtifacts = 
AbstractUpgradeCatalog.class.getDeclaredMethod("updateKerberosDescriptorArtifacts");
+Method fixHBaseMasterCPUUtilizationAlertDefinition = 
UpgradeCatalog250.class.getDeclaredMethod("fixHBaseMasterCPUUtilizationAlertDefinition");
 
 UpgradeCatalog250 upgradeCatalog250 = 
createMockBuilder(UpgradeCatalog250.class)
-  .addMockedMethod(updateAmsConfigs)
-  .addMockedMethod(updateHadoopEnvConfigs)
-  .addMockedMethod(updateKafkaConfigs)
-  .addMockedMethod(updateHIVEInteractiveConfigs)
-  .addMockedMethod(updateHiveLlapConfigs)
-  .addMockedMethod(updateTablesForZeppelinViewRemoval)
-  .addMockedMethod(updateZeppelinConfigs)
-  .addMockedMethod(updateAtlasConfigs)
-  .addMockedMethod(updateLogSearchConfigs)
-  .addMockedMethod(updateAmbariInfraConfigs)
-  .addMockedMethod(addNewConfigurationsFromXml)
-  .addMockedMethod(updateRangerUrlConfigs)
-  .addMockedMethod(addManageServiceAutoStartPermissions)
-  .addMockedMethod(addManageAlertNotificationsPermissions)
-  .addMockedMethod(updateYarnSite)
-  .addMockedMethod(updateAlerts)
-  .addMockedMethod(removeAlertDuplicates)
-  .addMockedMethod(updateKerberosDescriptorArtifacts)
-  .createMock();
+.addMockedMethod(updateAmsConfigs)
+.addMockedMethod(updateHadoopEnvConfigs)
+.addMockedMethod(updateKafkaConfigs)
+

[22/50] [abbrv] ambari git commit: AMBARI-20256. Auto Hive 2.0 instance is missing permission for default Ambari roles. (dipayanb)

[oleewere]

AMBARI-20256. Auto Hive 2.0 instance is missing permission for default Ambari 
roles. (dipayanb)


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

Branch: refs/heads/branch-dev-logsearch
Commit: a92b7c80210ab180c6782600c38c0566e8d9acb6
Parents: 7e8a815
Author: Dipayan Bhowmick 
Authored: Wed Mar 8 00:59:27 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Wed Mar 8 00:59:27 2017 +0530

--
 contrib/views/hive20/src/main/resources/view.xml | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a92b7c80/contrib/views/hive20/src/main/resources/view.xml
--
diff --git a/contrib/views/hive20/src/main/resources/view.xml 
b/contrib/views/hive20/src/main/resources/view.xml
index 37ddf56..f0e9e34 100644
--- a/contrib/views/hive20/src/main/resources/view.xml
+++ b/contrib/views/hive20/src/main/resources/view.xml
@@ -395,5 +395,12 @@
 
 HIVE
 
+
+CLUSTER.ADMINISTRATOR
+CLUSTER.OPERATOR
+SERVICE.ADMINISTRATOR
+SERVICE.OPERATOR
+CLUSTER.USER
+
 
 

[21/50] [abbrv] ambari git commit: AMBARI-20344. RU: MR2 service check failed during rolling upgrade (dlysnichenko)

[oleewere]

AMBARI-20344. RU: MR2 service check failed during rolling upgrade (dlysnichenko)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 7e8a8150e8e103e1835c72cfd8bcc65a623b6d46
Parents: 3bc3d68
Author: Lisnichenko Dmitro 
Authored: Tue Mar 7 18:02:05 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Tue Mar 7 18:02:05 2017 +0200

--
 .../resource_management/libraries/functions/stack_select.py | 5 -
 .../SLIDER/0.60.0.2.2/package/scripts/service_check.py  | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8a8150/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
index 513ceac..34c311d 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
@@ -91,7 +91,10 @@ SERVICE_CHECK_DIRECTORY_MAP = {
   "PIG_SERVICE_CHECK" : "hadoop-client",
   "HIVE_SERVICE_CHECK" : "hadoop-client",
   "OOZIE_SERVICE_CHECK" : "hadoop-client",
-  "MAHOUT_SERVICE_CHECK" : "mahout-client"
+  "MAHOUT_SERVICE_CHECK" : "mahout-client",
+  "MAPREDUCE2_SERVICE_CHECK" : "hadoop-client",
+  "YARN_SERVICE_CHECK" : "hadoop-client",
+  "SLIDER_SERVICE_CHECK" : "slider-client"
 }
 
 # /current/hadoop-client/[bin|sbin|libexec|lib]

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8a8150/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
index 2f656c7..3b2c4ab 100644
--- 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
@@ -39,6 +39,7 @@ class SliderServiceCheck(Script):
   def service_check(self, env):
 import params
 env.set_params(params)
+environment={'HADOOP_CONF_DIR': '/usr/hdp/2.4.3.0-227/hadoop/conf'}
 
 if params.stack_version_formatted and 
check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, 
params.stack_version_formatted):
   copy_to_hdfs("slider", params.user_group, params.hdfs_user, 
skip=params.sysprep_skip_copy_tarballs_hdfs)
@@ -52,7 +53,8 @@ class SliderServiceCheck(Script):
 tries=3,
 try_sleep=5,
 user=params.smokeuser,
-logoutput=True
+logoutput=True,
+environment=environment
 )
 
 

[43/50] [abbrv] ambari git commit: AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove clutter from slider service check (dlysnichenko)

[oleewere]

AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove 
clutter from slider service check (dlysnichenko)


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

Branch: refs/heads/branch-dev-logsearch
Commit: c52027c849038c11e58e1c0b4eecb740bc9d0a1a
Parents: c9f7056
Author: Lisnichenko Dmitro 
Authored: Thu Mar 9 16:18:15 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Thu Mar 9 16:19:15 2017 +0200

--
 .../SLIDER/0.60.0.2.2/package/scripts/service_check.py | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c52027c8/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
index 3b2c4ab..f8e213c 100644
--- 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
@@ -39,7 +39,6 @@ class SliderServiceCheck(Script):
   def service_check(self, env):
 import params
 env.set_params(params)
-environment={'HADOOP_CONF_DIR': '/usr/hdp/2.4.3.0-227/hadoop/conf'}
 
 if params.stack_version_formatted and 
check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, 
params.stack_version_formatted):
   copy_to_hdfs("slider", params.user_group, params.hdfs_user, 
skip=params.sysprep_skip_copy_tarballs_hdfs)
@@ -54,7 +53,6 @@ class SliderServiceCheck(Script):
 try_sleep=5,
 user=params.smokeuser,
 logoutput=True,
-environment=environment
 )
 
 

[35/50] [abbrv] ambari git commit: AMBARI-20346 Log Search Upgrade should modify keystore / truststore path if it wasn't used (mgergely)

[oleewere]

AMBARI-20346 Log Search Upgrade should modify keystore / truststore path if it 
wasn't used (mgergely)

Change-Id: Ib5614acea9667205b2eaecbd57e3d4ec3c560f5f


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

Branch: refs/heads/branch-dev-logsearch
Commit: 546225f326323a5d6e6013c8413a36180e0b0d32
Parents: 63dad09
Author: Miklos Gergely 
Authored: Wed Mar 8 16:32:28 2017 +0100
Committer: Miklos Gergely 
Committed: Wed Mar 8 16:33:58 2017 +0100

--
 .../ambari/server/upgrade/UpgradeCatalog250.java|  7 +++
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |  2 +-
 .../server/upgrade/UpgradeCatalog250Test.java   | 16 +++-
 3 files changed, 19 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/546225f3/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 36160ca..00d1c31 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
@@ -1006,6 +1006,13 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
   newProperties.put("content", content);
 }
 
+if 
("http".equals(logsearchEnvProperties.getProperties().get("logsearch_ui_protocol"))
 &&
+
"/etc/security/serverKeys/logsearch.trustStore.jks".equals(logsearchEnvProperties.getProperties().get("logsearch_truststore_location"))
 &&
+
"/etc/security/serverKeys/logsearch.keyStore.jks".equals(logsearchEnvProperties.getProperties().get("logsearch_keystore_location")))
 {
+  newProperties.put("logsearch_truststore_location", 
"/etc/ambari-logsearch-portal/conf/keys/logsearch.jks");
+  newProperties.put("logsearch_keystore_location", 
"/etc/ambari-logsearch-portal/conf/keys/logsearch.jks");
+}
+
 Set removeProperties = new HashSet<>();
 removeProperties.add("logsearch_solr_audit_logs_use_ranger");
 removeProperties.add("logsearch_solr_audit_logs_zk_node");

http://git-wip-us.apache.org/repos/asf/ambari/blob/546225f3/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
index 17c536e..8dac69a 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
@@ -336,7 +336,7 @@ logfeeder_custom_config_file_names = 
['input.config-%s.json' % (tag.replace('-lo
   for tag, content in 
logfeeder_metadata.iteritems() if any(logfeeder_metadata)]
 
 if logfeeder_system_log_enabled:
-  default_config_files = ','.join(['output.json','input.config-ambari.json'] + 
logfeeder_default_config_file_names + logfeeder_custom_config_file_names
+  default_config_files = 
','.join(['output.config.json','input.config-ambari.json'] + 
logfeeder_default_config_file_names + logfeeder_custom_config_file_names
   + ['input.config-system_messages.json', 
'input.config-secure_log.json'])
 else:
   default_config_files = 
','.join(['output.config.json','input.config-ambari.json'] + 
logfeeder_default_config_file_names + logfeeder_custom_config_file_names)

http://git-wip-us.apache.org/repos/asf/ambari/blob/546225f3/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
index cb2e5f6..1a87433 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
@@ -1235,13 +1235,19 @@ public class UpgradeCatalog250Test {
 

[29/50] [abbrv] ambari git commit: AMBARI-20342. WFM:Performance improvement for adding node on a decision node in large workflow.(Padma Priya N via gauravn7)

[oleewere]

AMBARI-20342. WFM:Performance improvement for adding node on a decision node in 
large workflow.(Padma Priya N via gauravn7)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 3fd1c24442f4c90becff35c004290e829f136318
Parents: 267c98f
Author: Gaurav Nagar 
Authored: Wed Mar 8 16:57:21 2017 +0530
Committer: Gaurav Nagar 
Committed: Wed Mar 8 16:57:21 2017 +0530

--
 .../ui/app/components/flow-designer.js  | 73 
 .../ui/app/domain/cytoscape-flow-renderer.js|  8 ++-
 .../src/main/resources/ui/app/styles/app.less   |  4 ++
 .../app/templates/components/flow-designer.hbs  |  5 ++
 4 files changed, 59 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3fd1c244/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index 01f8fe6..37992be 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -275,15 +275,23 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 this.doValidation();
 this.renderTransitions();
   },
-  rerender(){
-this.flowRenderer.cleanup();
-this.renderWorkflow(this.get("workflow"));
+  rerender(callback){
+this.set('showStatus', true);
+Ember.run.later(() => {
+  this.flowRenderer.cleanup();
+  this.renderWorkflow(this.get("workflow"));
+  this.set('showStatus', false);
+  if(callback){
+callback();
+  }
+}.bind(this));
   },
   setCurrentTransition(transitionInfo){
 this.set("currentTransition", {
   transition : transitionInfo.transition,
   source : transitionInfo.source,
-  target : transitionInfo.target
+  target : transitionInfo.target,
+  originalSource : transitionInfo.originalSource
 });
   },
   actionInfo(node){
@@ -292,8 +300,9 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   deleteTransition(transition,sourceNode){
 this.createSnapshot();
 this.get("workflow").deleteTransition(transition);
-this.showUndo('transition');
-this.rerender();
+this.rerender(function(){
+  this.showUndo('transition');
+}.bind(this));
   },
   showWorkflowActionSelect(element){
 var self=this;
@@ -422,12 +431,9 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 var x2js = new X2JS();
 var actionNodeXml = x2js.xml_str2json(actionNodeXmlString);
 var actionNodeType = Object.keys(actionNodeXml)[0];
-var currentTransition = this.get("currentTransition.transition");
 this.createSnapshot();
-var transition = 
this.get("currentTransition").source.transitions.findBy('targetNode.id',currentTransition.targetNode.id);
-transition.source=this.get("currentTransition").source;
 this.generateUniqueNodeId(actionNodeType);
-var actionNode = this.get("workflow").addNode(transition,actionNodeType, 
{}, "");
+var actionNode = 
this.get("workflow").addNode(this.getTransitionInfo(),actionNodeType, {}, "");
 this.rerender();
 this.doValidation();
 this.scrollToNewPosition();
@@ -635,9 +641,10 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 } else {
   this.get("workflow").deleteNode(node,transitionslist);
 }
-this.rerender();
-this.doValidation();
-this.showUndo('nodeDeleted');
+this.rerender(function(){
+  this.doValidation();
+  this.showUndo('nodeDeleted');
+}.bind(this));
   },
   addWorkflowBranch(node){
 this.createSnapshot();
@@ -749,6 +756,18 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   return 1;
 }
   },
+  getTransitionInfo(){
+var currentTransition=this.get("currentTransition.transition");
+var transition = {};
+if(this.get("currentTransition").source.type === 'placeholder'){
+  transition = 
this.get("currentTransition").originalSource.transitions.findBy('targetNode.id',this.get("currentTransition").source.id);
+  transition.source=this.get("currentTransition").originalSource;
+}else{
+  transition = 
this.get("currentTransition").source.transitions.findBy('targetNode.id',currentTransition.targetNode.id);
+  transition.source=this.get("currentTransition").source;
+}
+

[42/50] [abbrv] ambari git commit: AMBARI-20371. WFM: Delete option in Manage recent list. (Venkata Sairam via pallavkul)

[oleewere]

AMBARI-20371. WFM: Delete option in Manage recent list. (Venkata Sairam via 
pallavkul)


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

Branch: refs/heads/branch-dev-logsearch
Commit: c9f70565538ea7710b2824c95c6190417711ff1b
Parents: c7086b1
Author: pallavkul 
Authored: Thu Mar 9 19:28:52 2017 +0530
Committer: pallavkul 
Committed: Thu Mar 9 19:29:57 2017 +0530

--
 .../ui/app/components/designer-workspace.js |   1 +
 .../resources/ui/app/components/drafts-wf.js|  84 +++--
 .../ui/app/components/recent-projects.js|  32 +---
 .../src/main/resources/ui/app/styles/app.less   |  14 +-
 .../templates/components/designer-workspace.hbs |   2 +-
 .../ui/app/templates/components/drafts-wf.hbs   | 175 ---
 .../templates/components/recent-projects.hbs|  17 +-
 7 files changed, 195 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f70565/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
index 0e49d70..980904f 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
@@ -213,6 +213,7 @@ export default Ember.Component.extend({
 },
 editWorkflow(path, type){
   this.sendAction('editWorkflow', path, type);
+  this.send('hideProjectManagerList');
 },
 showProjectManagerList(){
   var deferred = Ember.RSVP.defer();

http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f70565/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
index 1d01e9b..ed448d9 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
@@ -24,9 +24,10 @@ export default Ember.Component.extend({
   "isCoordinator": true,
   "isWorkflow": true,
   "sortProp": ['updatedAt:desc'],
-  "filteredModels": Ember.computed("model", "search", "isBundle", 
"isCoordinator", "isWorkflow", function(){
+  "filteredModels": Ember.computed("recentFiles", "search", "isBundle", 
"isCoordinator", "isWorkflow", {
+get(key) {
 var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
-return this.get("model").filter( (role) => {
+return this.get("recentFiles").filter( (role) => {
   score = 0
   if(searchTxt && searchTxt.length) {
 condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
@@ -42,22 +43,42 @@ export default Ember.Component.extend({
   }
   return condition && score > 0;
 });
+},
+set(key, value) {
+  this.set('recentFiles', value);
+
+  var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
+  return this.get("recentFiles").filter( (role) => {
+score = 0
+if(searchTxt && searchTxt.length) {
+  condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
+}
+if(isWorkflow && role.get('type') === 'WORKFLOW') {
+  score++;
+}
+if(isCoordinator && role.get('type') === 'COORDINATOR') {
+  score++;
+}
+if(isBundle && role.get('type') === 'BUNDLE') {
+  score++;
+}
+return condition && score > 0;
+  });
+  //return value;
+}
   }),
+  resetDetails() {
+this.set("deleteMsg", null);
+this.set("deleteInProgress", false);
+  },
   modelSorted : Ember.computed.sort("filteredModels", "sortProp"),
   "isDeleteDraftConformation": false,
   "currentDraft": undefined,
   "deleteInProgress": false,
   "deleteMsg": undefined,
   "currentJobService" : Ember.inject.service('current-job'),
-  elementsInserted: function () {
-  this.$('.actions').hide();
-  }.on("didInsertElement"),
   rendered : 

[12/50] [abbrv] ambari git commit: AMBARI-20308 - Atlas service check fails during EU on wire encrypted cluster (jonathanhurley)

[oleewere]

AMBARI-20308 - Atlas service check fails during EU on wire encrypted cluster 
(jonathanhurley)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 8e68824473cf68b5129ead6f81d4d9e5b9cfdc8f
Parents: e19f57e
Author: Jonathan Hurley 
Authored: Mon Mar 6 14:21:11 2017 -0500
Committer: Jonathan Hurley 
Committed: Mon Mar 6 14:23:44 2017 -0500

--
 .../configuration/application-properties.xml| 42 
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  6 +++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 16 +---
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  6 +++
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml |  6 +++
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 +
 .../configuration/application-properties.xml|  3 +-
 7 files changed, 73 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e688244/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
new file mode 100644
index 000..366ecf6
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+  
+  
+atlas.ssl.exclude.protocols
+Excluded Wire Encryption Protocols
+TLSv1.2
+
+  true
+
+A comma-separate list of the wire encryption protocols to 
exclude when TLS is enabled. Some versions of cURL do not work with 
TLSv1.2.
+
+  
+application-properties
+atlas.enableTLS
+  
+
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e688244/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 93e0149..6f3fe42 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
@@ -103,6 +103,11 @@
 
 
   
+
+  
+application-properties
+
+  
 
   
   
@@ -136,6 +141,7 @@
 
   
 
+

 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e688244/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
index 5b37375..e7ada04 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
@@ -75,7 +75,7 @@
   
 FLUME_HANDLER
   
-  
+
   
 ACCUMULO_TRACER
 ACCUMULO_GC
@@ -300,6 +300,12 @@
   
 
   
+  
+  
+
+  Updating Atlas TLS Exclude Protocols to exclude TLS 
v1.2
+
+  
 
 
 
 
   false
@@ -671,7 +677,7 @@
 FLUME_HANDLER
   
 
-
+
 
   false
   true
@@ -700,7 +706,7 @@
 
 
   UPGRADE
-  
+
   
 
   
@@ -770,7 +776,7 @@
 setup_ranger_java_patches
   
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e688244/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 55e8924..fe297c3 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
@@ -431,6 +431,12 @@
   Updating the Atlas Log4J properties to include 

[41/50] [abbrv] ambari git commit: AMBARI-20343 Zeppelin: Configure both Hive and Hive interactive interpreters whenever required (r-kamath)

[oleewere]

AMBARI-20343 Zeppelin: Configure both Hive and Hive interactive interpreters 
whenever required (r-kamath)


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

Branch: refs/heads/branch-dev-logsearch
Commit: c7086b11b7e5536e0c8b56130774e728aa3363f6
Parents: ec33f22
Author: Renjith Kamath 
Authored: Thu Mar 9 12:44:31 2017 +0530
Committer: Renjith Kamath 
Committed: Thu Mar 9 12:44:31 2017 +0530

--
 .../0.6.0.2.5/package/scripts/master.py | 29 +---
 .../0.6.0.2.5/package/scripts/params.py | 10 +++
 2 files changed, 35 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c7086b11/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index fc24918..a460aec 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -319,10 +319,15 @@ class Master(Script):
   config_id = livy2_config["id"]
   interpreter_settings[config_id] = livy2_config
 
+hive_interactive_properties_key = 'hive_interactive'
 for setting_key in interpreter_settings.keys():
   interpreter = interpreter_settings[setting_key]
   if interpreter['group'] == 'jdbc':
 interpreter['dependencies'] = []
+
+if not params.hive_server_host and 
params.hive_server_interactive_hosts:
+  hive_interactive_properties_key = 'hive'
+
 if params.hive_server_host:
   interpreter['properties']['hive.driver'] = 
'org.apache.hive.jdbc.HiveDriver'
   interpreter['properties']['hive.user'] = 'hive'
@@ -330,17 +335,33 @@ class Master(Script):
   if params.hive_server2_support_dynamic_service_discovery:
 interpreter['properties']['hive.url'] = 'jdbc:hive2://' + \
  params.hive_zookeeper_quorum 
+ \
- '/;' + 
'serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2'
+ '/;' + 
'serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=' + \
+
params.hive_zookeeper_namespace
   else:
 interpreter['properties']['hive.url'] = 'jdbc:hive2://' + \
  params.hive_server_host + \
  ':' + 
params.hive_server_port
+if params.hive_server_interactive_hosts:
+  interpreter['properties'][hive_interactive_properties_key + 
'.driver'] = 'org.apache.hive.jdbc.HiveDriver'
+  interpreter['properties'][hive_interactive_properties_key + '.user'] 
= 'hive'
+  interpreter['properties'][hive_interactive_properties_key + 
'.password'] = ''
+  if params.hive_server2_support_dynamic_service_discovery:
+interpreter['properties'][hive_interactive_properties_key + 
'.url'] = 'jdbc:hive2://' + \
+
params.hive_zookeeper_quorum + \
+'/;' + 
'serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=' + \
+
params.hive_interactive_zookeeper_namespace
+  else:
+interpreter['properties'][hive_interactive_properties_key + 
'.url'] = 'jdbc:hive2://' + \
+
params.hive_server_interactive_hosts + \
+':' + 
params.hive_server_port
+
+if params.hive_server_host or params.hive_server_interactive_hosts:
   interpreter['dependencies'].append(
-  {"groupArtifactVersion": "org.apache.hive:hive-jdbc:2.0.1", 
"local": "false"})
+{"groupArtifactVersion": "org.apache.hive:hive-jdbc:2.0.1", 
"local": "false"})
   interpreter['dependencies'].append(
-  {"groupArtifactVersion": 
"org.apache.hadoop:hadoop-common:2.7.2", "local": "false"})
+{"groupArtifactVersion": "org.apache.hadoop:hadoop-common:2.7.2", 
"local": "false"})
   interpreter['dependencies'].append(
-  {"groupArtifactVersion": 

[25/50] [abbrv] ambari git commit: AMBARI-20348 Discard/Save buttons for service configs are always enabled if custom property is overridden with empty value. (ababiichuk)

[oleewere]

AMBARI-20348 Discard/Save buttons for service configs are always enabled if 
custom property is overridden with empty value. (ababiichuk)


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

Branch: refs/heads/branch-dev-logsearch
Commit: ee6c5d8640c208f0fdec3f7ea59a777f35729e01
Parents: 07a30a1
Author: ababiichuk 
Authored: Tue Mar 7 19:30:52 2017 +0200
Committer: ababiichuk 
Committed: Wed Mar 8 00:14:59 2017 +0200

--
 ambari-web/app/utils/config.js   |  4 +++-
 ambari-web/test/utils/config_test.js | 30 ++
 2 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ee6c5d86/ambari-web/app/utils/config.js
--
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index a7f4edf..88e2cf4 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1214,7 +1214,9 @@ App.config = Em.Object.create({
 
 serviceConfigProperty.get('overrides').pushObject(newOverride);
 
-var savedOverrides = 
serviceConfigProperty.get('overrides').filterProperty('savedValue');
+var savedOverrides = 
serviceConfigProperty.get('overrides').filter(function (override) {
+  return !Em.isNone(Em.get(override, 'savedValue'));
+});
 serviceConfigProperty.set('overrideValues', 
savedOverrides.mapProperty('savedValue'));
 serviceConfigProperty.set('overrideIsFinalValues', 
savedOverrides.mapProperty('savedIsFinal'));
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee6c5d86/ambari-web/test/utils/config_test.js
--
diff --git a/ambari-web/test/utils/config_test.js 
b/ambari-web/test/utils/config_test.js
index c7bd5c7..ffedc23 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -534,6 +534,36 @@ describe('App.config', function () {
   });
 
 });
+
+describe('overrides with empty string values', function () {
+
+  beforeEach(function () {
+configProperty.set('overrides', [
+  {
+savedValue: null,
+savedIsFinal: true
+  },
+  {
+savedValue: '',
+savedIsFinal: false
+  },
+  {
+savedValue: '1',
+savedIsFinal: false
+  }
+]);
+App.config.createOverride(configProperty, null, group);
+  });
+
+  it('values', function () {
+expect(configProperty.get('overrideValues')).to.eql(['', '1']);
+  });
+
+  it('isFinal', function () {
+expect(configProperty.get('overrideIsFinalValues')).to.eql([false, 
false]);
+  });
+
+});
   });
 
   describe('#getIsSecure', function() {

[28/50] [abbrv] ambari git commit: AMBARI-20340.Issue with toggling of Execute/Stop button in query page while successful and failure execution of query.(Venkata Sairam)

[oleewere]

AMBARI-20340.Issue with toggling of Execute/Stop button in query page while 
successful and failure execution of query.(Venkata Sairam)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 267c98fb8afdb32dae3ae192f12324b040e55880
Parents: f66a663
Author: Gaurav Nagar 
Authored: Wed Mar 8 16:26:45 2017 +0530
Committer: Gaurav Nagar 
Committed: Wed Mar 8 16:27:46 2017 +0530

--
 .../resources/ui/app/routes/queries/query.js| 73 +++-
 .../src/main/resources/ui/app/styles/app.scss   |  4 +-
 2 files changed, 45 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/267c98fb/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index 08af7d4..80116da 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -133,9 +133,9 @@ export default Ember.Route.extend(UILoggerMixin, {
 controller.set('currentQuery', model.get('query'));
 controller.set('currentJobId', null);
 controller.set('queryResult', model.get('queryResult'));
-controller.set('isJobSuccess', false);
-controller.set('isJobCancelled', false);
-controller.set('isJobCreated', false);
+controller.set('isJobSuccess', model.get('isJobSuccess'));
+controller.set('isJobCancelled', model.get('isJobCancelled'));
+controller.set('isJobCreated', model.get('isJobCreated'));
 
 controller.set('isExportResultSuccessMessege', false);
 controller.set('isExportResultFailureMessege', false);
@@ -181,19 +181,22 @@ export default Ember.Route.extend(UILoggerMixin, {
   },
   actions: {
 
-resetDefaultWorksheet(){
-  this.get('controller.model').set('queryResult',{'schema' :[], 'rows' 
:[]});
-  this.get('controller.model').set('currentPage',0);
-  this.get('controller.model').set('previousPage',-1);
-  this.get('controller.model').set('nextPage',1);
+resetDefaultWorksheet(currModel){
+  if(!currModel) {
+currModel = this.get('controller.model');
+  }
+  currModel.set('queryResult',{'schema' :[], 'rows' :[]});
+  currModel.set('currentPage',0);
+  currModel.set('previousPage',-1);
+  currModel.set('nextPage',1);
   //this.get('controller.model').set('selected',false);
-  this.get('controller.model').set('jobData',[]);
-  this.get('controller.model').set('currentJobData',null);
-  this.get('controller.model').set('queryFile',"");
-  this.get('controller.model').set('logFile',"");
-  this.get('controller.model').set('logResults',"");
-  this.get('controller.model').set('isQueryRunning',false);
-  this.get('controller.model').set('isQueryResultContainer',false);
+  currModel.set('jobData',[]);
+  currModel.set('currentJobData',null);
+  currModel.set('queryFile',"");
+  currModel.set('logFile',"");
+  currModel.set('logResults',"");
+  currModel.set('isQueryRunning',false);
+  currModel.set('isQueryResultContainer',false);
 },
 
 changeDbHandler(selectedDBs){
@@ -244,9 +247,8 @@ export default Ember.Route.extend(UILoggerMixin, {
 
 executeQuery(isVisualExplainQuery){
 
-  let self = this;
+  let self = this, ctrlr = self.get('controller'), ctrlrModel = 
self.get('controller.model');
   this.get('controller').set('currentJobId', null);
-
   if(!Ember.isEmpty(isVisualExplainQuery)){
 isVisualExplainQuery = true;
 this.get('controller').set('isVisualExplainQuery', true);
@@ -258,7 +260,7 @@ export default Ember.Route.extend(UILoggerMixin, {
   let originalQuery = this.get('controller').get('currentQuery');
   if(Ember.isBlank(originalQuery)) {
 this.get('logger').danger('Query cannot be empty.');
-this.send('resetDefaultWorksheet');
+this.send('resetDefaultWorksheet', ctrlrModel);
 return;
   }
   let queryInput = originalQuery;
@@ -299,7 +301,8 @@ export default Ember.Route.extend(UILoggerMixin, {
 
 
   this.get('controller.model').set('isQueryRunning', true);
-  this.get('controller.model').set('isJobCreated',false);
+  ctrlrModel.set('isJobCreated',false);
+  ctrlr.set('isJobCreated',false);
 
   //this.get('controller').set('queryResult', 
self.get('controller').get('queryResult'));
 

[04/50] [abbrv] ambari git commit: AMBARI-20314. Revert AMBARI-20227 as it is causing wokflow id to be not shown after submission (Venkat Ranganathan via smohanty)

[oleewere]

AMBARI-20314. Revert AMBARI-20227 as it is causing wokflow id to be not shown 
after submission (Venkat Ranganathan via smohanty)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 0bbd5455aa61eadd5f9ec7dbfee3a6ae79ed2953
Parents: df3b028
Author: Sumit Mohanty 
Authored: Sun Mar 5 13:38:24 2017 -0800
Committer: Sumit Mohanty 
Committed: Sun Mar 5 13:38:24 2017 -0800

--
 .../resources/ui/app/components/bundle-config.js   | 17 -
 .../resources/ui/app/components/coord-config.js| 17 -
 .../resources/ui/app/components/flow-designer.js   | 13 -
 .../main/resources/ui/app/components/job-config.js |  2 --
 .../main/resources/ui/app/components/save-wf.js|  2 --
 .../ui/app/templates/components/bundle-config.hbs  | 11 ++-
 .../ui/app/templates/components/coord-config.hbs   | 11 ++-
 .../ui/app/templates/components/flow-designer.hbs  | 15 ---
 8 files changed, 8 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0bbd5455/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
index 59ffbb8..e94d51a 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
@@ -146,7 +146,6 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   importBundle (filePath){
 this.set("bundleFilePath", filePath);
 this.set("isImporting", true);
-this.hideSuccessMsg();
 filePath = this.appendFileName(filePath, 'bundle');
 var deferred = this.getBundleFromHdfs(filePath);
 deferred.promise.then(function(response){
@@ -250,22 +249,7 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   return filePath;
 }
   },
-  hideSuccessMsg(){
-this.set('successMessage', '');
-this.set('isWFSaveSuccess', false);
-  },
   actions : {
-showSuccessMessage(msg, isHideSuccessMsg) {
-  if(isHideSuccessMsg){
-this.set("isWFSaveSuccess", false);
-  } else {
-this.set("isWFSaveSuccess", true);
-  }
-  Ember.run.later(()=>{
-  this.$('#successMsg').fadeOut();
-  }, 3000);
-  this.set("successMessage", msg);
-},
 closeFileBrowser(){
   this.set("showingFileBrowser", false);
   this.get('fileBrowser').getContext().trigger('fileSelected', 
this.get('filePath'));
@@ -324,7 +308,6 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   this.set('showingResetConfirmation', true);
 },
 resetBundle(){
-  this.hideSuccessMsg();
   this.get('errors').clear();
   this.set('showingResetConfirmation', false);
   if(this.get('bundleFilePath')){

http://git-wip-us.apache.org/repos/asf/ambari/blob/0bbd5455/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
index 2d0a23c..c87ea99 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/coord-config.js
@@ -262,7 +262,6 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
 return deferred;
   },
   importCoordinator (filePath){
-this.hideSuccessMsg();
 filePath = this.appendFileName(filePath, 'coord');
 this.set("coordinatorFilePath", filePath);
 this.set("isImporting", false);
@@ -368,22 +367,7 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
 }.bind(this));
 return isChildComponentsValid;
   },
-  hideSuccessMsg(){
-this.set('successMessage', '');
-this.set('isWFSaveSuccess', false);
-  },
   actions : {
-showSuccessMessage(msg, isHideSuccessMsg) {
-  if(isHideSuccessMsg){
-this.set("isWFSaveSuccess", false);
-  } else {
-this.set("isWFSaveSuccess", true);
-  }
-  Ember.run.later(()=>{
-  this.$('#successMsg').fadeOut();
-  }, 3000);
-  this.set("successMessage", msg);
-},
 registerChild(key, context){
   

[32/50] [abbrv] ambari git commit: AMBARI-20358. NPE during Ambari server schema upgrade while updating hbase_master_cpu alert definition (rlevas)

[oleewere]

AMBARI-20358. NPE during Ambari server schema upgrade while updating 
hbase_master_cpu alert definition (rlevas)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 8eaaf8086502890ef5d1c3ad88ca5fee8311f599
Parents: 934f3f1
Author: Robert Levas 
Authored: Wed Mar 8 07:50:13 2017 -0500
Committer: Robert Levas 
Committed: Wed Mar 8 07:50:13 2017 -0500

--
 .../server/upgrade/UpgradeCatalog250.java   | 64 +++-
 .../server/upgrade/UpgradeCatalog250Test.java   | 33 ++
 2 files changed, 70 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8eaaf808/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 e244925..36160ca 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
@@ -216,36 +216,46 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 
 if(source != null) {
   JsonObject sourceJson = new 
JsonParser().parse(source).getAsJsonObject();
-  LOG.debug("Source before update : {}", sourceJson);
-
-  JsonObject uriJson = sourceJson.get("uri").getAsJsonObject();
-  JsonPrimitive primitive;
-
-  // Replace
-  //  "kerberos_keytab": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}"
-  // With
-  //  "kerberos_keytab": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}"
-  primitive = uriJson.getAsJsonPrimitive("kerberos_keytab");
-  if(primitive.isString() && 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}".equals(primitive.getAsString()))
 {
-uriJson.remove("kerberos_keytab");
-uriJson.addProperty("kerberos_keytab", 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}");
-  }
 
-  // Replace
-  //  "kerberos_principal": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}"
-  // With
-  //  "kerberos_principal": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}"
-  primitive = uriJson.getAsJsonPrimitive("kerberos_principal");
-  if(primitive.isString() && 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}".equals(primitive.getAsString()))
 {
-uriJson.remove("kerberos_principal");
-uriJson.addProperty("kerberos_principal", 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}");
-  }
+  if(sourceJson != null) {
+boolean changesExist = false;
+LOG.debug("Source before update : {}", sourceJson);
+
+JsonObject uriJson = sourceJson.get("uri").getAsJsonObject();
+JsonPrimitive primitive;
+
+if (uriJson != null) {
+  // Replace
+  //  "kerberos_keytab": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}"
+  // With
+  //  "kerberos_keytab": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}"
+  primitive = uriJson.getAsJsonPrimitive("kerberos_keytab");
+  if ((primitive != null) && primitive.isString() && 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}".equals(primitive.getAsString()))
 {
+uriJson.remove("kerberos_keytab");
+uriJson.addProperty("kerberos_keytab", 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}");
+changesExist = true;
+  }
+
+  // Replace
+  //  "kerberos_principal": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}"
+  // With
+  //  "kerberos_principal": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}"
+  primitive = uriJson.getAsJsonPrimitive("kerberos_principal");
+  if ((primitive != null) && primitive.isString() && 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}".equals(primitive.getAsString()))
 {
+uriJson.remove("kerberos_principal");
+

[07/50] [abbrv] ambari git commit: AMBARI-20304. Services shows as Restart required after upgrading from Ambari-2.4.x to 2.5.0. (dlysnichenko)

[oleewere]

AMBARI-20304. Services shows as Restart required after upgrading from 
Ambari-2.4.x to 2.5.0. (dlysnichenko)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 84e767ba0064029ed323d193625b165e0cf621dd
Parents: b9d1996
Author: Lisnichenko Dmitro 
Authored: Mon Mar 6 18:58:35 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Mon Mar 6 18:58:35 2017 +0200

--
 .../common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml  | 2 +-
 .../common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml | 2 +-
 .../common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml| 2 +-
 .../common-services/STORM/0.10.0/configuration/storm-env.xml   | 2 +-
 .../common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml | 2 +-
 .../stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml| 2 +-
 .../HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml  | 2 +-
 .../HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml| 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/84e767ba/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
 
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
index 5663f57..f45199f 100644
--- 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
@@ -29,7 +29,7 @@
   boolean
   false
 
-
+
 
   
 application-properties

http://git-wip-us.apache.org/repos/asf/ambari/blob/84e767ba/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index 1213580..be79331 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -29,7 +29,7 @@
   boolean
   false
 
-
+
 
   
 application-properties

http://git-wip-us.apache.org/repos/asf/ambari/blob/84e767ba/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
 
b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
index 508cfab..d9d548d 100644
--- 
a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
@@ -30,7 +30,7 @@
   boolean
   false
 
-
+
 
   
 application-properties

http://git-wip-us.apache.org/repos/asf/ambari/blob/84e767ba/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
index 3b814a9..1145ec7 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
@@ -29,7 +29,7 @@
   boolean
   false
 
-
+
 
   
 application-properties

http://git-wip-us.apache.org/repos/asf/ambari/blob/84e767ba/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
index 2810a23..d0d0ede 100644

[06/50] [abbrv] ambari git commit: AMBARI-20318. ulimit config missing for storm service (aonishuk)

[oleewere]

AMBARI-20318. ulimit config missing for storm service (aonishuk)


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

Branch: refs/heads/branch-dev-logsearch
Commit: b9d199620a2691eff72497b3c02459d31e05eb08
Parents: b2f560a
Author: Andrew Onishuk 
Authored: Mon Mar 6 16:13:55 2017 +0200
Committer: Andrew Onishuk 
Committed: Mon Mar 6 16:13:55 2017 +0200

--
 .../STORM/0.9.1/package/scripts/params_linux.py |  2 ++
 .../STORM/0.9.1/package/scripts/storm.py|  7 +++
 .../src/test/python/stacks/2.1/STORM/test_storm_base.py | 12 
 3 files changed, 21 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b9d19962/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
index a176456..5d8a5f3 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
@@ -49,6 +49,8 @@ tmp_dir = Script.get_tmp_dir()
 stack_root = status_params.stack_root
 sudo = AMBARI_SUDO_BINARY
 
+limits_conf_dir = "/etc/security/limits.d"
+
 # Needed since this is an Atlas Hook service.
 cluster_name = config['clusterName']
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b9d19962/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/storm.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/storm.py
 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/storm.py
index f02ced4..99579d2 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/storm.py
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/storm.py
@@ -79,6 +79,13 @@ def storm(name=None):
 cd_access="a",
   )
 
+  File(format("{limits_conf_dir}/storm.conf"),
+   owner='root',
+   group='root',
+   mode=0644,
+   content=Template("storm.conf.j2")
+  )
+
   File(format("{conf_dir}/config.yaml"),
content=Template("config.yaml.j2"),
owner=params.storm_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/b9d19962/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py
--
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py 
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py
index f3cac14..f2e05be 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py
@@ -56,6 +56,12 @@ class TestStormBase(RMFTestCase):
   create_parents = True,
   cd_access='a'
 )
+self.assertResourceCalled('File', '/etc/security/limits.d/storm.conf',
+content = Template('storm.conf.j2'),
+owner = 'root',
+group = 'root',
+mode = 0644,
+)
 self.assertResourceCalled('File', confDir + '/config.yaml',
   owner = 'storm',
   content = Template('config.yaml.j2'),
@@ -100,6 +106,12 @@ class TestStormBase(RMFTestCase):
   create_parents = True,
   cd_access='a'
 )
+self.assertResourceCalled('File', '/etc/security/limits.d/storm.conf',
+content = Template('storm.conf.j2'),
+owner = 'root',
+group = 'root',
+mode = 0644,
+)
 self.assertResourceCalled('File', confDir + '/config.yaml',
   owner = 'storm',
   content = Template('config.yaml.j2'),

[02/50] [abbrv] ambari git commit: AMBARI-20259. Superset not able to start on Ubuntu if ASCII encoding is set as default encoding - addendum patch (Nishant Bangarwa via smohanty)

[oleewere]

AMBARI-20259. Superset not able to start on Ubuntu if ASCII encoding is set as 
default encoding - addendum patch (Nishant Bangarwa via smohanty)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 0ba42cf6c101a435a97b08188ec628f26cdd324d
Parents: 34eafc3
Author: Sumit Mohanty 
Authored: Sun Mar 5 08:40:06 2017 -0800
Committer: Sumit Mohanty 
Committed: Sun Mar 5 08:40:11 2017 -0800

--
 .../DRUID/0.9.2/configuration/druid-superset-env.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ba42cf6/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
index 2ca83de..7284342 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-superset-env.xml
@@ -90,8 +90,8 @@
 
   # Set environment variables here.
   
-  export LC_ALL=C.UTF-8
-  export LANG=C.UTF-8
+  export LC_ALL=en_US.UTF-8
+  export LANG=en_US.UTF-8
 
   # Superset Home Dir
   export SUPERSET_CONFIG_DIR={{superset_config_dir}}

[30/50] [abbrv] ambari git commit: AMBARI-20353. Log error while importing the workflow from encrypted path. (Madhan Mohan Reddy via gauravn7)

[oleewere]

AMBARI-20353. Log error while importing the workflow from encrypted path. 
(Madhan Mohan Reddy via gauravn7)


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

Branch: refs/heads/branch-dev-logsearch
Commit: ba04d2211c1db5f6f7ca2feeede1b5667410344d
Parents: 3fd1c24
Author: Gaurav Nagar 
Authored: Wed Mar 8 17:00:23 2017 +0530
Committer: Gaurav Nagar 
Committed: Wed Mar 8 17:01:00 2017 +0530

--
 .../ambari/view/OozieProxyImpersonator.java | 42 ++--
 .../org/apache/oozie/ambari/view/Utils.java | 30 ++
 2 files changed, 34 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ba04d221/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/OozieProxyImpersonator.java
--
diff --git 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/OozieProxyImpersonator.java
 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/OozieProxyImpersonator.java
index 9bf2f90..d82f928 100644
--- 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/OozieProxyImpersonator.java
+++ 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/OozieProxyImpersonator.java
@@ -23,7 +23,6 @@ import static 
org.apache.oozie.ambari.view.Constants.STATUS_OK;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,7 +36,6 @@ import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -335,15 +333,7 @@ public class OozieProxyImpersonator {
 }
 try {
   final InputStream is = workflowFilesService.readAssset(assetPath);
-  StreamingOutput streamer = new StreamingOutput() {
-@Override
-public void write(OutputStream os) throws IOException,
-WebApplicationException {
-  IOUtils.copy(is, os);
-  is.close();
-  os.close();
-}
-  };
+  StreamingOutput streamer = utils.streamResponse(is);
   return Response.ok(streamer).status(200).build();
 } catch (IOException ex) {
   LOGGER.error(ex.getMessage(),ex);
@@ -359,15 +349,7 @@ public class OozieProxyImpersonator {
 }
 try {
   final InputStream is = workflowFilesService.readDraft(workflowPath);
-  StreamingOutput streamer = new StreamingOutput() {
-@Override
-public void write(OutputStream os) throws IOException,
-  WebApplicationException {
-  IOUtils.copy(is, os);
-  is.close();
-  os.close();
-}
-  };
+  StreamingOutput streamer = utils.streamResponse(is);
   return Response.ok(streamer).status(200).build();
 } catch (IOException ex) {
   LOGGER.error(ex.getMessage(),ex);
@@ -426,15 +408,7 @@ public class OozieProxyImpersonator {
   private Response getWorkflowResponse(String filePath, String responseType,
boolean olderFormatDraftIngored) throws 
IOException {
 final InputStream is = workflowFilesService.readWorkflowXml(filePath);
-StreamingOutput streamer = new StreamingOutput() {
-  @Override
-  public void write(OutputStream os) throws IOException,
-WebApplicationException {
-IOUtils.copy(is, os);
-is.close();
-os.close();
-  }
-};
+StreamingOutput streamer = utils.streamResponse(is);
 Response.ResponseBuilder responseBuilder = 
Response.ok(streamer).header(RESPONSE_TYPE, responseType);
 if (olderFormatDraftIngored) {
   responseBuilder.header(OLDER_FORMAT_DRAFT_INGORED, 
Boolean.TRUE.toString());
@@ -455,15 +429,7 @@ public class OozieProxyImpersonator {
 throw new WfmWebException(ErrorCode.WORKFLOW_XML_DOES_NOT_EXIST);
   }
   final InputStream is = 
workflowFilesService.readWorkflowXml(workflowPath);
-  StreamingOutput streamer = new StreamingOutput() {
-@Override
-public void write(OutputStream os) throws IOException,
-  WebApplicationException {
-  IOUtils.copy(is, os);
-  is.close();
-  os.close();
-}
-  };
+  StreamingOutput streamer = utils.streamResponse(is);
   return Response.ok(streamer).status(200).build();
 } catch (WfmWebException ex) {
   LOGGER.error(ex.getMessage(),ex);

[15/50] [abbrv] ambari git commit: AMBARI-20255 Sometimes the Hosts page shows a different page for page 1. (atkach)

[oleewere]

AMBARI-20255 Sometimes the Hosts page shows a different page for page 1. 
(atkach)


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

Branch: refs/heads/branch-dev-logsearch
Commit: 7f9a5123eedb9043ce7102df9ae3cb3f2ebc8f76
Parents: 1b8b91d
Author: Andrii Tkach 
Authored: Mon Mar 6 21:10:03 2017 +0200
Committer: Andrii Tkach 
Committed: Mon Mar 6 22:26:11 2017 +0200

--
 .../app/controllers/global/update_controller.js |  3 +-
 ambari-web/app/controllers/main/host.js | 25 ++--
 .../app/mixins/common/table_server_mixin.js |  2 +-
 .../mixins/common/table_server_view_mixin.js|  4 +-
 ambari-web/app/views/common/table_view.js   |  8 
 ambari-web/app/views/main/host.js   |  8 +++-
 .../common/table_server_view_mixin_test.js  | 41 
 ambari-web/test/views/common/table_view_test.js | 26 -
 ambari-web/test/views/main/host_test.js |  6 +++
 9 files changed, 81 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f9a5123/ambari-web/app/controllers/global/update_controller.js
--
diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index 7b8a80e..e53f79d 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -244,7 +244,8 @@ App.UpdateController = Em.Controller.extend({
   {
 key: 'Hosts/host_name',
 value: [hostDetailsFilter],
-type: 'MULTIPLE'
+type: 'MULTIPLE',
+isHostDetails: true
   }
 ]);
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/7f9a5123/ambari-web/app/controllers/main/host.js
--
diff --git a/ambari-web/app/controllers/main/host.js 
b/ambari-web/app/controllers/main/host.js
index 336bd25..05551af 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -312,17 +312,20 @@ App.MainHostController = 
Em.ArrayController.extend(App.TableServerMixin, {
   }
 }, this);
 
-if (queryParams.filterProperty('isFilter').length !== 
oldProperties.filterProperty('isFilter').length) {
-  queryParams.findProperty('key', 'from').value = 0;
-  this.set('resetStartIndex', true);
-} else {
-  queryParams.filterProperty('isFilter').forEach(function (queryParam) {
-var oldProperty = 
oldProperties.filterProperty('isFilter').findProperty('key', queryParam.key);
-if (!oldProperty || JSON.stringify(oldProperty.value) !== 
JSON.stringify(queryParam.value)) {
-  queryParams.findProperty('key', 'from').value = 0;
-  this.set('resetStartIndex', true);
-}
-  }, this);
+if (!oldProperties.findProperty('isHostDetails')) {
+  // shouldn't reset start index after coming back from Host Details page
+  if (queryParams.filterProperty('isFilter').length !== 
oldProperties.filterProperty('isFilter').length) {
+queryParams.findProperty('key', 'from').value = 0;
+this.set('resetStartIndex', true);
+  } else {
+queryParams.filterProperty('isFilter').forEach(function (queryParam) {
+  var oldProperty = 
oldProperties.filterProperty('isFilter').findProperty('key', queryParam.key);
+  if (!oldProperty || JSON.stringify(oldProperty.value) !== 
JSON.stringify(queryParam.value)) {
+queryParams.findProperty('key', 'from').value = 0;
+this.set('resetStartIndex', true);
+  }
+}, this);
+  }
 }
 
 if (!skipNonFilterProperties) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/7f9a5123/ambari-web/app/mixins/common/table_server_mixin.js
--
diff --git a/ambari-web/app/mixins/common/table_server_mixin.js 
b/ambari-web/app/mixins/common/table_server_mixin.js
index 5162a02..c9f0bba 100644
--- a/ambari-web/app/mixins/common/table_server_mixin.js
+++ b/ambari-web/app/mixins/common/table_server_mixin.js
@@ -69,7 +69,7 @@ App.TableServerMixin = Em.Mixin.create({
   startIndex = (startIndex > 0) ? startIndex - 1 : startIndex;
   this.get('paginationProps').findProperty('name', 'startIndex').value = 
startIndex;
 }
-return this.get('paginationProps');
+return this.get('paginationProps').slice(0);
   },
 
   /**

[03/50] [abbrv] ambari git commit: AMBARI-20275. Credential Store should be enabled by default on fresh installs (Madhuvanthi Radhakrishnan via smohanty)

[oleewere]

AMBARI-20275. Credential Store should be enabled by default on fresh installs 
(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/df3b028d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df3b028d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df3b028d

Branch: refs/heads/branch-dev-logsearch
Commit: df3b028db23418d788361d54c0924354af783867
Parents: 0ba42cf
Author: Sumit Mohanty 
Authored: Sun Mar 5 10:42:40 2017 -0800
Committer: Sumit Mohanty 
Committed: Sun Mar 5 10:42:40 2017 -0800

--
 .../0.12.0.2.0/package/scripts/hive_interactive.py   |  7 +++
 .../common-services/LOGSEARCH/0.5.0/metainfo.xml |  1 +
 .../stacks/HDP/2.5/services/HIVE/metainfo.xml|  2 +-
 .../stacks/HDP/2.5/services/OOZIE/metainfo.xml   |  2 +-
 .../python/stacks/2.5/HIVE/test_hive_server_int.py   | 15 ---
 .../stacks/2.5/configs/hsi_default_for_restart.json  |  1 +
 6 files changed, 23 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/df3b028d/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
index 1ca65fe..eba3f3a 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
@@ -43,6 +43,7 @@ from resource_management.core.shell import quote_bash_args
 from resource_management.core.logger import Logger
 from resource_management.core import utils
 from resource_management.libraries.functions.setup_atlas_hook import 
has_atlas_in_cluster, setup_atlas_hook
+from resource_management.libraries.functions.security_commons import 
update_credential_provider_path
 from ambari_commons.constants import SERVICE
 
 from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
@@ -200,6 +201,12 @@ def hive_interactive(name=None):
   group=params.user_group,
   mode=0644)
   else:
+merged_hive_interactive_site = 
update_credential_provider_path(merged_hive_interactive_site,
+  'hive-site',
+  
os.path.join(conf_dir, 'hive-site.jceks'),
+  
params.hive_user,
+  
params.user_group
+)
 XmlConfig("hive-site.xml",
   conf_dir=conf_dir,
   configurations=merged_hive_interactive_site,

http://git-wip-us.apache.org/repos/asf/ambari/blob/df3b028d/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
index 245a94d..fa9548b 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
@@ -28,6 +28,7 @@
   
 true
 true
+true
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/df3b028d/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
index 4230dd4..f2a1161 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
@@ -23,7 +23,7 @@
   1.2.1.2.5
   
 true
-false
+true
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/df3b028d/ambari-server/src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/OOZIE/metainfo.xml
index 75aa9d9..05b1543 100644
--- 

[11/50] [abbrv] ambari git commit: Revert "AMBARI-20308 - Atlas service check fails during EU on wire encrypted cluster (jonathanhurley)"

[oleewere]

Revert "AMBARI-20308 - Atlas service check fails during EU on wire encrypted 
cluster (jonathanhurley)"

This reverts commit d8901e26c3f5cf45011d700cb44d73ea67c86d20.


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

Branch: refs/heads/branch-dev-logsearch
Commit: e19f57e83c387c21109dfe4bda0e0e146db2e60e
Parents: d8901e2
Author: Jonathan Hurley 
Authored: Mon Mar 6 14:19:44 2017 -0500
Committer: Jonathan Hurley 
Committed: Mon Mar 6 14:19:44 2017 -0500

--
 .../configuration/application-properties.xml| 42 
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 12 --
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 16 +++-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  6 ---
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml |  6 ---
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 -
 .../configuration/application-properties.xml|  3 +-
 7 files changed, 7 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
deleted file mode 100644
index 366ecf6..000
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-  
-  
-atlas.ssl.exclude.protocols
-Excluded Wire Encryption Protocols
-TLSv1.2
-
-  true
-
-A comma-separate list of the wire encryption protocols to 
exclude when TLS is enabled. Some versions of cURL do not work with 
TLSv1.2.
-
-  
-application-properties
-atlas.enableTLS
-  
-
-
-  
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/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 37f2a82..93e0149 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
@@ -136,18 +136,6 @@
 
   
 
-
-
-  
-  
-  
-application-properties
-
-
-
-  
-
-

 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
index e7ada04..5b37375 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
@@ -75,7 +75,7 @@
   
 FLUME_HANDLER
   
-
+  
   
 ACCUMULO_TRACER
 ACCUMULO_GC
@@ -300,12 +300,6 @@
   
 
   
-  
-  
-
-  Updating Atlas TLS Exclude Protocols to exclude TLS 
v1.2
-
-  
 
 
 
 
   false
@@ -677,7 +671,7 @@
 FLUME_HANDLER
   
 
-
+
 
   false
   true
@@ -706,7 +700,7 @@
 
 
   UPGRADE
-
+  
   
 
   
@@ -776,7 +770,7 @@
 setup_ranger_java_patches
   
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/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 fe297c3..55e8924 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
@@ -431,12 +431,6 

[05/50] [abbrv] ambari git commit: AMBARI-20200: hive-site.xml, hbase-site.xml, etc. are not found in class path for Zeppelin (Prabhjyot Singh via r-kamath)

[oleewere]

AMBARI-20200: hive-site.xml, hbase-site.xml, etc. are not found in class path 
for Zeppelin (Prabhjyot Singh via r-kamath)


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

Branch: refs/heads/branch-dev-logsearch
Commit: b2f560adff7bf8c70e24c75e8e5c36da24ad97cc
Parents: 0bbd545
Author: Renjith Kamath 
Authored: Mon Mar 6 15:49:12 2017 +0530
Committer: Renjith Kamath 
Committed: Mon Mar 6 15:49:12 2017 +0530

--
 .../0.6.0.2.5/configuration/zeppelin-env.xml|  2 +-
 .../0.6.0.2.5/package/scripts/master.py | 36 +++-
 .../0.6.0.2.5/package/scripts/params.py |  8 +
 3 files changed, 37 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b2f560ad/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index 677158c..bdef319 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -89,7 +89,7 @@ export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}}
 # export ZEPPELIN_NOTEBOOK_STORAGE# Refers to pluggable notebook 
storage class, can have two classes simultaneously with a sync between them 
(e.g. local and remote).
 # export ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC   # If there are multiple notebook 
storages, should we treat the first one as the only source of truth?
 # export ZEPPELIN_NOTEBOOK_PUBLIC # Make notebook public by 
default when created, private otherwise
-
+export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}"
  Spark interpreter configuration 
 
 ## Use provided spark installation ##

http://git-wip-us.apache.org/repos/asf/ambari/blob/b2f560ad/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index 8a1fad6..fc24918 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -106,6 +106,17 @@ class Master(Script):
   mode=0755
   )
 
+  def create_zeppelin_hdfs_conf_dir(self, env):
+import params
+env.set_params(params)
+Directory([params.external_dependency_conf],
+  owner=params.zeppelin_user,
+  group=params.zeppelin_group,
+  cd_access="a",
+  create_parents=True,
+  mode=0755
+  )
+
   def chown_zeppelin_pid_dir(self, env):
 import params
 env.set_params(params)
@@ -150,17 +161,26 @@ class Master(Script):
 File(format("{params.conf_dir}/log4j.properties"), 
content=params.log4j_properties_content,
  owner=params.zeppelin_user, group=params.zeppelin_group)
 
+self.create_zeppelin_hdfs_conf_dir(env)
 # copy hive-site.xml only if Spark 1.x is installed
-if 'spark-defaults' in params.config['configurations'] and \
-os.path.exists("/etc/spark/conf/hive-site.xml"):
-File(format("{params.conf_dir}/hive-site.xml"), 
content=StaticFile("/etc/spark/conf/hive-site.xml"),
- owner=params.zeppelin_user, group=params.zeppelin_group)
+if 'spark-defaults' in params.config['configurations'] and 
params.is_hive_installed:
+  XmlConfig("hive-site.xml",
+  conf_dir=params.external_dependency_conf,
+  configurations=params.spark_hive_properties,
+  owner=params.zeppelin_user,
+  group=params.zeppelin_group,
+  mode=0644)
 
-if len(params.hbase_master_hosts) > 0 and \
-os.path.exists("/etc/hbase/conf/hbase-site.xml"):
+if len(params.hbase_master_hosts) > 0 and params.is_hbase_installed:
   # copy hbase-site.xml
-  File(format("{params.conf_dir}/hbase-site.xml"), 
content=StaticFile("/etc/hbase/conf/hbase-site.xml"),
-   owner=params.zeppelin_user, group=params.zeppelin_group)
+  

[09/50] [abbrv] ambari git commit: AMBARI-20309. HBase Master CPU Utilization Alert is in unknown state due to kinit error (rlevas)

[oleewere]

AMBARI-20309. HBase Master CPU Utilization Alert is in unknown state due to 
kinit error (rlevas)


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

Branch: refs/heads/branch-dev-logsearch
Commit: e8956590389cf1c8e6a3942747710223ff3a5d34
Parents: 84e767b
Author: Robert Levas 
Authored: Mon Mar 6 12:30:26 2017 -0500
Committer: Robert Levas 
Committed: Mon Mar 6 12:30:26 2017 -0500

--
 .../server/upgrade/UpgradeCatalog250.java   |   57 +
 .../HBASE/0.96.0.2.0/alerts.json|4 +-
 .../server/upgrade/UpgradeCatalog250Test.java   | 1014 ++
 3 files changed, 596 insertions(+), 479 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e8956590/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 c67e80d..0246229 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
@@ -19,6 +19,7 @@ package org.apache.ambari.server.upgrade;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 
@@ -66,6 +67,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
@@ -192,6 +194,61 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 addManageServiceAutoStartPermissions();
 addManageAlertNotificationsPermissions();
 updateKerberosDescriptorArtifacts();
+fixHBaseMasterCPUUtilizationAlertDefinition();
+  }
+
+  /**
+   * Fix the HBase Master CPU Utilization alert definition by swapping the 
values for kerberos_keytab
+   * and kerberos_principal.
+   */
+  protected void fixHBaseMasterCPUUtilizationAlertDefinition() {
+AlertDefinitionDAO alertDefinitionDAO = 
injector.getInstance(AlertDefinitionDAO.class);
+AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
+Clusters clusters = ambariManagementController.getClusters();
+
+Map clusterMap = getCheckedClusterMap(clusters);
+for (final Cluster cluster : clusterMap.values()) {
+  long clusterID = cluster.getClusterId();
+  AlertDefinitionEntity alertDefinition = 
alertDefinitionDAO.findByName(clusterID, "hbase_master_cpu");
+  if(alertDefinition != null) {
+LOG.info("Updating alert definition {} in cluster {}", 
alertDefinition.getDefinitionName(), clusterID);
+String source = alertDefinition.getSource();
+
+if(source != null) {
+  JsonObject sourceJson = new 
JsonParser().parse(source).getAsJsonObject();
+  LOG.debug("Source before update : {}", sourceJson);
+
+  JsonObject uriJson = sourceJson.get("uri").getAsJsonObject();
+  JsonPrimitive primitive;
+
+  // Replace
+  //  "kerberos_keytab": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}"
+  // With
+  //  "kerberos_keytab": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}"
+  primitive = uriJson.getAsJsonPrimitive("kerberos_keytab");
+  if(primitive.isString() && 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}".equals(primitive.getAsString()))
 {
+uriJson.remove("kerberos_keytab");
+uriJson.addProperty("kerberos_keytab", 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}");
+  }
+
+  // Replace
+  //  "kerberos_principal": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}"
+  // With
+  //  "kerberos_principal": 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}"
+  primitive = uriJson.getAsJsonPrimitive("kerberos_principal");
+  if(primitive.isString() && 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.keytab}}".equals(primitive.getAsString()))
 {
+uriJson.remove("kerberos_principal");
+uriJson.addProperty("kerberos_principal", 
"{{hbase-site/hbase.security.authentication.spnego.kerberos.principal}}");
+  }
+
+  

ambari git commit: AMBARI-20278. Install Wizard > Select Services: Ambari warns me that "Ambari Infra is not selected" but it is selected. Additional patch 2 (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk e34054743 -> e2220ea8a


AMBARI-20278. Install Wizard > Select Services: Ambari warns me that "Ambari 
Infra is not selected" but it is selected. Additional patch 2 (alexantonenko)


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

Branch: refs/heads/trunk
Commit: e2220ea8ae60eb02e76761772b9d0144871d24ad
Parents: e340547
Author: Alex Antonenko 
Authored: Thu Mar 9 18:37:45 2017 +0200
Committer: Alex Antonenko 
Committed: Thu Mar 9 18:37:45 2017 +0200

--
 ambari-web/app/controllers/wizard/step4_controller.js | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e2220ea8/ambari-web/app/controllers/wizard/step4_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step4_controller.js 
b/ambari-web/app/controllers/wizard/step4_controller.js
index 3a13fbb..8165c8d 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -168,7 +168,6 @@ App.WizardStep4Controller = Em.ArrayController.extend({
   validate: function () {
 var result;
 var self = this;
-this.set('errorStack', []);
 
 // callback function to reset `isAccepted` needs to be called everytime 
when a popup from errorStack is dismissed/proceed by user action
 var callback = function (id) {

ambari git commit: AMBARI-20323. Commands timed-out on ambari host without any error logs (echekanskiy)

[echekanskiy]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c6a9a3ca4 -> 17ef55594


AMBARI-20323. Commands timed-out on ambari host without any error logs 
(echekanskiy)


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

Branch: refs/heads/branch-2.5
Commit: 17ef555940758b73cd09ddcc9fc8a3461604c085
Parents: c6a9a3c
Author: Eugene Chekanskiy 
Authored: Thu Mar 9 18:30:20 2017 +0200
Committer: Eugene Chekanskiy 
Committed: Thu Mar 9 18:30:20 2017 +0200

--
 .../src/main/python/ambari_agent/ActionQueue.py |  52 +---
 .../src/main/python/ambari_agent/Controller.py  |  54 +---
 .../ambari_agent/StatusCommandsExecutor.py  | 307 +++
 .../src/main/python/ambari_agent/main.py|  12 +-
 .../test/python/ambari_agent/TestActionQueue.py |   4 +-
 .../test/python/ambari_agent/TestController.py  |   3 -
 .../src/test/python/ambari_agent/TestMain.py|   9 +-
 7 files changed, 280 insertions(+), 161 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/17ef5559/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 5300b52..15ae03d 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -76,10 +76,6 @@ class ActionQueue(threading.Thread):
   def __init__(self, config, controller):
 super(ActionQueue, self).__init__()
 self.commandQueue = Queue.Queue()
-self.statusCommandQueue = None # the queue this field points to is 
re-created whenever
-   # a new StatusCommandExecutor child process 
is spawned
-   # by Controller
-# multiprocessing.Queue()
 self.statusCommandResultQueue = multiprocessing.Queue() # this queue is 
filled by StatuCommandsExecutor.
 self.backgroundCommandQueue = Queue.Queue()
 self.commandStatuses = CommandStatusDict(callback_action =
@@ -102,25 +98,7 @@ class ActionQueue(threading.Thread):
 return self._stop.isSet()
 
   def put_status(self, commands):
-if not self.statusCommandQueue.empty():
-  #Clear all status commands. Was supposed that we got all set of 
statuses, we don't need to keep old ones
-  statusCommandQueueSize = 0
-  try:
-while not self.statusCommandQueue.empty():
-  self.statusCommandQueue.get(False)
-  statusCommandQueueSize = statusCommandQueueSize + 1
-  except Queue.Empty:
-pass
-
-  logger.info("Number of status commands removed from queue : " + 
str(statusCommandQueueSize))
-
-for command in commands:
-  logger.info("Adding " + command['commandType'] + " for component " + \
-  command['componentName'] + " of service " + \
-  command['serviceName'] + " of cluster " + \
-  command['clusterName'] + " to the queue.")
-  self.statusCommandQueue.put(command)
-  logger.debug(pprint.pformat(command))
+self.controller.statusCommandsExecutor.put_commands(commands)
 
   def put(self, commands):
 for command in commands:
@@ -167,8 +145,8 @@ class ActionQueue(threading.Thread):
   def run(self):
 try:
   while not self.stopped():
-self.processBackgroundQueueSafeEmpty();
-self.processStatusCommandResultQueueSafeEmpty();
+self.processBackgroundQueueSafeEmpty()
+self.process_status_command_results()
 try:
   if self.parallel_execution == 0:
 command = self.commandQueue.get(True, 
self.EXECUTION_COMMAND_WAIT_TIME)
@@ -212,23 +190,13 @@ class ActionQueue(threading.Thread):
   except Queue.Empty:
 pass
 
-  def processStatusCommandResultQueueSafeEmpty(self):
-try:
-  while not self.statusCommandResultQueue.empty():
-try:
-  result = self.statusCommandResultQueue.get(False)
-  self.process_status_command_result(result)
-except Queue.Empty:
-  pass
-except IOError:
-  # on race condition in multiprocessing.Queue if get/put and thread 
kill are executed at the same time.
-  # During queue.close IOError will be thrown (this prevents from 
permanently dead-locked get).
-  pass
-except UnicodeDecodeError:
-  pass
-except IOError:
-  # queue.empty() may also throw IOError
-  pass
+  def process_status_command_results(self):
+

ambari git commit: AMBARI-20323. Commands timed-out on ambari host without any error logs (echekanskiy)

[echekanskiy]

Repository: ambari
Updated Branches:
  refs/heads/trunk 8ce47e0cb -> da0b7ad8f


AMBARI-20323. Commands timed-out on ambari host without any error logs 
(echekanskiy)


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

Branch: refs/heads/trunk
Commit: da0b7ad8f8974dfdeaf0e99d86339c7562cdd9f2
Parents: 8ce47e0
Author: Eugene Chekanskiy 
Authored: Thu Mar 9 18:31:49 2017 +0200
Committer: Eugene Chekanskiy 
Committed: Thu Mar 9 18:31:49 2017 +0200

--
 .../src/main/python/ambari_agent/ActionQueue.py |  52 +---
 .../src/main/python/ambari_agent/Controller.py  |  54 +---
 .../ambari_agent/StatusCommandsExecutor.py  | 307 +++
 .../src/main/python/ambari_agent/main.py|  12 +-
 .../test/python/ambari_agent/TestActionQueue.py |   4 +-
 .../test/python/ambari_agent/TestController.py  |   3 -
 .../src/test/python/ambari_agent/TestMain.py|   9 +-
 7 files changed, 280 insertions(+), 161 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/da0b7ad8/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 5300b52..15ae03d 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -76,10 +76,6 @@ class ActionQueue(threading.Thread):
   def __init__(self, config, controller):
 super(ActionQueue, self).__init__()
 self.commandQueue = Queue.Queue()
-self.statusCommandQueue = None # the queue this field points to is 
re-created whenever
-   # a new StatusCommandExecutor child process 
is spawned
-   # by Controller
-# multiprocessing.Queue()
 self.statusCommandResultQueue = multiprocessing.Queue() # this queue is 
filled by StatuCommandsExecutor.
 self.backgroundCommandQueue = Queue.Queue()
 self.commandStatuses = CommandStatusDict(callback_action =
@@ -102,25 +98,7 @@ class ActionQueue(threading.Thread):
 return self._stop.isSet()
 
   def put_status(self, commands):
-if not self.statusCommandQueue.empty():
-  #Clear all status commands. Was supposed that we got all set of 
statuses, we don't need to keep old ones
-  statusCommandQueueSize = 0
-  try:
-while not self.statusCommandQueue.empty():
-  self.statusCommandQueue.get(False)
-  statusCommandQueueSize = statusCommandQueueSize + 1
-  except Queue.Empty:
-pass
-
-  logger.info("Number of status commands removed from queue : " + 
str(statusCommandQueueSize))
-
-for command in commands:
-  logger.info("Adding " + command['commandType'] + " for component " + \
-  command['componentName'] + " of service " + \
-  command['serviceName'] + " of cluster " + \
-  command['clusterName'] + " to the queue.")
-  self.statusCommandQueue.put(command)
-  logger.debug(pprint.pformat(command))
+self.controller.statusCommandsExecutor.put_commands(commands)
 
   def put(self, commands):
 for command in commands:
@@ -167,8 +145,8 @@ class ActionQueue(threading.Thread):
   def run(self):
 try:
   while not self.stopped():
-self.processBackgroundQueueSafeEmpty();
-self.processStatusCommandResultQueueSafeEmpty();
+self.processBackgroundQueueSafeEmpty()
+self.process_status_command_results()
 try:
   if self.parallel_execution == 0:
 command = self.commandQueue.get(True, 
self.EXECUTION_COMMAND_WAIT_TIME)
@@ -212,23 +190,13 @@ class ActionQueue(threading.Thread):
   except Queue.Empty:
 pass
 
-  def processStatusCommandResultQueueSafeEmpty(self):
-try:
-  while not self.statusCommandResultQueue.empty():
-try:
-  result = self.statusCommandResultQueue.get(False)
-  self.process_status_command_result(result)
-except Queue.Empty:
-  pass
-except IOError:
-  # on race condition in multiprocessing.Queue if get/put and thread 
kill are executed at the same time.
-  # During queue.close IOError will be thrown (this prevents from 
permanently dead-locked get).
-  pass
-except UnicodeDecodeError:
-  pass
-except IOError:
-  # queue.empty() may also throw IOError
-  pass
+  def process_status_command_results(self):
+self.controller.statusCommandsExecutor.process_logs()
+ 

ambari git commit: AMBARI-20379. Error during moving ResourceManager without Tez installed (akovalenko)

[akovalenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 245fd5cf3 -> c6a9a3ca4


AMBARI-20379. Error during moving ResourceManager without Tez installed 
(akovalenko)


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

Branch: refs/heads/branch-2.5
Commit: c6a9a3ca49559e64858a25d5be916296ccd91c1f
Parents: 245fd5c
Author: Aleksandr Kovalenko 
Authored: Thu Mar 9 16:33:17 2017 +0200
Committer: Aleksandr Kovalenko 
Committed: Thu Mar 9 18:00:05 2017 +0200

--
 .../main/service/reassign/step4_controller.js| 17 +
 .../service/reassign/step4_controller_test.js| 19 +--
 2 files changed, 26 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c6a9a3ca/ambari-web/app/controllers/main/service/reassign/step4_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index f87d05b..9a40283 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -106,16 +106,17 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
* Set dependent host-components to dependentHostComponents
* @param {string} componentName
*/
-  setDependentHostComponents: function(componentName) {
+  setDependentHostComponents: function (componentName) {
+var installedServices = App.Service.find().mapProperty('serviceName');
 var installedComponents = 
App.Host.find(this.get('content.reassignHosts.target'))
-  .get('hostComponents')
-  .mapProperty('componentName');
+.get('hostComponents')
+.mapProperty('componentName');
 var dependenciesToInstall = App.StackServiceComponent.find(componentName)
-  .get('dependencies')
-  .mapProperty('componentName')
-  .filter(function(component) {
-return !installedComponents.contains(component);
-  });
+.get('dependencies')
+.filter(function (component) {
+  return !installedComponents.contains(component.componentName) && 
installedServices.contains(component.serviceName);
+})
+.mapProperty('componentName');
 this.set('dependentHostComponents', dependenciesToInstall);
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c6a9a3ca/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js 
b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
index 612efd0..0b00412 100644
--- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
@@ -1090,19 +1090,34 @@ describe('App.ReassignMasterWizardStep4Controller', 
function () {
   })
 ]
   }));
+  sinon.stub(App.Service, 'find').returns([
+Em.Object.create({
+  serviceName: 'S1'
+}),
+Em.Object.create({
+  serviceName: 'S2'
+})
+  ]);
   sinon.stub(App.StackServiceComponent, 'find').returns(Em.Object.create({
 dependencies: [
   Em.Object.create({
-componentName: 'C1'
+componentName: 'C1',
+serviceName: 'S1'
+  }),
+  Em.Object.create({
+componentName: 'C2',
+serviceName: 'S2'
   }),
   Em.Object.create({
-componentName: 'C2'
+componentName: 'C3',
+serviceName: 'S3'
   })
 ]
   }));
 });
 afterEach(function() {
   App.Host.find.restore();
+  App.Service.find.restore();
   App.StackServiceComponent.find.restore();
 });
 

ambari git commit: AMBARI-20379. Error during moving ResourceManager without Tez installed (akovalenko)

[akovalenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk a10120574 -> 8ce47e0cb


AMBARI-20379. Error during moving ResourceManager without Tez installed 
(akovalenko)


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

Branch: refs/heads/trunk
Commit: 8ce47e0cbd5caaaee7f444ddca1afefafceede1d
Parents: a101205
Author: Aleksandr Kovalenko 
Authored: Thu Mar 9 16:33:17 2017 +0200
Committer: Aleksandr Kovalenko 
Committed: Thu Mar 9 17:59:16 2017 +0200

--
 .../main/service/reassign/step4_controller.js| 17 +
 .../service/reassign/step4_controller_test.js| 19 +--
 2 files changed, 26 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce47e0c/ambari-web/app/controllers/main/service/reassign/step4_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index f87d05b..9a40283 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -106,16 +106,17 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
* Set dependent host-components to dependentHostComponents
* @param {string} componentName
*/
-  setDependentHostComponents: function(componentName) {
+  setDependentHostComponents: function (componentName) {
+var installedServices = App.Service.find().mapProperty('serviceName');
 var installedComponents = 
App.Host.find(this.get('content.reassignHosts.target'))
-  .get('hostComponents')
-  .mapProperty('componentName');
+.get('hostComponents')
+.mapProperty('componentName');
 var dependenciesToInstall = App.StackServiceComponent.find(componentName)
-  .get('dependencies')
-  .mapProperty('componentName')
-  .filter(function(component) {
-return !installedComponents.contains(component);
-  });
+.get('dependencies')
+.filter(function (component) {
+  return !installedComponents.contains(component.componentName) && 
installedServices.contains(component.serviceName);
+})
+.mapProperty('componentName');
 this.set('dependentHostComponents', dependenciesToInstall);
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce47e0c/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js 
b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
index 612efd0..0b00412 100644
--- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
@@ -1090,19 +1090,34 @@ describe('App.ReassignMasterWizardStep4Controller', 
function () {
   })
 ]
   }));
+  sinon.stub(App.Service, 'find').returns([
+Em.Object.create({
+  serviceName: 'S1'
+}),
+Em.Object.create({
+  serviceName: 'S2'
+})
+  ]);
   sinon.stub(App.StackServiceComponent, 'find').returns(Em.Object.create({
 dependencies: [
   Em.Object.create({
-componentName: 'C1'
+componentName: 'C1',
+serviceName: 'S1'
+  }),
+  Em.Object.create({
+componentName: 'C2',
+serviceName: 'S2'
   }),
   Em.Object.create({
-componentName: 'C2'
+componentName: 'C3',
+serviceName: 'S3'
   })
 ]
   }));
 });
 afterEach(function() {
   App.Host.find.restore();
+  App.Service.find.restore();
   App.StackServiceComponent.find.restore();
 });
 

ambari git commit: AMBARI-20349. When SPNEGO authentication is enabled for Hadoop in a cluster with NN HA, PXF Process alert fails (rlevas)

[rlevas]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 221ad2830 -> 245fd5cf3


AMBARI-20349. When SPNEGO authentication is enabled for Hadoop in a cluster 
with NN HA, PXF Process alert fails (rlevas)


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

Branch: refs/heads/branch-2.5
Commit: 245fd5cf3689097fdcdde6a75c39de9d38e0bde8
Parents: 221ad28
Author: Robert Levas 
Authored: Thu Mar 9 10:25:53 2017 -0500
Committer: Robert Levas 
Committed: Thu Mar 9 10:25:53 2017 -0500

--
 .../PXF/3.0.0/package/alerts/api_status.py  | 36 ++--
 1 file changed, 25 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/245fd5cf/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
index d0ed0a4..dcdb372 100644
--- 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
+++ 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
@@ -24,15 +24,17 @@ import socket
 import urllib2
 import urllib
 
+from resource_management.core import shell
 from resource_management.libraries.functions.curl_krb_request import 
curl_krb_request
+from resource_management.libraries.functions.get_kinit_path import 
get_kinit_path
 from resource_management.libraries.functions.namenode_ha_utils import 
get_active_namenode
 from resource_management.libraries.script.config_dictionary import 
ConfigDictionary
 from resource_management.core.environment import Environment
 
 CLUSTER_ENV_SECURITY = '{{cluster-env/security_enabled}}'
-HADOOP_ENV_HDFS_USER = '{{hadoop-env/hdfs_user}}'
-HADOOP_ENV_HDFS_USER_KEYTAB = '{{hadoop-env/hdfs_user_keytab}}'
-HADOOP_ENV_HDFS_PRINCIPAL_NAME = '{{hadoop-env/hdfs_principal_name}}'
+ACTING_USER = 'pxf'
+KEYTAB_FILE = '{{pxf-site/pxf.service.kerberos.keytab}}'
+PRINCIPAL_NAME = '{{pxf-site/pxf.service.kerberos.principal}}'
 HDFS_SITE = '{{hdfs-site}}'
 
 
@@ -58,9 +60,9 @@ commonPXFHeaders = {
 
 def get_tokens():
   return (CLUSTER_ENV_SECURITY,
-  HADOOP_ENV_HDFS_USER,
-  HADOOP_ENV_HDFS_USER_KEYTAB,
-  HADOOP_ENV_HDFS_PRINCIPAL_NAME,
+  ACTING_USER,
+  KEYTAB_FILE,
+  PRINCIPAL_NAME,
   HDFS_SITE)
 
 def _get_delegation_token(namenode_address, user, keytab, principal, 
kinit_path):
@@ -130,21 +132,33 @@ def _get_pxf_protocol_version(base_url):
 
   raise Exception("version could not be found in response " + response)
 
+
+def _ensure_kerberos_authentication(user, principal, keytab_file, kinit_path):
+  kinit_path_local = get_kinit_path(kinit_path)
+  shell.checked_call("{0} -kt {1} {2} > /dev/null".format(kinit_path_local, 
keytab_file, principal),
+ user=user)
+
 def execute(configurations={}, parameters={}, host_name=None):
   BASE_URL = "http://{0}:{1}/pxf/".format(host_name, PXF_PORT)
   try:
 # Get delegation token if security is enabled
 if CLUSTER_ENV_SECURITY in configurations and 
configurations[CLUSTER_ENV_SECURITY].lower() == "true":
+  resolved_principal = configurations[PRINCIPAL_NAME]
+  if resolved_principal is not None:
+resolved_principal = resolved_principal.replace('_HOST', host_name)
+
   if 'dfs.nameservices' in configurations[HDFS_SITE]:
-namenode_address = 
get_active_namenode(ConfigDictionary(configurations[HDFS_SITE]), 
configurations[CLUSTER_ENV_SECURITY], configurations[HADOOP_ENV_HDFS_USER])[1]
+if configurations[CLUSTER_ENV_SECURITY]:
+  _ensure_kerberos_authentication(configurations[ACTING_USER], 
resolved_principal, configurations[KEYTAB_FILE], None)
+namenode_address = 
get_active_namenode(ConfigDictionary(configurations[HDFS_SITE]), 
configurations[CLUSTER_ENV_SECURITY], configurations[ACTING_USER])[1]
   else:
 namenode_address = 
configurations[HDFS_SITE]['dfs.namenode.http-address']
 
   token = _get_delegation_token(namenode_address,
- configurations[HADOOP_ENV_HDFS_USER],
- 
configurations[HADOOP_ENV_HDFS_USER_KEYTAB],
- 
configurations[HADOOP_ENV_HDFS_PRINCIPAL_NAME],
- None)
+configurations[ACTING_USER],
+

ambari git commit: AMBARI-20349. When SPNEGO authentication is enabled for Hadoop in a cluster with NN HA, PXF Process alert fails (rlevas)

[rlevas]

Repository: ambari
Updated Branches:
  refs/heads/trunk 3db5addb9 -> a10120574


AMBARI-20349. When SPNEGO authentication is enabled for Hadoop in a cluster 
with NN HA, PXF Process alert fails (rlevas)


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

Branch: refs/heads/trunk
Commit: a1012057452fde3f4b488dd1e0ebb83069fb29da
Parents: 3db5add
Author: Robert Levas 
Authored: Thu Mar 9 10:25:14 2017 -0500
Committer: Robert Levas 
Committed: Thu Mar 9 10:25:14 2017 -0500

--
 .../PXF/3.0.0/package/alerts/api_status.py  | 36 ++--
 1 file changed, 25 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a1012057/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
index d0ed0a4..dcdb372 100644
--- 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
+++ 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
@@ -24,15 +24,17 @@ import socket
 import urllib2
 import urllib
 
+from resource_management.core import shell
 from resource_management.libraries.functions.curl_krb_request import 
curl_krb_request
+from resource_management.libraries.functions.get_kinit_path import 
get_kinit_path
 from resource_management.libraries.functions.namenode_ha_utils import 
get_active_namenode
 from resource_management.libraries.script.config_dictionary import 
ConfigDictionary
 from resource_management.core.environment import Environment
 
 CLUSTER_ENV_SECURITY = '{{cluster-env/security_enabled}}'
-HADOOP_ENV_HDFS_USER = '{{hadoop-env/hdfs_user}}'
-HADOOP_ENV_HDFS_USER_KEYTAB = '{{hadoop-env/hdfs_user_keytab}}'
-HADOOP_ENV_HDFS_PRINCIPAL_NAME = '{{hadoop-env/hdfs_principal_name}}'
+ACTING_USER = 'pxf'
+KEYTAB_FILE = '{{pxf-site/pxf.service.kerberos.keytab}}'
+PRINCIPAL_NAME = '{{pxf-site/pxf.service.kerberos.principal}}'
 HDFS_SITE = '{{hdfs-site}}'
 
 
@@ -58,9 +60,9 @@ commonPXFHeaders = {
 
 def get_tokens():
   return (CLUSTER_ENV_SECURITY,
-  HADOOP_ENV_HDFS_USER,
-  HADOOP_ENV_HDFS_USER_KEYTAB,
-  HADOOP_ENV_HDFS_PRINCIPAL_NAME,
+  ACTING_USER,
+  KEYTAB_FILE,
+  PRINCIPAL_NAME,
   HDFS_SITE)
 
 def _get_delegation_token(namenode_address, user, keytab, principal, 
kinit_path):
@@ -130,21 +132,33 @@ def _get_pxf_protocol_version(base_url):
 
   raise Exception("version could not be found in response " + response)
 
+
+def _ensure_kerberos_authentication(user, principal, keytab_file, kinit_path):
+  kinit_path_local = get_kinit_path(kinit_path)
+  shell.checked_call("{0} -kt {1} {2} > /dev/null".format(kinit_path_local, 
keytab_file, principal),
+ user=user)
+
 def execute(configurations={}, parameters={}, host_name=None):
   BASE_URL = "http://{0}:{1}/pxf/".format(host_name, PXF_PORT)
   try:
 # Get delegation token if security is enabled
 if CLUSTER_ENV_SECURITY in configurations and 
configurations[CLUSTER_ENV_SECURITY].lower() == "true":
+  resolved_principal = configurations[PRINCIPAL_NAME]
+  if resolved_principal is not None:
+resolved_principal = resolved_principal.replace('_HOST', host_name)
+
   if 'dfs.nameservices' in configurations[HDFS_SITE]:
-namenode_address = 
get_active_namenode(ConfigDictionary(configurations[HDFS_SITE]), 
configurations[CLUSTER_ENV_SECURITY], configurations[HADOOP_ENV_HDFS_USER])[1]
+if configurations[CLUSTER_ENV_SECURITY]:
+  _ensure_kerberos_authentication(configurations[ACTING_USER], 
resolved_principal, configurations[KEYTAB_FILE], None)
+namenode_address = 
get_active_namenode(ConfigDictionary(configurations[HDFS_SITE]), 
configurations[CLUSTER_ENV_SECURITY], configurations[ACTING_USER])[1]
   else:
 namenode_address = 
configurations[HDFS_SITE]['dfs.namenode.http-address']
 
   token = _get_delegation_token(namenode_address,
- configurations[HADOOP_ENV_HDFS_USER],
- 
configurations[HADOOP_ENV_HDFS_USER_KEYTAB],
- 
configurations[HADOOP_ENV_HDFS_PRINCIPAL_NAME],
- None)
+configurations[ACTING_USER],
+

ambari git commit: AMBARI-20362: Enable Authentication in Zeppelin out of Box (Prabhjyot Singh via r-kamath)

[rkamath]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7ff9bd429 -> 3db5addb9


AMBARI-20362: Enable Authentication in Zeppelin out of Box (Prabhjyot Singh via 
r-kamath)


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

Branch: refs/heads/trunk
Commit: 3db5addb9322b944ed8cc33264ffb505241ba281
Parents: 7ff9bd4
Author: Renjith Kamath 
Authored: Thu Mar 9 20:40:19 2017 +0530
Committer: Renjith Kamath 
Committed: Thu Mar 9 20:42:28 2017 +0530

--
 .../configuration/zeppelin-shiro-ini.xml| 71 ++--
 1 file changed, 49 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3db5addb/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 3e2da1e..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
@@ -24,39 +24,66 @@
 [users]
 # List of users with their password allowed to access Zeppelin.
 # To use a different strategy (LDAP / Database / ...) check the shiro doc at 
http://shiro.apache.org/configuration.html#Configuration-INISections
-#admin = password1
-#user1 = password2, role1, role2
-#user2 = password3, role3
-#user3 = password4, role2
+admin = admin, admin
+user1 = user1, role1, role2
+user2 = user2, role3
+user3 = user3, role2
 
 # Sample LDAP configuration, for user Authentication, currently tested for 
single Realm
 [main]
-#activeDirectoryRealm = org.apache.zeppelin.server.ActiveDirectoryGroupRealm
-#activeDirectoryRealm.systemUsername = 
CN=Administrator,CN=Users,DC=HW,DC=EXAMPLE,DC=COM
-#activeDirectoryRealm.systemPassword = Password1!
-#activeDirectoryRealm.hadoopSecurityCredentialPath = 
jceks://user/zeppelin/zeppelin.jceks
-#activeDirectoryRealm.searchBase = CN=Users,DC=HW,DC=TEST,DC=COM
-#activeDirectoryRealm.url = ldap://ad-nano.test.example.com:389
-#activeDirectoryRealm.groupRolesMap = ""
-#activeDirectoryRealm.authorizationCachingEnabled = true
-
-#ldapRealm = org.apache.shiro.realm.ldap.JndiLdapRealm
-#ldapRealm.userDnTemplate = uid={0},cn=users,cn=accounts,dc=example,dc=com
-#ldapRealm.contextFactory.url = ldap://ldaphost:389
+### A sample for configuring Active Directory Realm
+#activeDirectoryRealm = org.apache.zeppelin.realm.ActiveDirectoryGroupRealm
+#activeDirectoryRealm.systemUsername = userNameA
+
+#use either systemPassword or hadoopSecurityCredentialPath, more details in 
http://zeppelin.apache.org/docs/latest/security/shiroauthentication.html
+#activeDirectoryRealm.systemPassword = passwordA
+#activeDirectoryRealm.hadoopSecurityCredentialPath = 
jceks://file/user/zeppelin/zeppelin.jceks
+#activeDirectoryRealm.searchBase = CN=Users,DC=SOME_GROUP,DC=COMPANY,DC=COM
+#activeDirectoryRealm.url = ldap://ldap.test.com:389
+#activeDirectoryRealm.groupRolesMap = 
"CN=admin,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"admin","CN=finance,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"finance","CN=hr,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"hr"
+#activeDirectoryRealm.authorizationCachingEnabled = false
+
+### A sample for configuring LDAP Directory Realm
+#ldapRealm = org.apache.zeppelin.realm.LdapGroupRealm
+## search base for ldap groups (only relevant for LdapGroupRealm):
+#ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
+#ldapRealm.contextFactory.url = ldap://ldap.test.com:389
+#ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
 #ldapRealm.contextFactory.authenticationMechanism = SIMPLE
-#sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager
-#securityManager.sessionManager = $sessionManager
+
+### A sample PAM configuration
+#pamRealm=org.apache.zeppelin.realm.PamRealm
+#pamRealm.service=sshd
+
+
+sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager
+### If caching of user is required then uncomment below lines
+cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager
+securityManager.cacheManager = $cacheManager
+
+securityManager.sessionManager = $sessionManager
 # 86,400,000 milliseconds = 24 hour
-#securityManager.sessionManager.globalSessionTimeout = 8640
+securityManager.sessionManager.globalSessionTimeout 

ambari git commit: AMBARI-20376. While Moving Namenode via Move Master wizard, datanodes reported as down (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 47f924334 -> 221ad2830


AMBARI-20376. While Moving Namenode via Move Master wizard, datanodes reported 
as down (alexantonenko)


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

Branch: refs/heads/branch-2.5
Commit: 221ad2830f1ce3f82508ac92a226f8d4b784fd5c
Parents: 47f9243
Author: Alex Antonenko 
Authored: Thu Mar 9 14:32:10 2017 +0200
Committer: Alex Antonenko 
Committed: Thu Mar 9 17:12:07 2017 +0200

--
 .../controllers/main/service/reassign/step6_controller.js   | 9 +
 ambari-web/app/messages.js  | 1 +
 .../app/mixins/wizard/wizardProgressPageController.js   | 6 +++---
 3 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/221ad283/ambari-web/app/controllers/main/service/reassign/step6_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step6_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
index 80f1bf6..05494d4 100644
--- a/ambari-web/app/controllers/main/service/reassign/step6_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
@@ -27,6 +27,7 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
 'putHostComponentsInMaintenanceMode',
 'stopHostComponentsInMaintenanceMode',
 'deleteHostComponents',
+'startDatanodes',
 'startAllServices'
   ],
 
@@ -97,6 +98,9 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
 } else {
   this.removeTasks(['stopHostComponentsInMaintenanceMode']);
 }
+if (!(this.get('content.reassign.component_name') === 'NAMENODE' && 
App.get('isHaEnabled'))) {
+  this.removeTasks(['startDatanodes']);
+}
   },
 
   hideRollbackButton: function () {
@@ -200,5 +204,10 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
   success: 'startPolling',
   error: 'onTaskError'
 });
+  },
+
+  startDatanodes: function () {
+this.updateComponent('DATANODE', null, 'HDFS', 'Start');
   }
+
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/221ad283/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 83cc85c..20f7757 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2396,6 +2396,7 @@ Em.I18n.translations = {
   'services.reassign.step6.tasks.installPxf.title': 'Install PXF on NameNode',
   'services.reassign.step6.tasks.stopMysqlService.title': 'Stop Mysql Server',
   'services.reassign.step6.tasks.stopHostComponentsInMaintenanceMode.title': 
'Stop {0}',
+  'services.reassign.step6.tasks.startDatanodes.title': 'Start DataNodes',
   'services.reassign.step6.status.success': 'Successfully moved {0} 
from {1} host to {2} host.',
   'services.reassign.step6.status.failed': 'Failed to move {0} from 
{1} host to {2} host.',
   'services.reassign.step6.status.info': 'Reassigning {0}. \nPlease wait for 
all tasks to be completed.',

http://git-wip-us.apache.org/repos/asf/ambari/blob/221ad283/ambari-web/app/mixins/wizard/wizardProgressPageController.js
--
diff --git a/ambari-web/app/mixins/wizard/wizardProgressPageController.js 
b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
index ced5591..9d9d000 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -604,14 +604,14 @@ App.wizardProgressPageControllerMixin = 
Em.Mixin.create(App.InstallComponent, {
* Update component status on selected hosts.
*
* @param {string} componentName
-   * @param {(string|string[])} hostName
+   * @param {(string|string[]|null)} hostName - use null to update components 
on all hosts
* @param {string} serviceName
* @param {string} context
* @param {number} taskNum
* @returns {$.ajax}
*/
   updateComponent: function (componentName, hostName, serviceName, context, 
taskNum) {
-if (!(hostName instanceof Array)) {
+if (hostName && !(hostName instanceof Array)) {
   hostName = [hostName];
 }
 var state = context.toLowerCase() == "start" ? "STARTED" : "INSTALLED";
@@ -622,7 +622,7 @@ App.wizardProgressPageControllerMixin = 
Em.Mixin.create(App.InstallComponent, {
 HostRoles: {
   state: state

ambari git commit: AMBARI-20362: Enable Authentication in Zeppelin out of Box (Prabhjyot Singh via r-kamath)

[rkamath]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c47662934 -> 47f924334


AMBARI-20362: Enable Authentication in Zeppelin out of Box (Prabhjyot Singh via 
r-kamath)


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

Branch: refs/heads/branch-2.5
Commit: 47f924334b850e572298fbd8700a993cdb19065c
Parents: c476629
Author: Renjith Kamath 
Authored: Thu Mar 9 20:40:19 2017 +0530
Committer: Renjith Kamath 
Committed: Thu Mar 9 20:40:19 2017 +0530

--
 .../configuration/zeppelin-shiro-ini.xml| 71 ++--
 1 file changed, 49 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/47f92433/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 3e2da1e..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
@@ -24,39 +24,66 @@
 [users]
 # List of users with their password allowed to access Zeppelin.
 # To use a different strategy (LDAP / Database / ...) check the shiro doc at 
http://shiro.apache.org/configuration.html#Configuration-INISections
-#admin = password1
-#user1 = password2, role1, role2
-#user2 = password3, role3
-#user3 = password4, role2
+admin = admin, admin
+user1 = user1, role1, role2
+user2 = user2, role3
+user3 = user3, role2
 
 # Sample LDAP configuration, for user Authentication, currently tested for 
single Realm
 [main]
-#activeDirectoryRealm = org.apache.zeppelin.server.ActiveDirectoryGroupRealm
-#activeDirectoryRealm.systemUsername = 
CN=Administrator,CN=Users,DC=HW,DC=EXAMPLE,DC=COM
-#activeDirectoryRealm.systemPassword = Password1!
-#activeDirectoryRealm.hadoopSecurityCredentialPath = 
jceks://user/zeppelin/zeppelin.jceks
-#activeDirectoryRealm.searchBase = CN=Users,DC=HW,DC=TEST,DC=COM
-#activeDirectoryRealm.url = ldap://ad-nano.test.example.com:389
-#activeDirectoryRealm.groupRolesMap = ""
-#activeDirectoryRealm.authorizationCachingEnabled = true
-
-#ldapRealm = org.apache.shiro.realm.ldap.JndiLdapRealm
-#ldapRealm.userDnTemplate = uid={0},cn=users,cn=accounts,dc=example,dc=com
-#ldapRealm.contextFactory.url = ldap://ldaphost:389
+### A sample for configuring Active Directory Realm
+#activeDirectoryRealm = org.apache.zeppelin.realm.ActiveDirectoryGroupRealm
+#activeDirectoryRealm.systemUsername = userNameA
+
+#use either systemPassword or hadoopSecurityCredentialPath, more details in 
http://zeppelin.apache.org/docs/latest/security/shiroauthentication.html
+#activeDirectoryRealm.systemPassword = passwordA
+#activeDirectoryRealm.hadoopSecurityCredentialPath = 
jceks://file/user/zeppelin/zeppelin.jceks
+#activeDirectoryRealm.searchBase = CN=Users,DC=SOME_GROUP,DC=COMPANY,DC=COM
+#activeDirectoryRealm.url = ldap://ldap.test.com:389
+#activeDirectoryRealm.groupRolesMap = 
"CN=admin,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"admin","CN=finance,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"finance","CN=hr,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"hr"
+#activeDirectoryRealm.authorizationCachingEnabled = false
+
+### A sample for configuring LDAP Directory Realm
+#ldapRealm = org.apache.zeppelin.realm.LdapGroupRealm
+## search base for ldap groups (only relevant for LdapGroupRealm):
+#ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
+#ldapRealm.contextFactory.url = ldap://ldap.test.com:389
+#ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
 #ldapRealm.contextFactory.authenticationMechanism = SIMPLE
-#sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager
-#securityManager.sessionManager = $sessionManager
+
+### A sample PAM configuration
+#pamRealm=org.apache.zeppelin.realm.PamRealm
+#pamRealm.service=sshd
+
+
+sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager
+### If caching of user is required then uncomment below lines
+cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager
+securityManager.cacheManager = $cacheManager
+
+securityManager.sessionManager = $sessionManager
 # 86,400,000 milliseconds = 24 hour
-#securityManager.sessionManager.globalSessionTimeout = 8640

[2/2] ambari git commit: AMBARI-20376. While Moving Namenode via Move Master wizard, datanodes reported as down (alexantonenko)

[alexantonenko]

AMBARI-20376. While Moving Namenode via Move Master wizard, datanodes reported 
as down (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 647ff84b0b85b04bd350ddb268fde56b0778cf2b
Parents: fbcf24f
Author: Alex Antonenko 
Authored: Thu Mar 9 14:32:10 2017 +0200
Committer: Alex Antonenko 
Committed: Thu Mar 9 17:11:37 2017 +0200

--
 .../controllers/main/service/reassign/step6_controller.js   | 9 +
 ambari-web/app/messages.js  | 1 +
 .../app/mixins/wizard/wizardProgressPageController.js   | 6 +++---
 3 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/647ff84b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step6_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
index 80f1bf6..05494d4 100644
--- a/ambari-web/app/controllers/main/service/reassign/step6_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
@@ -27,6 +27,7 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
 'putHostComponentsInMaintenanceMode',
 'stopHostComponentsInMaintenanceMode',
 'deleteHostComponents',
+'startDatanodes',
 'startAllServices'
   ],
 
@@ -97,6 +98,9 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
 } else {
   this.removeTasks(['stopHostComponentsInMaintenanceMode']);
 }
+if (!(this.get('content.reassign.component_name') === 'NAMENODE' && 
App.get('isHaEnabled'))) {
+  this.removeTasks(['startDatanodes']);
+}
   },
 
   hideRollbackButton: function () {
@@ -200,5 +204,10 @@ App.ReassignMasterWizardStep6Controller = 
App.HighAvailabilityProgressPageContro
   success: 'startPolling',
   error: 'onTaskError'
 });
+  },
+
+  startDatanodes: function () {
+this.updateComponent('DATANODE', null, 'HDFS', 'Start');
   }
+
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/647ff84b/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index a0bc119..2e80a2b 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2429,6 +2429,7 @@ Em.I18n.translations = {
   'services.reassign.step6.tasks.installPxf.title': 'Install PXF on NameNode',
   'services.reassign.step6.tasks.stopMysqlService.title': 'Stop Mysql Server',
   'services.reassign.step6.tasks.stopHostComponentsInMaintenanceMode.title': 
'Stop {0}',
+  'services.reassign.step6.tasks.startDatanodes.title': 'Start DataNodes',
   'services.reassign.step6.status.success': 'Successfully moved {0} 
from {1} host to {2} host.',
   'services.reassign.step6.status.failed': 'Failed to move {0} from 
{1} host to {2} host.',
   'services.reassign.step6.status.info': 'Reassigning {0}. \nPlease wait for 
all tasks to be completed.',

http://git-wip-us.apache.org/repos/asf/ambari/blob/647ff84b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
--
diff --git a/ambari-web/app/mixins/wizard/wizardProgressPageController.js 
b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
index ced5591..9d9d000 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
@@ -604,14 +604,14 @@ App.wizardProgressPageControllerMixin = 
Em.Mixin.create(App.InstallComponent, {
* Update component status on selected hosts.
*
* @param {string} componentName
-   * @param {(string|string[])} hostName
+   * @param {(string|string[]|null)} hostName - use null to update components 
on all hosts
* @param {string} serviceName
* @param {string} context
* @param {number} taskNum
* @returns {$.ajax}
*/
   updateComponent: function (componentName, hostName, serviceName, context, 
taskNum) {
-if (!(hostName instanceof Array)) {
+if (hostName && !(hostName instanceof Array)) {
   hostName = [hostName];
 }
 var state = context.toLowerCase() == "start" ? "STARTED" : "INSTALLED";
@@ -622,7 +622,7 @@ App.wizardProgressPageControllerMixin = 
Em.Mixin.create(App.InstallComponent, {
 HostRoles: {
   state: state
 },
-query: 'HostRoles/component_name=' + componentName + 

[1/2] ambari git commit: AMBARI-20377. Usability: Hostname hover of master is not discoverable in Summary section (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk fbcf24f71 -> 7ff9bd429


AMBARI-20377. Usability: Hostname hover of master is not discoverable in 
Summary section (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 7ff9bd429a1273074d6b8c1edf8b170d3f77ee0d
Parents: 647ff84
Author: Alex Antonenko 
Authored: Thu Mar 9 15:00:54 2017 +0200
Committer: Alex Antonenko 
Committed: Thu Mar 9 17:11:37 2017 +0200

--
 .../service/info/summary/master_components.hbs  |  2 +-
 .../main/service/info/components_list_view.js   | 23 ++-
 ambari-web/app/views/main/service/service.js| 12 ++
 .../app/views/main/service/services/hdfs.js | 17 +++--
 .../service/info/component_list_view_test.js| 29 ++
 .../views/main/service/services/hdfs_test.js| 40 +++-
 6 files changed, 40 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff9bd42/ambari-web/app/templates/main/service/info/summary/master_components.hbs
--
diff --git 
a/ambari-web/app/templates/main/service/info/summary/master_components.hbs 
b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
index be388c5..5b7b47b 100644
--- a/ambari-web/app/templates/main/service/info/summary/master_components.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
@@ -19,7 +19,7 @@
 {{#each comp in view.mastersComp}}
   
 
-  
+  
 {{#if comp.displayNameAdvanced}}
   {{comp.displayNameAdvanced}}
 {{else}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff9bd42/ambari-web/app/views/main/service/info/components_list_view.js
--
diff --git a/ambari-web/app/views/main/service/info/components_list_view.js 
b/ambari-web/app/views/main/service/info/components_list_view.js
index c0a9922..2d01d83 100644
--- a/ambari-web/app/views/main/service/info/components_list_view.js
+++ b/ambari-web/app/views/main/service/info/components_list_view.js
@@ -20,25 +20,24 @@ var App = require('app');
 
 App.SummaryMasterComponentsView = Em.View.extend({
   templateName: 
require('templates/main/service/info/summary/master_components'),
-  mastersCurrentLength: 0,
+
   mastersComp: [],
+
   mastersCompWillChange: function() {
-this.removeTooltips();
+Em.run.next(() => this.removeTooltips());
   }.observesBefore('mastersComp.length'),
+
   mastersCompDidChange: function() {
-this.attachTooltip();
+Em.run.next(() => this.attachTooltip());
   }.observes('mastersComp.length'),
 
   removeTooltips: function() {
-if ($('[rel=SummaryComponentHealthTooltip]').length) {
-  $('[rel=SummaryComponentHealthTooltip]').tooltip('destroy');
-}
+$('.tooltip').remove();
+$(App.SummaryMasterComponentsView.tooltipsSelector).tooltip('destroy');
   },
 
   attachTooltip: function() {
-if ($('[rel=SummaryComponentHealthTooltip]').length) {
-  App.tooltip($('[rel=SummaryComponentHealthTooltip]'));
-}
+App.tooltip($(App.SummaryMasterComponentsView.tooltipsSelector));
   },
 
   didInsertElement: function() {
@@ -46,10 +45,14 @@ App.SummaryMasterComponentsView = Em.View.extend({
   },
 
   willDestroyElement: function() {
-$('[rel=SummaryComponentHealthTooltip]').tooltip('destroy');
+this.removeTooltips();
   }
 });
 
+App.SummaryMasterComponentsView.reopenClass({
+  tooltipsSelector: '[rel=SummaryComponentHealthTooltip], [rel=UsageTooltip]'
+});
+
 App.SummaryClientComponentsView = Em.View.extend({
   templateName: 
require('templates/main/service/info/summary/client_components'),
   clientsObj: []

http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff9bd42/ambari-web/app/views/main/service/service.js
--
diff --git a/ambari-web/app/views/main/service/service.js 
b/ambari-web/app/views/main/service/service.js
index 466ccdc..74319f5 100644
--- a/ambari-web/app/views/main/service/service.js
+++ b/ambari-web/app/views/main/service/service.js
@@ -19,6 +19,7 @@
 var App = require('app');
 var uiEffects = require('utils/ui_effects');
 var numberUtils = require('utils/number_utils');
+require('views/main/service/info/components_list_view');
 
 App.MainDashboardServiceHealthView = Em.View.extend({
   classNameBindings: ["healthStatus", "healthStatusClass"],
@@ -131,15 +132,8 @@ App.MainDashboardServiceView = 
Em.View.extend(App.MainDashboardServiceViewWrappe
 return 

ambari git commit: AMBARI-20359. Not able to import workflow with fs action node (Madhan Mohan Reddy via pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 95833865c -> c47662934


AMBARI-20359. Not able to import workflow with fs action node (Madhan Mohan 
Reddy via pallavkul)


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

Branch: refs/heads/branch-2.5
Commit: c476629345c05896a445f005e94f2ab605510362
Parents: 9583386
Author: pallavkul 
Authored: Thu Mar 9 20:25:50 2017 +0530
Committer: pallavkul 
Committed: Thu Mar 9 20:28:13 2017 +0530

--
 .../src/main/resources/ui/app/domain/workflow-importer.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c4766293/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
index ccf8209..a076e3e 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
@@ -106,7 +106,7 @@ var WorkflowImporter= Ember.Object.extend({
   if (nodeHandler){
 if (Ember.isArray(workflowAppJson[key])){
   workflowAppJson[key].forEach(function(jsonObj){
-var node=nodeHandler.handleImportNode(key,jsonObj,workflow);
+var node=nodeHandler.handleImportNode(key,jsonObj,workflow,xmlDoc);
 nodeMap.set(jsonObj._name,{json:jsonObj,node:node});
   });
 }else{

ambari git commit: AMBARI-20359. Not able to import workflow with fs action node (Madhan Mohan Reddy via pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/trunk c3c3422e5 -> fbcf24f71


AMBARI-20359. Not able to import workflow with fs action node (Madhan Mohan 
Reddy via pallavkul)


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

Branch: refs/heads/trunk
Commit: fbcf24f71a1ec1ea21cc236bab36b205822ec4e6
Parents: c3c3422
Author: pallavkul 
Authored: Thu Mar 9 20:25:50 2017 +0530
Committer: pallavkul 
Committed: Thu Mar 9 20:25:50 2017 +0530

--
 .../src/main/resources/ui/app/domain/workflow-importer.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fbcf24f7/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
index ccf8209..a076e3e 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
@@ -106,7 +106,7 @@ var WorkflowImporter= Ember.Object.extend({
   if (nodeHandler){
 if (Ember.isArray(workflowAppJson[key])){
   workflowAppJson[key].forEach(function(jsonObj){
-var node=nodeHandler.handleImportNode(key,jsonObj,workflow);
+var node=nodeHandler.handleImportNode(key,jsonObj,workflow,xmlDoc);
 nodeMap.set(jsonObj._name,{json:jsonObj,node:node});
   });
 }else{

ambari git commit: AMBARI-20375. Remove duplicate code from wizard menu (onechiporenko)

[onechiporenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk af69dcc43 -> c3c3422e5


AMBARI-20375. Remove duplicate code from wizard menu (onechiporenko)


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

Branch: refs/heads/trunk
Commit: c3c3422e51c58c6e9ec3affd492f28a26499dc1e
Parents: af69dcc
Author: Oleg Nechiporenko 
Authored: Thu Mar 9 14:03:11 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Thu Mar 9 16:41:51 2017 +0200

--
 .../app/mixins/wizard/wizard_menu_view.js   | 125 ++-
 .../app/views/main/service/reassign_view.js |  32 -
 2 files changed, 38 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3c3422e/ambari-web/app/mixins/wizard/wizard_menu_view.js
--
diff --git a/ambari-web/app/mixins/wizard/wizard_menu_view.js 
b/ambari-web/app/mixins/wizard/wizard_menu_view.js
index 90b7354..712263e 100644
--- a/ambari-web/app/mixins/wizard/wizard_menu_view.js
+++ b/ambari-web/app/mixins/wizard/wizard_menu_view.js
@@ -16,101 +16,52 @@
  * limitations under the License.
  */
 
-
 var App = require('app');
 
+function isStepDisabled(index) {
+  return Em.computed('controller.isStepDisabled.@each.{step,value}', function 
() {
+return this.isStepDisabled(index);
+  }).cacheable();
+}
+
+function isStepCompleted(index) {
+  return Em.computed('controller.{currentStep,isStepDisabled.@each.value}', 
function () {
+return this.isStepCompleted(index);
+  }).cacheable();
+}
+
 App.WizardMenuMixin = Em.Mixin.create({
 
   isStepDisabled: function (index) {
 return this.get('controller.isStepDisabled').findProperty('step', 
index).get('value');
   },
 
-  isStep0Disabled: function () {
-return this.isStepDisabled(0);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep1Disabled: function () {
-return this.isStepDisabled(1);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep2Disabled: function () {
-return this.isStepDisabled(2);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep3Disabled: function () {
-return this.isStepDisabled(3);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep4Disabled: function () {
-return this.isStepDisabled(4);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep5Disabled: function () {
-return this.isStepDisabled(5);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep6Disabled: function () {
-return this.isStepDisabled(6);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep7Disabled: function () {
-return this.isStepDisabled(7);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep8Disabled: function () {
-return this.isStepDisabled(8);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep9Disabled: function () {
-return this.isStepDisabled(9);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep10Disabled: function () {
-return this.isStepDisabled(10);
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep0Completed: function () {
-return this.get('controller.currentStep') > 0;
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep1Completed: function () {
-return this.get('controller.currentStep') > 1;
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep2Completed: function () {
-return this.get('controller.currentStep') > 2;
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep3Completed: function () {
-return this.get('controller.currentStep') > 3;
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep4Completed: function () {
-return this.get('controller.currentStep') > 4;
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep5Completed: function () {
-return this.get('controller.currentStep') > 5;
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep6Completed: function () {
-return this.get('controller.currentStep') > 6;
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep7Completed: function () {
-return this.get('controller.currentStep') > 7;
-  }.property('controller.isStepDisabled.@each.value').cacheable(),
-
-  isStep8Completed: function () {
-return this.get('controller.currentStep') > 

ambari git commit: AMBARI-20367: Update Zeppelin version on Ambari-2.5 from 0.6.2 to 0.7.0 (Prabhjyot Singh via r-kamath)

[rkamath]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4534e0a5a -> e1cdfe449


AMBARI-20367: Update Zeppelin version on Ambari-2.5 from 0.6.2 to 0.7.0 
(Prabhjyot Singh via r-kamath)


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

Branch: refs/heads/branch-2.5
Commit: e1cdfe4492c9bd8d9aa1a4151af5badfd93e6d95
Parents: 4534e0a
Author: Renjith Kamath 
Authored: Thu Mar 9 19:57:06 2017 +0530
Committer: Renjith Kamath 
Committed: Thu Mar 9 19:59:28 2017 +0530

--
 .../main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e1cdfe44/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
index 59a0ae8..2e2996b 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
@@ -21,7 +21,7 @@
   
 
   ZEPPELIN
-  0.6.2
+  0.7.0
 
   
 

[2/2] ambari git commit: AMBARI-20332. Few ambari agent unit tests are failing (aonishuk)

[aonishuk]

AMBARI-20332. Few ambari agent unit tests are failing (aonishuk)


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

Branch: refs/heads/branch-2.5
Commit: 95833865c3b2bb006ae44b355a3c597bd2cef3d7
Parents: e1cdfe4
Author: Andrew Onishuk 
Authored: Thu Mar 9 16:31:01 2017 +0200
Committer: Andrew Onishuk 
Committed: Thu Mar 9 16:31:01 2017 +0200

--
 .../resource_management/TestDatanodeHelper.py   | 16 
 .../stacks/2.0.6/YARN/test_yarn_service_check.py|  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/95833865/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
--
diff --git 
a/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py 
b/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
index f22c8e9..071bd05 100644
--- a/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
+++ b/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
@@ -176,46 +176,46 @@ class TestDatanodeHelper(TestCase):
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = True, 
curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # root, no history file, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # non root, no history file, manage_dirs_on_root = False
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=True, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # unmounted to root, manage_dirs_on_root = True
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder('/grid/0/data', '/grid/0', True, 
dirs_unmounted, [], False, '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # unmounted to root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/grid/0/data', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # same mount = root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # same mount = root, manage_dirs_on_root = True
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = True, 
curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # mount changed to non root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder('/grid/0/data', '/', True, 
dirs_unmounted, [], False, '/grid/0'))
-

[1/2] ambari git commit: AMBARI-20332. Few ambari agent unit tests are failing (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 e1cdfe449 -> 95833865c
  refs/heads/trunk 573907754 -> af69dcc43


AMBARI-20332. Few ambari agent unit tests are failing (aonishuk)


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

Branch: refs/heads/trunk
Commit: af69dcc43a33682b393cd488458f9b3244b1a6db
Parents: 5739077
Author: Andrew Onishuk 
Authored: Thu Mar 9 16:30:56 2017 +0200
Committer: Andrew Onishuk 
Committed: Thu Mar 9 16:30:56 2017 +0200

--
 .../resource_management/TestDatanodeHelper.py   | 16 
 .../stacks/2.0.6/YARN/test_yarn_service_check.py|  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/af69dcc4/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
--
diff --git 
a/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py 
b/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
index f22c8e9..071bd05 100644
--- a/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
+++ b/ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py
@@ -176,46 +176,46 @@ class TestDatanodeHelper(TestCase):
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = True, 
curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # root, no history file, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # non root, no history file, manage_dirs_on_root = False
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir=None, is_non_root_dir=True, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # unmounted to root, manage_dirs_on_root = True
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder('/grid/0/data', '/grid/0', True, 
dirs_unmounted, [], False, '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # unmounted to root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/grid/0/data', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set(['/grid/0/data']))
+self.assertEquals(dirs_unmounted, set(['/grid/0/data']))
 
 # same mount = root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 self.assertEquals(False, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = 
False, curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # same mount = root, manage_dirs_on_root = True
 # folder should be managed
 dirs_unmounted=set()
 self.assertEquals(True, 
mounted_dirs_helper._may_manage_folder(dir_='/grid/0/data', 
last_mount_point_for_dir='/', is_non_root_dir=False, 
dirs_unmounted=dirs_unmounted, error_messages = [], manage_dirs_on_root = True, 
curr_mount_point = '/'))
-self.assertSetEqual(dirs_unmounted, set())
+self.assertEquals(dirs_unmounted, set())
 
 # mount changed to non root, manage_dirs_on_root = False
 # folder should not be managed
 dirs_unmounted=set()
 

ambari git commit: AMBARI-20367: Update Zeppelin version on Ambari-2.5 from 0.6.2 to 0.7.0 (Prabhjyot Singh via r-kamath)

[rkamath]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0ca474786 -> 573907754


AMBARI-20367: Update Zeppelin version on Ambari-2.5 from 0.6.2 to 0.7.0 
(Prabhjyot Singh via r-kamath)


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

Branch: refs/heads/trunk
Commit: 573907754e6743729f4788187850ef844a95aaf7
Parents: 0ca4747
Author: Renjith Kamath 
Authored: Thu Mar 9 19:57:06 2017 +0530
Committer: Renjith Kamath 
Committed: Thu Mar 9 19:58:23 2017 +0530

--
 .../main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/57390775/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
index 59a0ae8..2e2996b 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml
@@ -21,7 +21,7 @@
   
 
   ZEPPELIN
-  0.6.2
+  0.7.0
 
   
 

ambari git commit: AMBARI-20373. Complete button after move masters is grayed out even after move has completed (akovalenko)

[akovalenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c52027c84 -> 4534e0a5a


AMBARI-20373. Complete button after move masters is grayed out even after move 
has completed (akovalenko)


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

Branch: refs/heads/branch-2.5
Commit: 4534e0a5aa91f34b44ac32e492cc960d91c07046
Parents: c52027c
Author: Aleksandr Kovalenko 
Authored: Thu Mar 9 13:14:53 2017 +0200
Committer: Aleksandr Kovalenko 
Committed: Thu Mar 9 16:25:57 2017 +0200

--
 ambari-web/app/routes/reassign_master_routes.js | 33 
 1 file changed, 13 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4534e0a5/ambari-web/app/routes/reassign_master_routes.js
--
diff --git a/ambari-web/app/routes/reassign_master_routes.js 
b/ambari-web/app/routes/reassign_master_routes.js
index d5cbadb..9bc7d06 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -292,22 +292,21 @@ module.exports = App.WizardRoute.extend({
 
 next: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep6 = 
router.get('reassignMasterWizardStep6Controller');
-  if (!reassignMasterWizardStep6.get('isSubmitDisabled')) {
-controller.finish();
-controller.get('popup').hide();
-App.clusterStatus.setClusterStatus({
-  clusterName: 
router.get('reassignMasterController.content.cluster.name'),
-  clusterState: 'DEFAULT',
-  localdb: App.db.data
-}, {alwaysCallback: function () {
+  controller.finish();
+  controller.get('popup').hide();
+  App.clusterStatus.setClusterStatus({
+clusterName: 
router.get('reassignMasterController.content.cluster.name'),
+clusterState: 'DEFAULT',
+localdb: App.db.data
+  }, {
+alwaysCallback: function () {
   controller.get('popup').hide();
   router.transitionTo('main.index');
-  Em.run.next(function() {
+  Em.run.next(function () {
 location.reload();
   });
-}});
-  }
+}
+  });
 },
 
 unroutePath: function () {
@@ -331,18 +330,12 @@ module.exports = App.WizardRoute.extend({
 
 next: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep7 = 
router.get('reassignMasterWizardStep7Controller');
-  if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
-controller.resetOnClose(controller, 'main.index');
-  }
+  controller.resetOnClose(controller, 'main.index');
 },
 
 complete: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep7 = 
router.get('reassignMasterWizardStep7Controller');
-  if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
-controller.resetOnClose(controller, 'main.index');
-  }
+  controller.resetOnClose(controller, 'main.index');
 },
 
 unroutePath: function () {

ambari git commit: AMBARI-20373. Complete button after move masters is grayed out even after move has completed (akovalenko)

[akovalenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk d3f7c8fb3 -> 0ca474786


AMBARI-20373. Complete button after move masters is grayed out even after move 
has completed (akovalenko)


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

Branch: refs/heads/trunk
Commit: 0ca474786dcbdf8cf249f4b04c0ee106ee61cc9a
Parents: d3f7c8f
Author: Aleksandr Kovalenko 
Authored: Thu Mar 9 13:14:53 2017 +0200
Committer: Aleksandr Kovalenko 
Committed: Thu Mar 9 16:26:17 2017 +0200

--
 ambari-web/app/routes/reassign_master_routes.js | 33 
 1 file changed, 13 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ca47478/ambari-web/app/routes/reassign_master_routes.js
--
diff --git a/ambari-web/app/routes/reassign_master_routes.js 
b/ambari-web/app/routes/reassign_master_routes.js
index 798ec0f..341172b 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -293,22 +293,21 @@ module.exports = App.WizardRoute.extend({
 
 next: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep6 = 
router.get('reassignMasterWizardStep6Controller');
-  if (!reassignMasterWizardStep6.get('isSubmitDisabled')) {
-controller.finish();
-controller.get('popup').hide();
-App.clusterStatus.setClusterStatus({
-  clusterName: 
router.get('reassignMasterController.content.cluster.name'),
-  clusterState: 'DEFAULT',
-  localdb: App.db.data
-}, {alwaysCallback: function () {
+  controller.finish();
+  controller.get('popup').hide();
+  App.clusterStatus.setClusterStatus({
+clusterName: 
router.get('reassignMasterController.content.cluster.name'),
+clusterState: 'DEFAULT',
+localdb: App.db.data
+  }, {
+alwaysCallback: function () {
   controller.get('popup').hide();
   router.transitionTo('main.index');
-  Em.run.next(function() {
+  Em.run.next(function () {
 location.reload();
   });
-}});
-  }
+}
+  });
 },
 
 unroutePath: function () {
@@ -332,18 +331,12 @@ module.exports = App.WizardRoute.extend({
 
 next: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep7 = 
router.get('reassignMasterWizardStep7Controller');
-  if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
-controller.resetOnClose(controller, 'main.index');
-  }
+  controller.resetOnClose(controller, 'main.index');
 },
 
 complete: function (router) {
   var controller = router.get('reassignMasterController');
-  var reassignMasterWizardStep7 = 
router.get('reassignMasterWizardStep7Controller');
-  if (!reassignMasterWizardStep7.get('isSubmitDisabled')) {
-controller.resetOnClose(controller, 'main.index');
-  }
+  controller.resetOnClose(controller, 'main.index');
 },
 
 unroutePath: function () {

[1/2] ambari git commit: AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove clutter from slider service check (dlysnichenko)

[dmitriusan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c9f705655 -> c52027c84
  refs/heads/trunk 625dc70b8 -> d3f7c8fb3


AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove 
clutter from slider service check (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: d3f7c8fb3d518580c56d4247dbcf4d3293c04139
Parents: 625dc70
Author: Lisnichenko Dmitro 
Authored: Thu Mar 9 16:18:15 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Thu Mar 9 16:18:15 2017 +0200

--
 .../SLIDER/0.60.0.2.2/package/scripts/service_check.py | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f7c8fb/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
index a363a32..e77ded3 100644
--- 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
@@ -41,7 +41,6 @@ class SliderServiceCheck(Script):
   def service_check(self, env):
 import params
 env.set_params(params)
-environment={'HADOOP_CONF_DIR': '/usr/hdp/2.4.3.0-227/hadoop/conf'}
 
 if params.stack_version_formatted and 
check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, 
params.stack_version_formatted):
   copy_to_hdfs("slider", params.user_group, params.hdfs_user, 
skip=params.sysprep_skip_copy_tarballs_hdfs)
@@ -56,7 +55,6 @@ class SliderServiceCheck(Script):
 try_sleep=5,
 user=params.smokeuser,
 logoutput=True,
-environment=environment
 )
 
 

[2/2] ambari git commit: AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove clutter from slider service check (dlysnichenko)

[dmitriusan]

AMBARI-20344. RU: MR2 service check failed during rolling upgrade. Remove 
clutter from slider service check (dlysnichenko)


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

Branch: refs/heads/branch-2.5
Commit: c52027c849038c11e58e1c0b4eecb740bc9d0a1a
Parents: c9f7056
Author: Lisnichenko Dmitro 
Authored: Thu Mar 9 16:18:15 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Thu Mar 9 16:19:15 2017 +0200

--
 .../SLIDER/0.60.0.2.2/package/scripts/service_check.py | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c52027c8/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
index 3b2c4ab..f8e213c 100644
--- 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/service_check.py
@@ -39,7 +39,6 @@ class SliderServiceCheck(Script):
   def service_check(self, env):
 import params
 env.set_params(params)
-environment={'HADOOP_CONF_DIR': '/usr/hdp/2.4.3.0-227/hadoop/conf'}
 
 if params.stack_version_formatted and 
check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, 
params.stack_version_formatted):
   copy_to_hdfs("slider", params.user_group, params.hdfs_user, 
skip=params.sysprep_skip_copy_tarballs_hdfs)
@@ -54,7 +53,6 @@ class SliderServiceCheck(Script):
 try_sleep=5,
 user=params.smokeuser,
 logoutput=True,
-environment=environment
 )
 
 

ambari git commit: AMBARI-20371. WFM: Delete option in Manage recent list. (Venkata Sairam via pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c7086b11b -> c9f705655


AMBARI-20371. WFM: Delete option in Manage recent list. (Venkata Sairam via 
pallavkul)


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

Branch: refs/heads/branch-2.5
Commit: c9f70565538ea7710b2824c95c6190417711ff1b
Parents: c7086b1
Author: pallavkul 
Authored: Thu Mar 9 19:28:52 2017 +0530
Committer: pallavkul 
Committed: Thu Mar 9 19:29:57 2017 +0530

--
 .../ui/app/components/designer-workspace.js |   1 +
 .../resources/ui/app/components/drafts-wf.js|  84 +++--
 .../ui/app/components/recent-projects.js|  32 +---
 .../src/main/resources/ui/app/styles/app.less   |  14 +-
 .../templates/components/designer-workspace.hbs |   2 +-
 .../ui/app/templates/components/drafts-wf.hbs   | 175 ---
 .../templates/components/recent-projects.hbs|  17 +-
 7 files changed, 195 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f70565/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
index 0e49d70..980904f 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
@@ -213,6 +213,7 @@ export default Ember.Component.extend({
 },
 editWorkflow(path, type){
   this.sendAction('editWorkflow', path, type);
+  this.send('hideProjectManagerList');
 },
 showProjectManagerList(){
   var deferred = Ember.RSVP.defer();

http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f70565/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
index 1d01e9b..ed448d9 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
@@ -24,9 +24,10 @@ export default Ember.Component.extend({
   "isCoordinator": true,
   "isWorkflow": true,
   "sortProp": ['updatedAt:desc'],
-  "filteredModels": Ember.computed("model", "search", "isBundle", 
"isCoordinator", "isWorkflow", function(){
+  "filteredModels": Ember.computed("recentFiles", "search", "isBundle", 
"isCoordinator", "isWorkflow", {
+get(key) {
 var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
-return this.get("model").filter( (role) => {
+return this.get("recentFiles").filter( (role) => {
   score = 0
   if(searchTxt && searchTxt.length) {
 condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
@@ -42,22 +43,42 @@ export default Ember.Component.extend({
   }
   return condition && score > 0;
 });
+},
+set(key, value) {
+  this.set('recentFiles', value);
+
+  var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
+  return this.get("recentFiles").filter( (role) => {
+score = 0
+if(searchTxt && searchTxt.length) {
+  condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
+}
+if(isWorkflow && role.get('type') === 'WORKFLOW') {
+  score++;
+}
+if(isCoordinator && role.get('type') === 'COORDINATOR') {
+  score++;
+}
+if(isBundle && role.get('type') === 'BUNDLE') {
+  score++;
+}
+return condition && score > 0;
+  });
+  //return value;
+}
   }),
+  resetDetails() {
+this.set("deleteMsg", null);
+this.set("deleteInProgress", false);
+  },
   modelSorted : Ember.computed.sort("filteredModels", "sortProp"),
   "isDeleteDraftConformation": false,
   "currentDraft": undefined,
   "deleteInProgress": false,
   "deleteMsg": undefined,
   "currentJobService" : Ember.inject.service('current-job'),
-  elementsInserted: function () {
- 

ambari git commit: AMBARI-20371. WFM: Delete option in Manage recent list. (Venkata Sairam via pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0ff34acb3 -> 625dc70b8


AMBARI-20371. WFM: Delete option in Manage recent list. (Venkata Sairam via 
pallavkul)


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

Branch: refs/heads/trunk
Commit: 625dc70b8c6803536f2a5b0f87904d26f8daae2c
Parents: 0ff34ac
Author: pallavkul 
Authored: Thu Mar 9 19:28:52 2017 +0530
Committer: pallavkul 
Committed: Thu Mar 9 19:28:52 2017 +0530

--
 .../ui/app/components/designer-workspace.js |   1 +
 .../resources/ui/app/components/drafts-wf.js|  84 +++--
 .../ui/app/components/recent-projects.js|  32 +---
 .../src/main/resources/ui/app/styles/app.less   |  14 +-
 .../templates/components/designer-workspace.hbs |   2 +-
 .../ui/app/templates/components/drafts-wf.hbs   | 175 ---
 .../templates/components/recent-projects.hbs|  17 +-
 7 files changed, 195 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/625dc70b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
index 0e49d70..980904f 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
@@ -213,6 +213,7 @@ export default Ember.Component.extend({
 },
 editWorkflow(path, type){
   this.sendAction('editWorkflow', path, type);
+  this.send('hideProjectManagerList');
 },
 showProjectManagerList(){
   var deferred = Ember.RSVP.defer();

http://git-wip-us.apache.org/repos/asf/ambari/blob/625dc70b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
index 1d01e9b..ed448d9 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
@@ -24,9 +24,10 @@ export default Ember.Component.extend({
   "isCoordinator": true,
   "isWorkflow": true,
   "sortProp": ['updatedAt:desc'],
-  "filteredModels": Ember.computed("model", "search", "isBundle", 
"isCoordinator", "isWorkflow", function(){
+  "filteredModels": Ember.computed("recentFiles", "search", "isBundle", 
"isCoordinator", "isWorkflow", {
+get(key) {
 var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
-return this.get("model").filter( (role) => {
+return this.get("recentFiles").filter( (role) => {
   score = 0
   if(searchTxt && searchTxt.length) {
 condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
@@ -42,22 +43,42 @@ export default Ember.Component.extend({
   }
   return condition && score > 0;
 });
+},
+set(key, value) {
+  this.set('recentFiles', value);
+
+  var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
+  return this.get("recentFiles").filter( (role) => {
+score = 0
+if(searchTxt && searchTxt.length) {
+  condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
+}
+if(isWorkflow && role.get('type') === 'WORKFLOW') {
+  score++;
+}
+if(isCoordinator && role.get('type') === 'COORDINATOR') {
+  score++;
+}
+if(isBundle && role.get('type') === 'BUNDLE') {
+  score++;
+}
+return condition && score > 0;
+  });
+  //return value;
+}
   }),
+  resetDetails() {
+this.set("deleteMsg", null);
+this.set("deleteInProgress", false);
+  },
   modelSorted : Ember.computed.sort("filteredModels", "sortProp"),
   "isDeleteDraftConformation": false,
   "currentDraft": undefined,
   "deleteInProgress": false,
   "deleteMsg": undefined,
   "currentJobService" : Ember.inject.service('current-job'),
-  elementsInserted: function () {
-  

ambari git commit: Revert "AMBARI-20371. WFM: Delete option in Manage recent list. (pallavkul)"

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/trunk a3f593d8f -> 0ff34acb3


Revert "AMBARI-20371. WFM: Delete option in Manage recent list. (pallavkul)"

This reverts commit a3f593d8f83560b3496c87a08c9908fa6b0348d6.


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

Branch: refs/heads/trunk
Commit: 0ff34acb3cd9f71a82e8175a4d0086d16ddf01d0
Parents: a3f593d
Author: pallavkul 
Authored: Thu Mar 9 19:28:19 2017 +0530
Committer: pallavkul 
Committed: Thu Mar 9 19:28:19 2017 +0530

--
 .../ui/app/components/designer-workspace.js |   1 -
 .../resources/ui/app/components/drafts-wf.js|  84 ++---
 .../ui/app/components/recent-projects.js|  32 +++-
 .../src/main/resources/ui/app/styles/app.less   |  14 +-
 .../templates/components/designer-workspace.hbs |   2 +-
 .../ui/app/templates/components/drafts-wf.hbs   | 175 +++
 .../templates/components/recent-projects.hbs|  17 +-
 7 files changed, 130 insertions(+), 195 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ff34acb/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
index 980904f..0e49d70 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
@@ -213,7 +213,6 @@ export default Ember.Component.extend({
 },
 editWorkflow(path, type){
   this.sendAction('editWorkflow', path, type);
-  this.send('hideProjectManagerList');
 },
 showProjectManagerList(){
   var deferred = Ember.RSVP.defer();

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ff34acb/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
index ed448d9..1d01e9b 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
@@ -24,10 +24,9 @@ export default Ember.Component.extend({
   "isCoordinator": true,
   "isWorkflow": true,
   "sortProp": ['updatedAt:desc'],
-  "filteredModels": Ember.computed("recentFiles", "search", "isBundle", 
"isCoordinator", "isWorkflow", {
-get(key) {
+  "filteredModels": Ember.computed("model", "search", "isBundle", 
"isCoordinator", "isWorkflow", function(){
 var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
-return this.get("recentFiles").filter( (role) => {
+return this.get("model").filter( (role) => {
   score = 0
   if(searchTxt && searchTxt.length) {
 condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
@@ -43,42 +42,22 @@ export default Ember.Component.extend({
   }
   return condition && score > 0;
 });
-},
-set(key, value) {
-  this.set('recentFiles', value);
-
-  var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
-  return this.get("recentFiles").filter( (role) => {
-score = 0
-if(searchTxt && searchTxt.length) {
-  condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
-}
-if(isWorkflow && role.get('type') === 'WORKFLOW') {
-  score++;
-}
-if(isCoordinator && role.get('type') === 'COORDINATOR') {
-  score++;
-}
-if(isBundle && role.get('type') === 'BUNDLE') {
-  score++;
-}
-return condition && score > 0;
-  });
-  //return value;
-}
   }),
-  resetDetails() {
-this.set("deleteMsg", null);
-this.set("deleteInProgress", false);
-  },
   modelSorted : Ember.computed.sort("filteredModels", "sortProp"),
   "isDeleteDraftConformation": false,
   "currentDraft": undefined,
   "deleteInProgress": false,
   "deleteMsg": undefined,
   "currentJobService" : 

ambari git commit: AMBARI-20371. WFM: Delete option in Manage recent list. (pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/trunk 47c0c582b -> a3f593d8f


AMBARI-20371. WFM: Delete option in Manage recent list. (pallavkul)


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

Branch: refs/heads/trunk
Commit: a3f593d8f83560b3496c87a08c9908fa6b0348d6
Parents: 47c0c58
Author: pallavkul 
Authored: Thu Mar 9 19:27:22 2017 +0530
Committer: pallavkul 
Committed: Thu Mar 9 19:27:22 2017 +0530

--
 .../ui/app/components/designer-workspace.js |   1 +
 .../resources/ui/app/components/drafts-wf.js|  84 +++--
 .../ui/app/components/recent-projects.js|  32 +---
 .../src/main/resources/ui/app/styles/app.less   |  14 +-
 .../templates/components/designer-workspace.hbs |   2 +-
 .../ui/app/templates/components/drafts-wf.hbs   | 175 ---
 .../templates/components/recent-projects.hbs|  17 +-
 7 files changed, 195 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a3f593d8/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
index 0e49d70..980904f 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/designer-workspace.js
@@ -213,6 +213,7 @@ export default Ember.Component.extend({
 },
 editWorkflow(path, type){
   this.sendAction('editWorkflow', path, type);
+  this.send('hideProjectManagerList');
 },
 showProjectManagerList(){
   var deferred = Ember.RSVP.defer();

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3f593d8/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
index 1d01e9b..ed448d9 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/drafts-wf.js
@@ -24,9 +24,10 @@ export default Ember.Component.extend({
   "isCoordinator": true,
   "isWorkflow": true,
   "sortProp": ['updatedAt:desc'],
-  "filteredModels": Ember.computed("model", "search", "isBundle", 
"isCoordinator", "isWorkflow", function(){
+  "filteredModels": Ember.computed("recentFiles", "search", "isBundle", 
"isCoordinator", "isWorkflow", {
+get(key) {
 var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
-return this.get("model").filter( (role) => {
+return this.get("recentFiles").filter( (role) => {
   score = 0
   if(searchTxt && searchTxt.length) {
 condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
@@ -42,22 +43,42 @@ export default Ember.Component.extend({
   }
   return condition && score > 0;
 });
+},
+set(key, value) {
+  this.set('recentFiles', value);
+
+  var score = 0, condition = true, searchTxt = 
this.get("search").toLowerCase(), isWorkflow = this.get("isWorkflow"), 
isCoordinator = this.get("isCoordinator"), isBundle = this.get("isBundle");
+  return this.get("recentFiles").filter( (role) => {
+score = 0
+if(searchTxt && searchTxt.length) {
+  condition = role.get('name') && 
role.get('name').toLowerCase().indexOf(searchTxt)>-1;
+}
+if(isWorkflow && role.get('type') === 'WORKFLOW') {
+  score++;
+}
+if(isCoordinator && role.get('type') === 'COORDINATOR') {
+  score++;
+}
+if(isBundle && role.get('type') === 'BUNDLE') {
+  score++;
+}
+return condition && score > 0;
+  });
+  //return value;
+}
   }),
+  resetDetails() {
+this.set("deleteMsg", null);
+this.set("deleteInProgress", false);
+  },
   modelSorted : Ember.computed.sort("filteredModels", "sortProp"),
   "isDeleteDraftConformation": false,
   "currentDraft": undefined,
   "deleteInProgress": false,
   "deleteMsg": undefined,
   "currentJobService" : Ember.inject.service('current-job'),
-  elementsInserted: function () {
-  this.$('.actions').hide();
-