date:20170314

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

2017-03-14 Thread sriharsha

Repository: ambari
Updated Branches:
  refs/heads/trunk 7e624b55c -> 3c9ebb685


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


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

Branch: refs/heads/trunk
Commit: 3c9ebb685ba4e129943f5851db10a9b2680cf1ee
Parents: 7e624b5
Author: Sriharsha Chintalapani 
Authored: Tue Mar 14 15:01:05 2017 -0700
Committer: Sriharsha Chintalapani 
Committed: Tue Mar 14 16:40:46 2017 -0700

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


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

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

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

2017-03-14 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/trunk 02eae2e71 -> 7e624b55c


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


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

Branch: refs/heads/trunk
Commit: 7e624b55ccac6c04fa9caf5eddbb4aa9282fd473
Parents: 02eae2e
Author: Sumit Mohanty 
Authored: Tue Mar 14 15:37:14 2017 -0700
Committer: Sumit Mohanty 
Committed: Tue Mar 14 15:37:52 2017 -0700

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


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

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

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

2017-03-14 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 db9989d10 -> d547d5dcc


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


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

Branch: refs/heads/branch-2.5
Commit: d547d5dcc16c7824cbfe5afd9e33dc4913415d77
Parents: db9989d
Author: Sumit Mohanty 
Authored: Tue Mar 14 15:37:14 2017 -0700
Committer: Sumit Mohanty 
Committed: Tue Mar 14 15:37:14 2017 -0700

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


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

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

ambari git commit: AMBARI-20448. Some random status command takes more than 5 seconds to execute (Eugene Chekanskiy via smohanty)

2017-03-14 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a526a07cb -> db9989d10


AMBARI-20448. Some random status command takes more than 5 seconds to execute 
(Eugene Chekanskiy via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: db9989d10b5820ac40f4d6e1503cb681201635a5
Parents: a526a07
Author: Sumit Mohanty 
Authored: Tue Mar 14 15:09:48 2017 -0700
Committer: Sumit Mohanty 
Committed: Tue Mar 14 15:11:56 2017 -0700

--
 .../src/main/python/ambari_agent/StatusCommandsExecutor.py | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/db9989d1/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py 
b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
index 3b23f1c..eaa24c2 100644
--- a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
@@ -164,6 +164,12 @@ class 
MultiProcessStatusCommandsExecutor(StatusCommandsExecutor):
 """
 Internal method that running in separate process.
 """
+# cleanup monkey-patching results in child process, as it causing problems
+import subprocess
+reload(subprocess)
+import multiprocessing
+reload(multiprocessing)
+
 bind_debug_signal_handlers()
 self._log_message(logging.INFO, "StatusCommandsExecutor process started")

ambari git commit: AMBARI-20448. Some random status command takes more than 5 seconds to execute (Eugene Chekanskiy via smohanty)

2017-03-14 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/trunk 75f1a29e6 -> 02eae2e71


AMBARI-20448. Some random status command takes more than 5 seconds to execute 
(Eugene Chekanskiy via smohanty)


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

Branch: refs/heads/trunk
Commit: 02eae2e710a95fd31718f79bdffb37535cf0b485
Parents: 75f1a29
Author: Sumit Mohanty 
Authored: Tue Mar 14 15:09:48 2017 -0700
Committer: Sumit Mohanty 
Committed: Tue Mar 14 15:09:48 2017 -0700

--
 .../src/main/python/ambari_agent/StatusCommandsExecutor.py | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/02eae2e7/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py 
b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
index 3b23f1c..eaa24c2 100644
--- a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
@@ -164,6 +164,12 @@ class 
MultiProcessStatusCommandsExecutor(StatusCommandsExecutor):
 """
 Internal method that running in separate process.
 """
+# cleanup monkey-patching results in child process, as it causing problems
+import subprocess
+reload(subprocess)
+import multiprocessing
+reload(multiprocessing)
+
 bind_debug_signal_handlers()
 self._log_message(logging.INFO, "StatusCommandsExecutor process started")

[12/50] ambari git commit: AMBARI-20243 - Include option to filter out properties from APi that returns ambari.properties file (Anita Jebaraj via jonathanhurley)

2017-03-14 Thread ncole

AMBARI-20243 - Include option to filter out properties from APi that returns 
ambari.properties file (Anita Jebaraj via jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 0471b0c373dbc775711520e20ff260b690c0
Parents: e6fc6f4
Author: Jonathan Hurley 
Authored: Fri Mar 10 16:08:14 2017 -0500
Committer: Jonathan Hurley 
Committed: Fri Mar 10 16:08:20 2017 -0500

--
 ambari-server/docs/configuration/index.md   |  1 +
 .../server/configuration/Configuration.java | 42 
 .../controller/RootServiceResponseFactory.java  |  5 +++
 .../server/configuration/ConfigurationTest.java | 11 +
 4 files changed, 59 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0471b0c3/ambari-server/docs/configuration/index.md
--
diff --git a/ambari-server/docs/configuration/index.md 
b/ambari-server/docs/configuration/index.md
index af962e1..7a7f3b9 100644
--- a/ambari-server/docs/configuration/index.md
+++ b/ambari-server/docs/configuration/index.md
@@ -162,6 +162,7 @@ The following are the properties which can be used to 
configure Ambari.
 | mpacks.staging.path | The Ambari Management Pack staging directory on the 
Ambari Server.The following are examples of valid 
values:`/var/lib/ambari-server/resources/mpacks` | | 
 | packages.pre.installed | Determines whether Ambari Agent instances have 
already have the necessary stack software installed |`false` | 
 | pam.configuration | The PAM configuration file. | | 
+| property.mask.file | The path of the file which lists the properties that 
should be masked from the api that returns ambari.properties | | 
 | proxy.allowed.hostports | A comma-separated whitelist of host and port 
values which Ambari Server can use to determine if a proxy value is valid. 
|`*:*` | 
 | recommendations.artifacts.lifetime | The amount of time that Recommendation 
API data is kept on the Ambari Server file system. This is specified using a 
`hdwmy` syntax for pairing the value with a time unit (hours, days, weeks, 
months, years)The following are examples of valid 
values:`8h``2w``1m` |`1w` | 
 | recommendations.artifacts.rollover.max | Maximum number of recommendations 
artifacts at a given timeThe following are examples of valid 
values:`50``10``100` |`100` | 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0471b0c3/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 df334c5..20431f6 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
@@ -35,6 +35,7 @@ import java.security.interfaces.RSAPublicKey;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -866,6 +867,12 @@ public class Configuration {
   @Markdown(description = "The timeout, used by the `timeout` command in 
linux, when checking mounts for free capacity.")
   public static final ConfigurationProperty CHECK_MOUNTS_TIMEOUT = new 
ConfigurationProperty<>(
   "agent.check.mounts.timeout", "0");
+  /**
+   * The path of the file which lists the properties that should be masked 
from the api that returns ambari.properties
+   */
+  @Markdown(description = "The path of the file which lists the properties 
that should be masked from the api that returns ambari.properties")
+  public static final ConfigurationProperty PROPERTY_MASK_FILE = new 
ConfigurationProperty<>(
+  "property.mask.file", null);
 
   /**
* The name of the database.
@@ -2685,6 +2692,7 @@ public class Configuration {
 
   private Properties properties;
   private Properties log4jProperties = new Properties();
+  private Set propertiesToMask = null;
   private String ambariUpgradeConfigUpdatesFilePath;
   private JsonObject hostChangesJson;
   private Map configsMap;
@@ -4067,6 +4075,9 @@ public class Configuration {
   public String getJCEName() {
 return getProperty(JCE_NAME);
   }
+  public String getAmbariBlacklistFile() {
+return getProperty(PROPERTY_MASK_FILE);
+  }
 
   public String getServerDBName() {
 return getProperty(SERVER_DB_NAME);
@@ -4330,6 +43

[15/50] ambari git commit: AMBARI-20401 - HOU wizard wrongly shows hosts with only client components at the start of 'Upgrade Hosts' group (jonathanhurley)

2017-03-14 Thread ncole

AMBARI-20401 - HOU wizard wrongly shows hosts with only client components at 
the start of 'Upgrade Hosts' group (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: fd257ec2ab0aa88f9971c7f4a330b19b6cefd751
Parents: 01ef695
Author: Jonathan Hurley 
Authored: Fri Mar 10 17:06:42 2017 -0500
Committer: Jonathan Hurley 
Committed: Fri Mar 10 20:30:21 2017 -0500

--
 .../state/stack/upgrade/HostOrderGrouping.java  | 15 --
 .../internal/UpgradeResourceProviderTest.java   | 54 
 2 files changed, 64 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fd257ec2/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
index 7734731..97864a6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
@@ -205,10 +205,6 @@ public class HostOrderGrouping extends Grouping {
   continue;
 }
 
-// build the single STOP stage
-StageWrapper stopWrapper = new StageWrapper(StageWrapper.Type.STOP, 
String.format("Stop on %s", hostName),
-stopTasks.toArray(new TaskWrapper[stopTasks.size()]));
-
 // now process the HRCs created so that we can create the appropriate
 // stage/task wrappers for the RESTARTs
 RoleGraphFactory roleGraphFactory = 
upgradeContext.getRoleGraphFactory();
@@ -267,10 +263,19 @@ public class HostOrderGrouping extends Grouping {
 structuredOut.addProperty(HOST, hostName);
 mt.structuredOut = structuredOut.toString();
 
+// build the single STOP stage, but only if there are components to
+// stop; client-only hosts have no components which need stopping
+if (!stopTasks.isEmpty()) {
+  StageWrapper stopWrapper = new StageWrapper(StageWrapper.Type.STOP,
+  String.format("Stop on %s", hostName),
+  stopTasks.toArray(new TaskWrapper[stopTasks.size()]));
+
+  wrappers.add(stopWrapper);
+}
+
 StageWrapper manualWrapper = new 
StageWrapper(StageWrapper.Type.SERVER_SIDE_ACTION, "Manual Confirmation",
 new TaskWrapper(null, null, Collections.emptySet(), mt));
 
-wrappers.add(stopWrapper);
 wrappers.add(manualWrapper);
 
 // !!! TODO install_packages for hdp and conf-select changes.  
Hopefully these will no-op.

http://git-wip-us.apache.org/repos/asf/ambari/blob/fd257ec2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
index 62e55c4..3e70989 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
@@ -1562,6 +1562,60 @@ public class UpgradeResourceProviderTest {
 assertEquals("UNKNOWN", hostComponent.getVersion());
   }
 
+  /**
+   * Ensures that stages created with an HOU are sequential and do not skip any
+   * IDs. When there are stages with IDs like (1,2,3,5,6,7,10), the request 
will
+   * get stuck in a PENDING state. This affects HOU specifically since they can
+   * potentially try to create empty stages which won't get persisted (such as 
a
+   * STOP on client-only hosts).
+   *
+   * @throws Exception
+   */
+  @Test()
+  public void testEmptyGroupingsDoNotSkipStageIds() throws Exception {
+
+StageDAO stageDao = injector.getInstance(StageDAO.class);
+Assert.assertEquals(0, stageDao.findAll().size());
+
+// strip out all non-client components - clients don't have STOP commands
+Cluster cluster = clusters.getCluster("c1");
+List schs = cluster.getServiceComponentHosts("h1");
+for (ServiceComponentHost sch : schs) {
+  if (sch.isClientComponent()) {
+continue;
+  }
+
+  cluster.removeServiceComponentHost(sch);

[11/50] ambari git commit: AMBARI-20382. Appendum - Log Search: Web UI Alert tries to use http protocol even if ssl is enabled (oleewere)

2017-03-14 Thread ncole

AMBARI-20382. Appendum - Log Search: Web UI Alert tries to use http protocol 
even if ssl is enabled (oleewere)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: e6fc6f47b9cf0eed4b7ac25b011a8aa7876cad7a
Parents: 971eaff
Author: oleewere 
Authored: Fri Mar 10 21:09:46 2017 +0100
Committer: oleewere 
Committed: Fri Mar 10 21:18:13 2017 +0100

--
 .../server/upgrade/UpgradeCatalog250.java   | 33 +
 .../server/upgrade/UpgradeCatalog250Test.java   | 38 
 2 files changed, 71 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e6fc6f47/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 b217723..e5b091b 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
@@ -180,6 +180,7 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 addNewConfigurationsFromXml();
 updateAMSConfigs();
 updateStormAlerts();
+updateLogSearchAlert();
 removeAlertDuplicates();
 updateHadoopEnvConfigs();
 updateKafkaConfigs();
@@ -337,6 +338,38 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 }
   }
 
+  protected void updateLogSearchAlert() {
+AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
+AlertDefinitionDAO alertDefinitionDAO = 
injector.getInstance(AlertDefinitionDAO.class);
+Clusters clusters = ambariManagementController.getClusters();
+
+Map clusterMap = getCheckedClusterMap(clusters);
+for (final Cluster cluster : clusterMap.values()) {
+  long clusterID = cluster.getClusterId();
+  LOG.info("Updating Log Search web ui alert definitions on cluster : " + 
cluster.getClusterName());
+
+  final AlertDefinitionEntity logSearchWebAlert = 
alertDefinitionDAO.findByName(
+clusterID, "logsearch_ui");
+
+  if (logSearchWebAlert != null) {
+LOG.info("Updating alert definition : " + 
logSearchWebAlert.getDefinitionName());
+String source = logSearchWebAlert.getSource();
+JsonObject sourceJson = new 
JsonParser().parse(source).getAsJsonObject();
+LOG.debug("Source before update : " + sourceJson);
+
+JsonObject uriJson = sourceJson.get("uri").getAsJsonObject();
+uriJson.remove("https_property");
+uriJson.remove("https_property_value");
+uriJson.addProperty("https_property", 
"{{logsearch-env/logsearch_ui_protocol}}");
+uriJson.addProperty("https_property_value", "https");
+
+LOG.debug("Source after update : " + sourceJson);
+logSearchWebAlert.setSource(sourceJson.toString());
+alertDefinitionDAO.merge(logSearchWebAlert);
+  }
+}
+  }
+
   protected void updateHostVersionTable() throws SQLException {
 LOG.info("Updating the {} table", HOST_VERSION_TABLE);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e6fc6f47/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 97832d0..67806a0 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
@@ -343,6 +343,39 @@ public class UpgradeCatalog250Test {
 easyMockSupport.verifyAll();
   }
 
+  @Test
+  public void testUpdateAlerts_LogSearchUIWebAlert() {
+EasyMockSupport easyMockSupport = new EasyMockSupport();
+final AmbariManagementController mockAmbariManagementController = 
easyMockSupport.createNiceMock(AmbariManagementController.class);
+final Clusters mockClusters = 
easyMockSupport.createStrictMock(Clusters.class);
+final Cluster mockClusterExpected = 
easyMockSupport.createNiceMock(Cluster.class);
+final AlertDefinitionDAO mockAlertDefinitionDAO = 
easyMockSupport.createNiceMock(AlertDefinitionDAO.class);
+final AlertDefinitionEntity logSearchWebUIAlertMock = 
easyMockSupport

[19/50] ambari git commit: AMBARI-20372. RU: Oozie LR job failed (dgrinenko via echekanskiy)

2017-03-14 Thread ncole

AMBARI-20372. RU: Oozie LR job failed (dgrinenko via echekanskiy)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: b13467fb470ec4c1caf64fad4a5a88f779a14b5e
Parents: ff235b4
Author: Eugene Chekanskiy 
Authored: Sun Mar 12 16:17:04 2017 +0200
Committer: Eugene Chekanskiy 
Committed: Sun Mar 12 16:17:04 2017 +0200

--
 .../YARN/configuration-mapred/mapred-site.xml   | 28 
 1 file changed, 28 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b13467fb/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
new file mode 100644
index 000..bbfdc24
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
@@ -0,0 +1,28 @@
+
+
+
+
+yarn.app.mapreduce.client.job.max-retries
+30
+
+The number of retries the client will make for getJob and 
dependent calls.
+
+
+
+
\ No newline at end of file

[33/50] ambari git commit: AMBARI-20407. When agent retries commands it needs to handle credential store processing correctly (smohanty)

2017-03-14 Thread ncole

AMBARI-20407. When agent retries commands it needs to handle credential store 
processing correctly (smohanty)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 991c35b6e9c65b1f9953472bfb78a54cd556983a
Parents: eadbd1d
Author: Sumit Mohanty 
Authored: Mon Mar 13 11:19:25 2017 -0700
Committer: Sumit Mohanty 
Committed: Mon Mar 13 11:21:57 2017 -0700

--
 ambari-agent/src/main/python/ambari_agent/ActionQueue.py   | 1 +
 .../src/main/python/ambari_agent/CustomServiceOrchestrator.py  | 6 +-
 ambari-agent/src/test/python/ambari_agent/TestActionQueue.py   | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/991c35b6/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 b1d5160..75880c6 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -316,6 +316,7 @@ class ActionQueue(threading.Thread):
 retryDuration -= delay  # allow one last attempt
 commandresult['stderr'] += "\n\nCommand failed. Retrying command 
execution ...\n\n"
 logger.info("Retrying command with taskId = {cid} after a wait of 
{delay}".format(cid=taskId, delay=delay))
+command['commandBeingRetried'] = "true"
 time.sleep(delay)
 continue
   else:

http://git-wip-us.apache.org/repos/asf/ambari/blob/991c35b6/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py 
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 8069723..7539710 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -366,7 +366,11 @@ class CustomServiceOrchestrator():
 credentialStoreEnabled = (command['credentialStoreEnabled'] == "true")
 
   if credentialStoreEnabled == True:
-self.generateJceks(command)
+if 'commandBeingRetried' not in command or 
command['commandBeingRetried'] != "true":
+  self.generateJceks(command)
+else:
+  logger.info("Skipping generation of jceks files as this is a retry 
of the command")
+
 
   json_path = self.dump_command_to_json(command, retry)
   pre_hook_tuple = self.resolve_hook_script_path(hook_dir,

http://git-wip-us.apache.org/repos/asf/ambari/blob/991c35b6/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py 
b/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py
index 67f0833..ab46f96 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py
@@ -1274,6 +1274,7 @@ class TestActionQueue(TestCase):
 }
 
 command = copy.deepcopy(self.retryable_command)
+self.assertFalse('commandBeingRetried' in command)
 with patch.object(CustomServiceOrchestrator, "runCommand") as 
runCommand_mock:
   runCommand_mock.side_effect = [execution_result_fail_dict, 
execution_result_succ_dict]
   actionQueue.execute_command(command)
@@ -1282,6 +1283,7 @@ class TestActionQueue(TestCase):
 self.assertTrue(runCommand_mock.called)
 self.assertEqual(2, runCommand_mock.call_count)
 self.assertEqual(1, sleep_mock.call_count)
+self.assertEqual(command['commandBeingRetried'], "true")
 sleep_mock.assert_any_call(2)
 
   @not_for_platform(PLATFORM_LINUX)

[01/50] ambari git commit: AMBARI-20380. RU: Slider service check failed during rolling upgrade (dlysnichenko)

2017-03-14 Thread ncole

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-12556 353cd9dfd -> eb568132b


AMBARI-20380. RU: Slider 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/389308e5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/389308e5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/389308e5

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 389308e5caafe6fcee0e3ff78b02ecad2e7d635a
Parents: aa974b0
Author: Lisnichenko Dmitro 
Authored: Fri Mar 10 12:09:07 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Fri Mar 10 12:09:43 2017 +0200

--
 .../resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 14 +++---
 .../resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 14 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/389308e5/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 da5265d..c27b634 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
@@ -403,6 +403,13 @@
   
 
 
+
+  true
+  
+SLIDER
+  
+
+
 
   UPGRADE
   true
@@ -471,13 +478,6 @@
   
 
 
-
-  true
-  
-SLIDER
-  
-
-
 
   true
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/389308e5/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
index 10ae959..cb163e4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
@@ -392,6 +392,13 @@
   
 
 
+
+  true
+  
+SLIDER
+  
+
+
 
   UPGRADE
   true
@@ -460,13 +467,6 @@
   
 
 
-
-  true
-  
-SLIDER
-  
-
-
 
   true

[32/50] ambari git commit: AMBARI-20412. Flume should support batch restart in hosts' page likeing datanode or region (zhangxiaolu via alejandro)

2017-03-14 Thread ncole

AMBARI-20412. Flume should support batch restart in hosts' page likeing 
datanode or region (zhangxiaolu via alejandro)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: eadbd1d4eaca52948748f559dd7f3d8a29430fef
Parents: 592c1a9
Author: Alejandro Fernandez 
Authored: Mon Mar 13 10:55:31 2017 -0700
Committer: Alejandro Fernandez 
Committed: Mon Mar 13 10:55:44 2017 -0700

--
 .../main/resources/common-services/FLUME/1.4.0.2.0/metainfo.xml  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eadbd1d4/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metainfo.xml
index 7fec1e2..e45e784 100644
--- 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metainfo.xml
@@ -35,6 +35,10 @@
 PYTHON
 1200
   
+  
+Flume Agents
+FLUME_HANDLER
+  
   
 
   flume_handler

[28/50] ambari git commit: AMBARI-20424. AMS should skip network stats from virtual network interfaces. (mpapirkovskyy)

2017-03-14 Thread ncole

AMBARI-20424. AMS should skip network stats from virtual network interfaces. 
(mpapirkovskyy)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: db3c09bb6f64c8ad46301b8828f62a130d56dd52
Parents: 1cffdcd
Author: Myroslav Papirkovskyi 
Authored: Mon Mar 13 18:38:49 2017 +0200
Committer: Myroslav Papirkovskyi 
Committed: Mon Mar 13 18:38:49 2017 +0200

--
 .../conf/unix/metric_monitor.ini|   2 +
 .../src/main/python/core/config_reader.py   |   7 +-
 .../src/main/python/core/host_info.py   |  41 --
 .../src/test/python/core/TestHostInfo.py| 147 ++-
 .../0.1.0/configuration/ams-env.xml |  16 ++
 .../0.1.0/package/scripts/params.py |  23 +--
 .../package/templates/metric_monitor.ini.j2 |   2 +
 7 files changed, 212 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/db3c09bb/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini 
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
index e98c65c..7fe7397 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
@@ -22,6 +22,8 @@ metrics_servers = localhost
 enable_time_threshold = false
 enable_value_threshold = false
 skip_disk_patterns =
+skip_virtual_interfaces = false
+skip_network_interfaces_patterns =
 
 [emitter]
 send_interval = 60

http://git-wip-us.apache.org/repos/asf/ambari/blob/db3c09bb/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
index 7010187..5686c50 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
@@ -22,7 +22,6 @@ import ConfigParser
 import StringIO
 import json
 import os
-import ast
 from ambari_commons import OSConst
 from ambari_commons.os_family_impl import OsFamilyImpl
 
@@ -254,3 +253,9 @@ class Configuration:
 
   def get_disk_metrics_skip_pattern(self):
 return self.get("default", "skip_disk_patterns")
+
+  def get_virtual_interfaces_skip(self):
+return self.get("default", "skip_virtual_interfaces")
+
+  def get_network_interfaces_skip_pattern(self):
+return self.get("default", "skip_network_interfaces_patterns")

http://git-wip-us.apache.org/repos/asf/ambari/blob/db3c09bb/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/host_info.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/host_info.py
 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/host_info.py
index 90f73fa..035c833 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/host_info.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/host_info.py
@@ -19,14 +19,14 @@ limitations under the License.
 '''
 
 import logging
-import psutil
+import operator
 import os
 import platform
-import time
-import threading
-import socket
-import operator
+import psutil
 import re
+import socket
+import threading
+import time
 from collections import namedtuple
 
 logger = logging.getLogger()
@@ -153,13 +153,22 @@ class HostInfo():
 
 net_stats = psutil.net_io_counters(True)
 new_net_stats = {}
+
+skip_virtual_interfaces = self.get_virtual_network_interfaces() if 
self.__config.get_virtual_interfaces_skip() == 'True' else []
+skip_network_patterns = self.__config.get_network_interfaces_skip_pattern()
+skip_network_patterns_list = skip_network_patterns.split(',') if 
skip_network_patterns and skip_network_patterns != 'None' else []
 for interface, values in net_stats.iteritems():
-  if interface != 'lo':
-new_net_stats = {'bytes_out': new_net_stats.get('bytes_out', 0) + 
values.bytes_sent,
- 'bytes_in': new_net_stats.get('bytes_in', 0) + 
values.bytes_recv,
- 'pkts_out': new_net_stats.get('pkts_out', 0) + 
values.packets_sent,
- 'pkts

[30/50] ambari git commit: AMBARI-20420. 'Link to copy' on background ops doesnt copy stderr/stdout to clipboard (alexantonenko)

2017-03-14 Thread ncole

AMBARI-20420. 'Link to copy' on background ops doesnt copy stderr/stdout to 
clipboard (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 369057a8b890cd320c0b9394f6168f9d58df5c20
Parents: 9b52ce5
Author: Alex Antonenko 
Authored: Mon Mar 13 17:09:16 2017 +0200
Committer: Alex Antonenko 
Committed: Mon Mar 13 18:56:31 2017 +0200

--
 .../templates/common/host_progress_popup.hbs|  2 +-
 .../common/host_progress_popup_body_view.js | 20 
 .../host_progress_popup_body_view_test.js   | 34 
 3 files changed, 55 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/369057a8/ambari-web/app/templates/common/host_progress_popup.hbs
--
diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs 
b/ambari-web/app/templates/common/host_progress_popup.hbs
index c9d344c..03c014c 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -276,7 +276,7 @@
 
    {{t common.open}}
 
-
+
    {{t common.copy}}
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/369057a8/ambari-web/app/views/common/host_progress_popup_body_view.js
--
diff --git a/ambari-web/app/views/common/host_progress_popup_body_view.js 
b/ambari-web/app/views/common/host_progress_popup_body_view.js
index 25be849..5cce8e7 100644
--- a/ambari-web/app/views/common/host_progress_popup_body_view.js
+++ b/ambari-web/app/views/common/host_progress_popup_body_view.js
@@ -105,6 +105,15 @@ App.HostProgressPopupBodyView = App.TableView.extend({
   hostInfoLoaded: true,
 
   /**
+   * Clipboard for task logs
+   * Used when user click "Copy" and textarea with task stderr and stdout is 
shown
+   * Should be destroyed (call `destroy`) when used is moved out from task 
logs level or when BG-ops modal is closed
+   *
+   * @type {?Clipboard}
+   */
+  taskLogsClipboard: null,
+
+  /**
* Alias for controller.hosts
*
* @type {wrappedHost[]}
@@ -933,6 +942,13 @@ App.HostProgressPopupBodyView = App.TableView.extend({
   toggleTaskLog: function (event) {
 var taskInfo = event.context;
 this.set("parentView.isLogWrapHidden", false);
+const self = this;
+var taskLogsClipboard = new Clipboard('.btn.copy-clipboard', {
+  text: function() {
+return self.get('textAreaValue');
+  }
+});
+this.set('taskLogsClipboard', taskLogsClipboard);
 if (this.get('isClipBoardActive')) {
   this.destroyClipBoard();
 }
@@ -978,6 +994,10 @@ App.HostProgressPopupBodyView = App.TableView.extend({
 var logElement = this.get('isLogComponentActive') ? 
$('.log-component-tab.active .log-tail-content'): 
$(".task-detail-log-maintext");
 logElement.css('display', 'block');
 this.set('isClipBoardActive', false);
+const taskLogsClipboard = this.get('taskLogsClipboard');
+if (taskLogsClipboard) {
+  Em.tryInvoke(taskLogsClipboard, 'destroy');
+}
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/369057a8/ambari-web/test/views/common/host_progress_popup_body_view_test.js
--
diff --git a/ambari-web/test/views/common/host_progress_popup_body_view_test.js 
b/ambari-web/test/views/common/host_progress_popup_body_view_test.js
index 370f75a..5ccc024 100644
--- a/ambari-web/test/views/common/host_progress_popup_body_view_test.js
+++ b/ambari-web/test/views/common/host_progress_popup_body_view_test.js
@@ -24,6 +24,7 @@ describe('App.HostProgressPopupBodyView', function () {
   beforeEach(function () {
 view = App.HostProgressPopupBodyView.create({
   controller: Em.Object.create({
+setSelectCount: Em.K,
 dataSourceController: Em.Object.create({}),
 setBackgroundOperationHeader: Em.K,
 hosts: []
@@ -303,4 +304,37 @@ describe('App.HostProgressPopupBodyView', function () {
   expect(view.rerender.calledOnce).to.be.true;
 });
   });
+
+  describe('#toggleTaskLog', function () {
+
+var task = {};
+
+beforeEach(function() {
+  view.toggleTaskLog({context: task});
+});
+
+it('clipboard created', function () {
+  expect(view.get('taskLogsClipboard')).to.be.instanceOf(Clipboard);
+});
+
+  });
+
+  describe('#destroyClipBoard', function () {
+
+beforeEach(function () {
+  v

[24/50] ambari git commit: AMBARI-20419. Add a property to enable Status commands on separate process (non-default) (aonishuk)

2017-03-14 Thread ncole

AMBARI-20419. Add a property to enable Status commands on separate process 
(non-default) (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 938fed1f3b2b96ae8da174f9bd2133ca064197af
Parents: 73a8633
Author: Andrew Onishuk 
Authored: Mon Mar 13 16:32:30 2017 +0200
Committer: Andrew Onishuk 
Committed: Mon Mar 13 16:32:30 2017 +0200

--
 .../src/main/python/ambari_agent/ActionQueue.py | 16 ++---
 .../main/python/ambari_agent/AmbariConfig.py|  3 +
 .../src/main/python/ambari_agent/Controller.py  |  7 +-
 .../ambari_agent/StatusCommandsExecutor.py  | 75 +---
 .../test/python/ambari_agent/TestActionQueue.py |  4 +-
 5 files changed, 83 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/938fed1f/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 15ae03d..b1d5160 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -146,7 +146,7 @@ class ActionQueue(threading.Thread):
 try:
   while not self.stopped():
 self.processBackgroundQueueSafeEmpty()
-self.process_status_command_results()
+self.controller.get_status_commands_executor().process_results() # 
process status commands
 try:
   if self.parallel_execution == 0:
 command = self.commandQueue.get(True, 
self.EXECUTION_COMMAND_WAIT_TIME)
@@ -190,14 +190,6 @@ class ActionQueue(threading.Thread):
   except Queue.Empty:
 pass
 
-  def process_status_command_results(self):
-self.controller.statusCommandsExecutor.process_logs()
-for result in self.controller.statusCommandsExecutor.get_results():
-  try:
-self.process_status_command_result(result)
-  except UnicodeDecodeError:
-pass
-
   def createCommandHandle(self, command):
 if command.has_key('__handle'):
   raise AgentException("Command already has __handle")
@@ -503,6 +495,12 @@ class ActionQueue(threading.Thread):
 
 self.commandStatuses.put_command_status(handle.command, roleResult)
 
+  def execute_status_command_and_security_status(self, command):
+component_status_result = 
self.customServiceOrchestrator.requestComponentStatus(command)
+component_security_status_result = 
self.customServiceOrchestrator.requestComponentSecurityState(command)
+
+return command, component_status_result, component_security_status_result
+
   def process_status_command_result(self, result):
 '''
 Executes commands of type STATUS_COMMAND

http://git-wip-us.apache.org/repos/asf/ambari/blob/938fed1f/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py 
b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
index 64c2643..1965dc2 100644
--- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
+++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
@@ -304,6 +304,9 @@ class AmbariConfig:
 self.set('agent', self.ULIMIT_OPEN_FILES_KEY, value)
 
 
+  def get_multiprocess_status_commands_executor_enabled(self):
+return bool(int(self.get('agent', 
'multiprocess_status_commands_executor_enabled', 1)))
+
   def update_configuration_from_registration(self, reg_resp):
 if reg_resp and AmbariConfig.AMBARI_PROPERTIES_CATEGORY in reg_resp:
   if not self.has_section(AmbariConfig.AMBARI_PROPERTIES_CATEGORY):

http://git-wip-us.apache.org/repos/asf/ambari/blob/938fed1f/ambari-agent/src/main/python/ambari_agent/Controller.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/Controller.py 
b/ambari-agent/src/main/python/ambari_agent/Controller.py
index c1a5f1b..29a11aa 100644
--- a/ambari-agent/src/main/python/ambari_agent/Controller.py
+++ b/ambari-agent/src/main/python/ambari_agent/Controller.py
@@ -48,7 +48,7 @@ from ambari_agent.ClusterConfiguration import  
ClusterConfiguration
 from ambari_agent.RecoveryManager import  RecoveryManager
 from ambari_agent.HeartbeatHandlers import HeartbeatStopHandlers, 
bind_signal_handlers
 from ambari_agent.ExitHelper import ExitHelper
-from ambari_agent.StatusCommandsExecutor import StatusCommandsExecutor
+from ambari_agent.StatusCommandsExecutor import 
MultiProcessSt

[37/50] ambari git commit: AMBARI-20431. ADDENDUM. Increase the calculated AM size for llap.

2017-03-14 Thread ncole

AMBARI-20431. ADDENDUM. Increase the calculated AM size for llap.


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 72b3084834e03e883079c4253b6d27653603156e
Parents: f92e8c9
Author: Swapan Shridhar 
Authored: Mon Mar 13 16:39:47 2017 -0700
Committer: Swapan Shridhar 
Committed: Mon Mar 13 16:39:47 2017 -0700

--
 .../common-services/YARN/3.0.0.3.0/service_advisor.py| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/72b30848/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
index 3d77a26..4fdf84f 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py
@@ -1451,10 +1451,10 @@ 
yarn.scheduler.capacity.root.{0}.maximum-am-resource-percent=1""".format(llap_qu
 if is_cluster_create_opr or enable_hive_interactive_1st_invocation:
   if total_cluster_capacity <= 4096:
 calculated_tez_am_resource_memory_mb = 256
-  elif total_cluster_capacity > 4096 and total_cluster_capacity <= 73728:
-calculated_tez_am_resource_memory_mb = 512
-  elif total_cluster_capacity > 73728:
-calculated_tez_am_resource_memory_mb = 1536
+  elif total_cluster_capacity > 4096 and total_cluster_capacity <= 98304:
+calculated_tez_am_resource_memory_mb = 1024
+  elif total_cluster_capacity > 98304:
+calculated_tez_am_resource_memory_mb = 4096
 
   Logger.info("DBG: Calculated and returning 'tez_am_resource_memory_mb' 
as : {0}".format(calculated_tez_am_resource_memory_mb))
   return float(calculated_tez_am_resource_memory_mb)

[44/50] ambari git commit: AMBARI-20416. Need some way to know a plan is vectorized (pallavkul)

2017-03-14 Thread ncole

AMBARI-20416. Need some way to know a plan is vectorized (pallavkul)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 87e82c7c0dfa2c26560a1bdbc743b360eb787a3a
Parents: c3b5615
Author: pallavkul 
Authored: Tue Mar 14 17:16:14 2017 +0530
Committer: pallavkul 
Committed: Tue Mar 14 17:16:14 2017 +0530

--
 .../main/resources/ui/app/components/visual-explain.js| 10 +-
 .../hive20/src/main/resources/ui/app/routes/databases.js  |  4 +++-
 .../resources/ui/app/routes/databases/database/tables.js  |  4 +++-
 .../ui/app/templates/components/visual-explain-detail.hbs |  3 +++
 .../ui/app/templates/components/visual-explain.hbs|  2 +-
 .../resources/ui/app/utils/hive-explainer/renderer.js |  5 -
 .../resources/ui/app/utils/hive-explainer/transformer.js  |  1 +
 7 files changed, 24 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/87e82c7c/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
index fd450cc..10ff616 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
@@ -29,6 +29,8 @@ export default Ember.Component.extend({
 
   explainDetailData: '',
 
+  vectorizedInfo: null,
+
   draggable: Ember.Object.create(),
 
   visualExplainInput: Ember.computed('visualExplainJson', function () {
@@ -39,8 +41,13 @@ export default Ember.Component.extend({
 
   didInsertElement() {
 this._super(...arguments);
-const onRequestDetail = data => this.set('explainDetailData', 
JSON.stringify( data, null, '  ') );
 const explainData = JSON.parse(this.get('visualExplainInput'));
+const onRequestDetail = (data, vectorized) => {
+  this.set('explainDetailData', JSON.stringify( data, null, '  ') );
+  console.log('vectorizedInfo', vectorized['Execution mode:']);
+  this.set('vectorizedInfo', vectorized['Execution mode:']);
+};
+
 // if(explainData) {
   explain(explainData, '#explain-container', onRequestDetail, 
this.get('draggable'));
 // }
@@ -68,6 +75,7 @@ export default Ember.Component.extend({
 closeModal(){
   this.set('showDetailsModal', false);
   this.set('explainDetailData', '');
+  this.set('vectorizedInfo', '');
   return false;
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/87e82c7c/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 02dbcac..185be01 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
@@ -34,7 +34,9 @@ export default Ember.Route.extend(UILoggerMixin, {
   },
 
   deactivate() {
-this.get('autoRefresh').stopDatabasesAutoRefresh();
+if(ENV.APP.SHOULD_AUTO_REFRESH_DATABASES) {
+  this.get('autoRefresh').stopDatabasesAutoRefresh();
+}
   },
 
   _databasesRefreshed() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/87e82c7c/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 f5940e3..0e9042e 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
@@ -32,7 +32,9 @@ export default Ember.Route.extend(UILoggerMixin, {
   },
 
   deactivate() {
-
this.get('autoRefresh').stopTablesAutoRefresh(this.controller.get('database.name'));
+if(ENV.APP.SHOULD_AUTO_REFRESH_TABLES) {
+  
this.get('autoRefresh').stopTablesAutoRefresh(this.controller.get('database.name'));
+}
   },
 
   tableRefreshStarting(databaseName) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/87e82c7c/contrib/views/hive20/src/main/resources/ui/app/templates/components/visual-explain-detail.hbs
---

[17/50] ambari git commit: AMBARI-20396. Few Ambari Metrics configs don't have property_value_attributes.type (Dmitry Sen via smohanty)

2017-03-14 Thread ncole

AMBARI-20396. Few Ambari Metrics configs don't have 
property_value_attributes.type (Dmitry Sen via smohanty)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 1cb3da802d6407ac6a5218662b7218367a2a91d2
Parents: ebd1382
Author: Sumit Mohanty 
Authored: Sat Mar 11 08:47:36 2017 -0800
Committer: Sumit Mohanty 
Committed: Sat Mar 11 08:48:06 2017 -0800

--
 .../AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml   | 3 +++
 .../AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml   | 9 +
 2 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1cb3da80/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
index 9543bbe..cac39de 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-client.xml
@@ -34,6 +34,9 @@
 bigdata
 PASSWORD
 Password to open the trust store file.
+
+  password
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/1cb3da80/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
index 9805619..4c21ab7 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-ssl-server.xml
@@ -34,6 +34,9 @@
 bigdata
 PASSWORD
 Password to open the trust store file.
+
+  password
+
 
   
   
@@ -63,6 +66,9 @@
 bigdata
 PASSWORD
 Password to open the keystore file.
+
+  password
+
 
   
   
@@ -70,6 +76,9 @@
 bigdata
 PASSWORD
 Password for private key in keystore file.
+
+  password
+

[40/50] ambari git commit: AMBARI-20418 : fixed : Hive View link in service page points to v1.5 auto instance(Venkata Sairam via nitirajrathore)

2017-03-14 Thread ncole

AMBARI-20418 : fixed : Hive View link in service page points to v1.5 auto 
instance(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/efd3b584
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/efd3b584
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/efd3b584

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: efd3b5847fbfec1ba38cdfa52ffb70e80d385a21
Parents: 9c7b290
Author: Nitiraj Singh Rathore 
Authored: Tue Mar 14 11:44:10 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Tue Mar 14 11:44:10 2017 +0530

--
 ambari-web/app/views/main/service/services/hive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/efd3b584/ambari-web/app/views/main/service/services/hive.js
--
diff --git a/ambari-web/app/views/main/service/services/hive.js 
b/ambari-web/app/views/main/service/services/hive.js
index c8c341c..32e97f3 100644
--- a/ambari-web/app/views/main/service/services/hive.js
+++ b/ambari-web/app/views/main/service/services/hive.js
@@ -23,7 +23,7 @@ App.MainDashboardServiceHiveView = 
App.MainDashboardServiceView.extend({
   serviceName: 'HIVE',
 
   viewsToShow: {
-  'AUTO_HIVE_INSTANCE': {},
+  'AUTO_HIVE20_INSTANCE': {},
   'TEZ_CLUSTER_INSTANCE': {
 overwriteLabel: 'app.debugHiveQuery'
   }},

[27/50] ambari git commit: AMBARI-20422. python UT fail (aonishuk)

2017-03-14 Thread ncole

AMBARI-20422. python UT fail (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 1cffdcdce072a23303c56fb3c830a04ab386441f
Parents: 0c010b3
Author: Andrew Onishuk 
Authored: Mon Mar 13 17:31:02 2017 +0200
Committer: Andrew Onishuk 
Committed: Mon Mar 13 17:31:02 2017 +0200

--
 .../src/test/python/stacks/2.5/HIVE/test_hive_server_int.py| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1cffdcdc/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py 
b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
index d76ffaa..3dc78ab 100644
--- a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
+++ b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
@@ -517,6 +517,8 @@ class TestHiveServerInteractive(RMFTestCase):
 # from there.
 hive_site_conf_for_client = hive_site_conf.copy()
 del hive_site_conf_for_client['javax.jdo.option.ConnectionPassword']
+if 'hadoop.security.credential.provider.path' in hive_site_conf_for_client:
+  del hive_site_conf_for_client['hadoop.security.credential.provider.path']
 
 for conf_dir in hive_conf_dirs_list:
 # if 'conf_dir' is '/usr/hdp/current/hive-server2-hive2/conf', we 
don't expect 'javax.jdo.option.ConnectionPassword' config

[23/50] ambari git commit: AMBARI-20411. Export workflow will create a workflow with workflow name (Venkata Sairam via pallavkul)

2017-03-14 Thread ncole

AMBARI-20411. Export workflow will create a workflow with workflow name 
(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/73a8633d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73a8633d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73a8633d

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 73a8633db300c352228c363364b7795d3ad47543
Parents: 8f579c1
Author: pallavkul 
Authored: Mon Mar 13 18:37:32 2017 +0530
Committer: pallavkul 
Committed: Mon Mar 13 18:38:23 2017 +0530

--
 .../src/main/resources/ui/app/components/flow-designer.js | 10 +++---
 .../wfmanager/src/main/resources/ui/app/styles/app.less   |  9 +
 .../ui/app/templates/components/designer-workspace.hbs|  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/73a8633d/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 f542c07..5f885e7 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
@@ -222,10 +222,14 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 });
   },
   workflowXmlDownload(workflowXml){
-  var link = document.createElement("a");
+let link = document.createElement("a"), val = this.get('workflow.name');
+if(Ember.isBlank(val)) {
   link.download = "workflow.xml";
-  link.href = 
"data:text/xml,"+encodeURIComponent(vkbeautify.xml(workflowXml));
-  link.click();
+} else {
+  link.download = val.replace(/\s/g, '_');
+}
+link.href = 
"data:text/xml,"+encodeURIComponent(vkbeautify.xml(workflowXml));
+link.click();
   },
   nodeRendered: function(){
 if (this.get("isNew")){

http://git-wip-us.apache.org/repos/asf/ambari/blob/73a8633d/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
--
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less 
b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
index 5577239..0d96af4 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
@@ -1765,4 +1765,13 @@ input:invalid {
 #projectsDeleteConfirmation .modal-body {
max-height: 70vh;
overflow: auto;
+ }
+.tab-name {
+  display: inline-block;
+  max-width: 100px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  top: 5px;
+  position: relative;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/73a8633d/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
index c190511..3fb644a 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
@@ -125,7 +125,7 @@
   {{else}}
   
   {{/if}}
-  {{tab.name}}
+  {{tab.name}}
   x

[22/50] ambari git commit: AMBARI-20383. Not able to view the error log details on UI. (Padma Priya via dipayanb)

2017-03-14 Thread ncole

AMBARI-20383. Not able to view the error log details on UI. (Padma Priya via 
dipayanb)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 8f579c122876d00ebad034a2cc12ccfa5daa8869
Parents: 3d4a836
Author: Dipayan Bhowmick 
Authored: Mon Mar 13 18:27:56 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Mon Mar 13 18:29:17 2017 +0530

--
 .../src/main/resources/ui/app/validators/workflow-dag.js | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f579c12/contrib/views/wfmanager/src/main/resources/ui/app/validators/workflow-dag.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/validators/workflow-dag.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/validators/workflow-dag.js
index 18da25b..2a419eb 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/validators/workflow-dag.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/validators/workflow-dag.js
@@ -14,20 +14,19 @@
 *See the License for the specific language governing permissions and
 *limitations under the License.
 */
-import Ember from 'ember';
 import BaseValidator from 'ember-cp-validations/validators/base';
 
-const DuplicateDataNodeName = BaseValidator.extend({
+const WorkflowDag = BaseValidator.extend({
   validate(value, options, model, attribute) {
-if (model.get('dataNodes')) {
+if (model.get('dataNodes') && model.get('dataNodes').length) {
   if(!model.get('flowRenderer').isWorkflowValid()){
-return "Invalid workflow structure. There is no flow to end node."
+return "Invalid workflow structure. There is no flow to end node.";
   }
 }
   }
 });
 
-DuplicateDataNodeName.reopenClass({
+WorkflowDag.reopenClass({
   /**
* Define attribute specific dependent keys for your validator
*
@@ -40,4 +39,4 @@ DuplicateDataNodeName.reopenClass({
   }
 });
 
-export default DuplicateDataNodeName;
+export default WorkflowDag;

[45/50] ambari git commit: AMBARI-20428 UI - bugs with styles. (atkach)

2017-03-14 Thread ncole

AMBARI-20428 UI - bugs with styles. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 0c76e2f837dcc02b72cf76e08583dbd09c2cbd6e
Parents: 87e82c7
Author: Andrii Tkach 
Authored: Tue Mar 14 15:43:17 2017 +0200
Committer: Andrii Tkach 
Committed: Tue Mar 14 15:43:35 2017 +0200

--
 .../src/main/resources/ui/admin-web/app/styles/main.css| 5 +
 .../resources/ui/admin-web/app/views/stackVersions/list.html   | 2 +-
 .../src/main/resources/ui/hive-web/app/styles/app.scss | 6 ++
 .../src/main/resources/ui/hive-web/app/templates/splash.hbs| 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c76e2f8/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css 
b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
index 95aa66b..882a4b4 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
@@ -1872,4 +1872,9 @@ legend {
 .spinner-container {
   text-align: center;
   padding-bottom: 10px;
+}
+
+.ellipsis-overflow {
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c76e2f8/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
index 120aed6..58326aa 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
@@ -72,7 +72,7 @@
   
 {{repo.repository_version}}
   
-  
+  
 
   {{repo.cluster}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c76e2f8/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss
--
diff --git 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss
index 7598b0e..2fec04b 100644
--- a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss
+++ b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss
@@ -714,3 +714,9 @@ pre.explainprint{
   color:#ddd;
   cursor: default;
 }
+
+#splash {
+  .table i {
+cursor: default;
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c76e2f8/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
--
diff --git 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
index 5612542..b6c59f3 100644
--- 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
+++ 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
@@ -17,7 +17,7 @@
 }}
 
 
-
+
   {{#if allTestsCompleted }}
 Service checks completed.
   {{else}}

[48/50] ambari git commit: AMBARI-20442. Knox proxy - Navigating to Hive view from Hive Summary page is not working (Go to view link) (alexantonenko)

2017-03-14 Thread ncole

AMBARI-20442. Knox proxy - Navigating to Hive view from Hive Summary page is 
not working (Go to view link) (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 1fc41441f16a40950af9cc0530bb416ac6519ab7
Parents: ece203b
Author: Alex Antonenko 
Authored: Tue Mar 14 14:43:58 2017 +0200
Committer: Alex Antonenko 
Committed: Tue Mar 14 17:36:48 2017 +0200

--
 ambari-web/app/assets/test/tests.js |  1 +
 .../controllers/main/service/info/summary.js|  2 +-
 .../app/controllers/main/views_controller.js| 32 
 ambari-web/app/models.js|  1 +
 ambari-web/app/models/view_instance.js  | 81 
 .../templates/main/service/services/hive.hbs|  2 +-
 .../app/views/main/service/services/hive.js | 14 ++--
 .../controllers/main/views_controller_test.js   | 38 ++---
 ambari-web/test/models/view_instance_test.js| 59 ++
 9 files changed, 193 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1fc41441/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js 
b/ambari-web/app/assets/test/tests.js
index ab007f0..8fadb44 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -418,6 +418,7 @@ var files = [
   'test/models/stack_test',
   'test/models/stack_service_test',
   'test/models/user_test',
+  'test/models/view_instance_test',
   'test/models/widget_test',
   'test/models/widget_property_test',
   'test/models/host_stack_version_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/1fc41441/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 15f3861..1554c61 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -856,7 +856,7 @@ App.MainServiceInfoSummaryController = 
Em.Controller.extend(App.WidgetSectionMix
   },
 
   goToView: function(event) {
-App.router.route('main' + event.context.href);
+App.router.route(event.context.get('internalAmbariUrl'));
   }
 
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/1fc41441/ambari-web/app/controllers/main/views_controller.js
--
diff --git a/ambari-web/app/controllers/main/views_controller.js 
b/ambari-web/app/controllers/main/views_controller.js
index eb5775d..398cdd8 100644
--- a/ambari-web/app/controllers/main/views_controller.js
+++ b/ambari-web/app/controllers/main/views_controller.js
@@ -80,19 +80,20 @@ App.MainViewsController = Em.Controller.extend({
 data.items.forEach(function (view) {
   view.versions.forEach(function (version) {
 version.instances.forEach(function (instance) {
-  var current_instance = Em.Object.create({
-iconPath: instance.ViewInstanceInfo.icon_path || 
"/img/ambari-view-default.png",
-label: instance.ViewInstanceInfo.label || 
version.ViewVersionInfo.label || instance.ViewInstanceInfo.view_name,
-visible: instance.ViewInstanceInfo.visible || false,
-version: instance.ViewInstanceInfo.version,
-description: instance.ViewInstanceInfo.description || 
Em.I18n.t('views.main.instance.noDescription'),
-viewName: instance.ViewInstanceInfo.view_name,
-shortUrl:instance.ViewInstanceInfo.short_url,
-instanceName: instance.ViewInstanceInfo.instance_name,
-href: instance.ViewInstanceInfo.context_path + "/"
+  var info = instance.ViewInstanceInfo;
+  var currentInstance = App.ViewInstance.create({
+iconPath: info.icon_path || '/img/ambari-view-default.png',
+label: info.label || version.ViewVersionInfo.label || 
info.view_name,
+visible: info.visible || false,
+version: info.version,
+description: info.description || 
Em.I18n.t('views.main.instance.noDescription'),
+viewName: info.view_name,
+shortUrl:info.short_url,
+instanceName: info.instance_name,
+href: info.context_path + '/'
   });
-  if (current_instance.visible) {
-instances.push(current_instance);
+  if (currentInstance.visible) {
+

[29/50] ambari git commit: AMBARI-20421. Users->admin page: Failure in Updating admin settings is not shown (alexantonenko)

2017-03-14 Thread ncole

AMBARI-20421. Users->admin page: Failure in Updating admin settings is not 
shown (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 9b52ce58270eeda1021bf515a91898ade1920477
Parents: db3c09b
Author: Alex Antonenko 
Authored: Mon Mar 13 17:07:37 2017 +0200
Committer: Alex Antonenko 
Committed: Mon Mar 13 18:56:31 2017 +0200

--
 .../app/scripts/controllers/users/UsersShowCtrl.js| 10 +-
 .../resources/ui/admin-web/app/scripts/i18n.config.js |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b52ce58/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
index 3839876..dcb7418 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
@@ -146,7 +146,11 @@ angular.module('ambariAdminConsole')
   status: newStatus
 })
   ).then(function() {
-User.setActive($scope.user.user_name, $scope.user.active);
+User.setActive($scope.user.user_name, $scope.user.active)
+  .catch(function(data) {
+Alert.error($t('common.alerts.cannotUpdateStatus'), 
data.data.message);
+$scope.user.active = !$scope.user.active;
+  });
   })
   .catch(function() {
 $scope.user.active = !$scope.user.active;
@@ -166,6 +170,10 @@ angular.module('ambariAdminConsole')
 User.setAdmin($scope.user.user_name, $scope.user.admin)
 .then(function() {
   loadPrivileges();
+})
+.catch(function (data) {
+  Alert.error($t('common.alerts.cannotUpdateAdminStatus'), 
data.data.message);
+  $scope.user.admin = !$scope.user.admin;
 });
   })
   .catch(function() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b52ce58/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index c30f134..61420c0 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -158,7 +158,9 @@ angular.module('ambariAdminConsole')
 'onlyText': 'Only lowercase alphanumeric characters are allowed.',
 'onlyAnScore': 'Invalid input, only alphanumerics allowed eg: 
My_default_view',
 'passwordRequired':'Password Required',
-'unsavedChanges': 'You have unsaved changes. Save changes or discard?'
+'unsavedChanges': 'You have unsaved changes. Save changes or discard?',
+'cannotUpdateStatus': 'Cannot update User status',
+'cannotUpdateAdminStatus': 'Cannot update User Admin status'
   }
 },

[36/50] ambari git commit: AMBARI-20431. Increase the calculated AM size for llap (sseth via smohanty)

2017-03-14 Thread ncole

AMBARI-20431. Increase the calculated AM size for llap (sseth via smohanty)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: f92e8c916fe1850487a5969f7c1b97ea7eaf9c64
Parents: 19c9e25
Author: Sumit Mohanty 
Authored: Mon Mar 13 16:10:48 2017 -0700
Committer: Sumit Mohanty 
Committed: Mon Mar 13 16:24:28 2017 -0700

--
 .../stacks/HDP/2.5/services/stack_advisor.py  |  8 
 .../python/stacks/2.5/common/test_stack_advisor.py| 14 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f92e8c91/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index a9fd567..13151eb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -1471,10 +1471,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 if is_cluster_create_opr or enable_hive_interactive_1st_invocation:
   if total_cluster_capacity <= 4096:
 calculated_tez_am_resource_memory_mb = 256
-  elif total_cluster_capacity > 4096 and total_cluster_capacity <= 73728:
-calculated_tez_am_resource_memory_mb = 512
-  elif total_cluster_capacity > 73728:
-calculated_tez_am_resource_memory_mb = 1536
+  elif total_cluster_capacity > 4096 and total_cluster_capacity <= 98304:
+calculated_tez_am_resource_memory_mb = 1024
+  elif total_cluster_capacity > 98304:
+calculated_tez_am_resource_memory_mb = 4096
 
   Logger.info("DBG: Calculated and returning 'tez_am_resource_memory_mb' 
as : {0}".format(calculated_tez_am_resource_memory_mb))
   return float(calculated_tez_am_resource_memory_mb)

http://git-wip-us.apache.org/repos/asf/ambari/blob/f92e8c91/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index 80d70db..693b067 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -2007,12 +2007,12 @@ class TestHDP25StackAdvisor(TestCase):
 self.assertTrue('num_llap_nodes' not in 
configurations['hive-interactive-env']['properties'])
 
 
self.assertTrue(configurations['hive-interactive-env']['properties']['num_llap_nodes_for_llap_daemons'],
 3)
-
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
 '11253')
+
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'],
 '10571')
 
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'],
 '3')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'],
 '3')
 
-
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
 '2037')
+
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'],
 '1355')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'],
 'true')
 
 
self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'],
 '7372')
@@ -2023,7 +2023,7 @@ class TestHDP25StackAdvisor(TestCase):
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'],
 'llap')
 
self.assertEqual(configurations['hive-interactive-site']['properties']['hive.auto.convert.join.noconditionaltask.size'],
 '858783744')
 
-
self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
 '682')
+
self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'],
 '1364')
 
self.assertEquals(configurations['hive-interactive-site']['property_attributes']['hive.llap.daemon.queue.name'],
 {'entries': [{'value': 'default', 'label': 'default'}, {'value': 'llap', 
'label': 'llap'}]})
 
 
@@ -2815,12 +2815,12 @@ class TestHDP25StackAdvisor(TestCase):
 self.assertTrue('num_llap_

[34/50] ambari git commit: AMBARI-20426. Hive Server interactive not removed from Hive summary page after HSI is disabled. (Vivek Subramanian via yusaku)

2017-03-14 Thread ncole

AMBARI-20426. Hive Server interactive not removed from Hive summary page after 
HSI is disabled. (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/9446252f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9446252f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9446252f

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 9446252fa2324e74d594febd913a7e4e056f7644
Parents: 991c35b
Author: Yusaku Sako 
Authored: Mon Mar 13 14:06:59 2017 -0700
Committer: Yusaku Sako 
Committed: Mon Mar 13 14:06:59 2017 -0700

--
 .../mixins/main/service/configs/component_actions_by_configs.js| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9446252f/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
--
diff --git 
a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js 
b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index 6106f58..140e7de 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -211,7 +211,7 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
 name: 'common.batch.request_schedules',
 sender: this,
 data: {
-  intervalTimeSeconds: 1,
+  intervalTimeSeconds: 60,
   tolerateSize: 0,
   batches: batches
 }

[49/50] ambari git commit: AMBARI-20446 Clock widget is not displayed. (ababiichuk)

2017-03-14 Thread ncole

AMBARI-20446 Clock widget is not displayed. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 75f1a29e6c99cdbaf39a9e6afa6ba97fc81b1209
Parents: 1fc4144
Author: ababiichuk 
Authored: Tue Mar 14 18:49:01 2017 +0200
Committer: ababiichuk 
Committed: Tue Mar 14 18:49:01 2017 +0200

--
 ambari-web/app/styles/application.less | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/75f1a29e/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 151e404..2112c51 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -69,16 +69,6 @@ ul.typeahead.dropdown-menu {
   overflow: visible;
   padding-bottom: @footer-height;
   min-width: 980px;
-
-   .clock-view {
- top: 10px;
- left: 4px;
- position: fixed;
- color: red;
- font-weight: bold;
- padding: 4px;
- background-color: rgba(0, 0, 0, 0.6);
-  }
 }
 
 footer {
@@ -2661,3 +2651,13 @@ a.abort-icon:hover {
 text-transform: none;
   }
 }
+
+.clock-view {
+  bottom: 10px;
+  right: 4px;
+  position: fixed;
+  color: red;
+  font-weight: bold;
+  padding: 4px;
+  background-color: rgba(0, 0, 0, 0.6);
+}

[16/50] ambari git commit: AMBARI-20399. Unable to enable Credential store support on upgraded clusters (Madhuvanthi Radhakrishnan via smohanty)

2017-03-14 Thread ncole

AMBARI-20399. Unable to enable Credential store support on upgraded clusters 
(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/ebd13828
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ebd13828
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ebd13828

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: ebd13828f5057f8ac3813e61d6a22d706e331887
Parents: fd257ec
Author: Sumit Mohanty 
Authored: Fri Mar 10 17:31:41 2017 -0800
Committer: Sumit Mohanty 
Committed: Fri Mar 10 17:32:14 2017 -0800

--
 .../upgrade/StackUpgradeFinishListener.java | 14 +
 .../org/apache/ambari/server/state/Service.java |  7 +
 .../apache/ambari/server/state/ServiceImpl.java | 33 ++--
 .../package/scripts/hive_interactive.py |  3 +-
 .../upgrade/StackUpgradeFinishListenerTest.java |  1 +
 5 files changed, 48 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ebd13828/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
index b1bffef..1b3d05b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
@@ -66,18 +66,20 @@ public class StackUpgradeFinishListener {
 
 Cluster cluster = event.getCluster();
 
-//update component info due to new stack
 for (Service service : cluster.getServices().values()) {
-  for (ServiceComponent sc : service.getServiceComponents().values()) {
-try {
+  try {
+//update service info due to new stack
+service.updateServiceInfo();
+//update component info due to new stack
+for (ServiceComponent sc : service.getServiceComponents().values()) {
   sc.updateComponentInfo();
-} catch (AmbariException e) {
+}
+  } catch (AmbariException e) {
   if (LOG.isErrorEnabled()) {
 LOG.error("Caught AmbariException when update component info", e);
   }
 }
   }
 }
-  }
 
-}
+  }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebd13828/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
index 70efeb5..5964e33 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
@@ -103,6 +103,13 @@ public interface Service {
   MaintenanceState getMaintenanceState();
 
   /**
+   * Refresh Service info due to current stack
+   * @throws AmbariException
+   */
+  void updateServiceInfo() throws AmbariException;
+
+
+  /**
* Get a true or false value specifying
* whether credential store is supported by this service.
* @return true or false

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebd13828/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
index 31c53d8..9caff6a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
@@ -27,6 +27,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.ObjectNotFoundException;
 import org.apache.ambari.server.ServiceComponentNotFoundException;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.controller.ServiceResponse;
@@ -67,9 +68,10 @@ public class ServiceImpl implements Service {
 
   private final Cluster cluster;
   private final ConcurrentMap components = new 
ConcurrentHashMap<>();
-  private final boolean isClientOnlyService;
-  private final boolean isCredentialStoreSupported;
-  private final boolean isCredentialStoreRequired;
+  private boolean isClientOnlyService;
+  pri

[38/50] ambari git commit: AMBARI-20432. ambari-web shows redundant configuration for "Number of nodes used by Hive's LLAP". (jaimin)

2017-03-14 Thread ncole

AMBARI-20432. ambari-web shows redundant configuration for "Number of nodes 
used by Hive's LLAP". (jaimin)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 785d7dac9f4cf685eeba0ee4447da9f50ebbc0d1
Parents: 72b3084
Author: Jaimin Jetly 
Authored: Mon Mar 13 17:52:44 2017 -0700
Committer: Jaimin Jetly 
Committed: Mon Mar 13 17:53:04 2017 -0700

--
 .../mixins/common/configs/widgets/unique/num_llap_nodes.js   | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/785d7dac/ambari-web/app/mixins/common/configs/widgets/unique/num_llap_nodes.js
--
diff --git 
a/ambari-web/app/mixins/common/configs/widgets/unique/num_llap_nodes.js 
b/ambari-web/app/mixins/common/configs/widgets/unique/num_llap_nodes.js
index 781a40a..e3e7efe 100644
--- a/ambari-web/app/mixins/common/configs/widgets/unique/num_llap_nodes.js
+++ b/ambari-web/app/mixins/common/configs/widgets/unique/num_llap_nodes.js
@@ -35,6 +35,10 @@ App.NumLlapNodesWidgetMixin = Em.Mixin.create({
* @type {boolean}
*/
   doNotShowWidget: function () {
+var self = this;
+Em.run.next(function () {
+  self.handleReadOnlyAttribute();
+});
 if (this.get('readOnly')) {
   return false;
 }
@@ -42,12 +46,12 @@ App.NumLlapNodesWidgetMixin = Em.Mixin.create({
   }.property('isPropertyUndefined', 'config.showAsTextBox', 'readOnly'),
 
   handleReadOnlyAttribute: function () {
-var readOnly = this.get('readOnly');
+var readOnly = this.get('readOnly') || false;
 this.set('disabled', readOnly);
 this.set('supportSwitchToTextBox', !readOnly);
 var action = readOnly ? 'disable' : 'enable';
 this.toggleSlider(action);
-  }.observes('readOnly'),
+  },
 
   toggleWidgetView: function() {
 this._super();

[39/50] ambari git commit: AMBARI-20370 : tez view version and build removed and short url of auto instance used for property tez.tez-ui.history-url.base in tez-site (nitirajrathore)

2017-03-14 Thread ncole

AMBARI-20370 : tez view version and build removed and short url of auto 
instance used for property tez.tez-ui.history-url.base in tez-site 
(nitirajrathore)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 9c7b290dd89aa6ea95ce47496f56f21a9fb40231
Parents: 785d7da
Author: Nitiraj Singh Rathore 
Authored: Tue Mar 14 07:26:20 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Tue Mar 14 07:26:20 2017 +0530

--
 .../server/upgrade/AbstractUpgradeCatalog.java  | 96 
 .../server/upgrade/UpgradeCatalog250.java   | 69 +-
 .../stacks/HDP/2.2/services/stack_advisor.py| 13 +--
 .../stacks/HDP/2.3/services/stack_advisor.py| 13 +--
 .../upgrade/AbstractUpgradeCatalogTest.java | 64 -
 .../server/upgrade/UpgradeCatalog250Test.java   | 20 
 .../stacks/2.2/common/test_stack_advisor.py |  8 +-
 .../stacks/2.3/common/test_stack_advisor.py |  2 +-
 8 files changed, 103 insertions(+), 182 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9c7b290d/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 20280fb..712e309 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -19,8 +19,6 @@ package org.apache.ambari.server.upgrade;
 
 import java.io.File;
 import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Type;
 import java.sql.ResultSet;
@@ -39,11 +37,8 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.persistence.EntityManager;
-import javax.xml.bind.JAXBException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -84,8 +79,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
 import org.apache.ambari.server.state.stack.WidgetLayout;
 import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
 import org.apache.ambari.server.utils.VersionUtils;
-import org.apache.ambari.server.view.ViewArchiveUtility;
-import org.apache.ambari.server.view.configuration.ViewConfig;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -111,8 +104,6 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
   protected Configuration configuration;
   @Inject
   protected StackUpgradeUtil stackUpgradeUtil;
-  @Inject
-  protected ViewArchiveUtility archiveUtility;
 
   protected Injector injector;
 
@@ -951,95 +942,8 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
   @Override
   public void upgradeData() throws AmbariException, SQLException {
 executeDMLUpdates();
-updateTezHistoryUrlBase();
-  }
-
-  /**
-   * Version of the Tez view changes with every new version on Ambari. Hence 
the 'tez.tez-ui.history-url.base' in tez-site.xml
-   * has to be changed every time ambari update happens. This will read the 
latest tez-view jar file and find out the
-   * view version by reading the view.xml file inside it and update the 
'tez.tez-ui.history-url.base' property in tez-site.xml
-   * with the proper value of the updated tez view version.
-   */
-  private void updateTezHistoryUrlBase() throws AmbariException {
-AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
-Clusters clusters = ambariManagementController.getClusters();
-
-if (clusters != null) {
-  Map clusterMap = clusters.getClusters();
-  if (clusterMap != null && !clusterMap.isEmpty()) {
-for (final Cluster cluster : clusterMap.values()) {
-  Set installedServices = cluster.getServices().keySet();
-  if (installedServices.contains("TEZ")) {
-Config tezSite = cluster.getDesiredConfigByType("tez-site");
-if (tezSite != null) {
-  String currentTezHistoryUrlBase = 
tezSite.getProperties().get("tez.tez-ui.history-url.base");
-  if (!StringUtils.isEmpty(currentTezHistoryUrlBase)) {
-

[02/50] ambari git commit: AMBARI-20382. Log Search: Web UI Alert tries to use http protocol even if ssl is enabled (oleewere)

2017-03-14 Thread ncole

AMBARI-20382. Log Search: Web UI Alert tries to use http protocol even if ssl 
is enabled (oleewere)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 03a832e6d409802f3ae248799fa448b8f1a307d5
Parents: 389308e
Author: oleewere 
Authored: Fri Mar 10 12:09:41 2017 +0100
Committer: oleewere 
Committed: Fri Mar 10 12:10:18 2017 +0100

--
 .../src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/03a832e6/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json
index 537d7fa..d2926c8 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json
@@ -12,6 +12,8 @@
   "uri": {
 "http": "{{logsearch-env/logsearch_ui_port}}",
 "https": "{{logsearch-env/logsearch_ui_port}}",
+"https_property": "{{logsearch-env/logsearch_ui_protocol}}",
+"https_property_value": "https",
 "default_port": 61888,
 "connection_timeout": 5.0
   },

[04/50] ambari git commit: AMBARI-20393. Fix typo in alert-definitions doc file (oleewere)

2017-03-14 Thread ncole

AMBARI-20393. Fix typo in alert-definitions doc file (oleewere)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 0da5fc02193809487d3de7373bdfd466d561464b
Parents: 7f3bee5
Author: oleewere 
Authored: Fri Mar 10 12:25:53 2017 +0100
Committer: oleewere 
Committed: Fri Mar 10 14:11:15 2017 +0100

--
 ambari-server/docs/api/v1/alert-definitions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0da5fc02/ambari-server/docs/api/v1/alert-definitions.md
--
diff --git a/ambari-server/docs/api/v1/alert-definitions.md 
b/ambari-server/docs/api/v1/alert-definitions.md
index 9785379..c003163 100644
--- a/ambari-server/docs/api/v1/alert-definitions.md
+++ b/ambari-server/docs/api/v1/alert-definitions.md
@@ -165,7 +165,7 @@ AGGREGATE definitions are used to combine the results of 
another alert definitio
 - http - a property that contains the plaintext endpoint to test
 - https - a property that contains the SSL endpoint to test
 - https_property - a property that contains the value which can be used to 
determine if the component is SSL protected
-- http_property_value - a constant value to compare with `https_property` 
in order to determine if the component is protected by SSL
+- https_property_value - a constant value to compare with `https_property` 
in order to determine if the component is protected by SSL
 - kerberos_keytab - a property that contains the Kerberos keytab if 
security is enabled
 - kerberos_principal - a property that contains the Kerberos principal if 
security is enabled
 - default_port - a default port which can be used if none of the above 
properties can be realized

[21/50] ambari git commit: AMBARI-20322 HDP 3.0 TP - create Service Advisor for Slider (dsen)

2017-03-14 Thread ncole

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


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 3d4a836443f156180362ca3b3b1f73f2142d6f69
Parents: c4fce53
Author: Dmytro Sen 
Authored: Mon Mar 13 13:24:09 2017 +0200
Committer: Dmytro Sen 
Committed: Mon Mar 13 13:24:09 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d4a8364/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
new file mode 100644
index 000..6122f14
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/service_advisor.py
@@ -0,0 +1,133 @@
+#!/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, services, hosts):
+"""
+Entry point.
+Must be overriden in child class.
+"""
+Logger.info("Class: %s, Method: %s. Recommending Service Configurations." %
+(self.

[47/50] ambari git commit: AMBARI-20444 Services actions menu is not fully displayed under some circumstances. (ababiichuk)

2017-03-14 Thread ncole

AMBARI-20444 Services actions menu is not fully displayed under some 
circumstances. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: ece203b295bbacd7d069e74201381a5f07280d1e
Parents: 9dc4a3d
Author: ababiichuk 
Authored: Tue Mar 14 16:39:45 2017 +0200
Committer: ababiichuk 
Committed: Tue Mar 14 17:22:15 2017 +0200

--
 ambari-web/app/styles/theme/bootstrap-ambari.css| 12 ++--
 ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 12 +---
 2 files changed, 11 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ece203b2/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index a0b24e5..98606e9 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1148,14 +1148,22 @@ input.radio:checked + label:after {
   top: 0;
 }
 .navigation-bar-fit-height .side-nav-menu {
-  position: fixed;
+  position: absolute;
   top: 55px;
   bottom: 50px;
 }
 .navigation-bar-fit-height .side-nav-footer {
-  position: fixed;
+  position: absolute;
   bottom: 0;
 }
+.navigation-bar-fit-height .more-actions .dropdown-menu {
+  position: fixed;
+  top: auto;
+  left: auto;
+}
+.navigation-bar-fit-height .navigation-bar-container {
+  height: 100%;
+}
 .navigation-bar-fit-height .navigation-bar-container:not(.collapsed) 
.side-nav-menu {
   overflow-y: auto;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ece203b2/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index e75bd6b..1f61104 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -49,7 +49,7 @@
 $navigationContainer.find('li a').each(function (index, link) {
   var $link = $(link);
   var href = $link.attr('data-href') || $link.attr('href');
-  if (path.indexOf(href) !== -1 && !['', '#'].contains(href)) {
+  if (path.indexOf(href) !== -1 && ['', '#'].indexOf(href) === -1) {
 $link.parent().addClass('active');
   } else {
 $link.parent().removeClass('active');
@@ -124,16 +124,6 @@
   $moreActions.hover(function () {
 $(this).css('display', 'inline-block');
   });
-  $moreActions.on('click', function () {
-if (settings.fitHeight) {
-  // set actions submenu position
-  var $moreIcon = $(this);
-  var $header = $('.side-nav-header');
-  $moreIcon.children('.dropdown-menu').css('position', 'fixed');
-  $moreIcon.children('.dropdown-menu').css('top', 
$moreIcon.offset().top - $header.offset().top  + 20 + 'px');
-  $moreIcon.children('.dropdown-menu').css('left', 
$moreIcon.offset().left);
-}
-  });
   $moreActions.children('.dropdown-menu').on('click', function () {
 // some action was triggered, should hide this icon
 var moreIcon = $(this).parent();

[46/50] ambari git commit: AMBARI-20408. Atlas MetaData server start fails while granting permissions to HBase tables after unkerberizing the cluster (rlevas)

2017-03-14 Thread ncole

AMBARI-20408. Atlas MetaData server start fails while granting permissions to 
HBase tables after unkerberizing the cluster (rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 9dc4a3dfd25f160ab7014bf78e98efa9237a0ebf
Parents: 0c76e2f
Author: Robert Levas 
Authored: Tue Mar 14 10:42:43 2017 -0400
Committer: Robert Levas 
Committed: Tue Mar 14 10:42:43 2017 -0400

--
 .../server/controller/KerberosHelper.java   |   3 -
 .../server/controller/KerberosHelperImpl.java   | 104 +++-
 .../AbstractPrepareKerberosServerAction.java| 237 ---
 .../PrepareDisableKerberosServerAction.java | 108 ++---
 .../PrepareEnableKerberosServerAction.java  |  19 +-
 .../PrepareKerberosIdentitiesServerAction.java  | 127 ++
 ...AbstractPrepareKerberosServerActionTest.java |  30 +--
 7 files changed, 257 insertions(+), 371 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9dc4a3df/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
index 0e27d03..d000571 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
@@ -293,8 +293,6 @@ public interface KerberosHelper {
* @param existingConfigurations the cluster's existing configurations
* @param kerberosConfigurations the configuration updates to make
* @param propertiesToIgnore the configuration properties that should be 
ignored when applying recommendations
-   * @param propertiesToInsert the configuration properties that must be 
inserted to cluster config are inserted
-   *   into this map in case if provided (not 
null) and kerberosEnabled = false
* @param propertiesToRemove the configuration properties that must be 
removed from cluster config are inserted
*   into this map in case if provided (not 
null) and kerberosEnabled
* @param kerberosEnabledtrue if kerberos is (to be) enabled; 
otherwise false
@@ -305,7 +303,6 @@ public interface KerberosHelper {
 Map> existingConfigurations,
 Map> kerberosConfigurations,
 Map> propertiesToIgnore,
-Map> propertiesToInsert,
 Map> propertiesToRemove,
 boolean 
kerberosEnabled)
   throws AmbariException;

http://git-wip-us.apache.org/repos/asf/ambari/blob/9dc4a3df/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index baa90e7..5204322 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -363,7 +363,7 @@ public class KerberosHelperImpl implements KerberosHelper {
 
 // If Ambari is managing it own identities then add AMBARI to the set of 
installed servcie so
 // that its Kerberos descriptor entries will be included.
-if(createAmbariIdentities(existingConfigurations.get("kerberos-env"))) {
+if (createAmbariIdentities(existingConfigurations.get("kerberos-env"))) {
   installedServices = new HashMap>(installedServices);
   installedServices.put("AMBARI", Collections.singleton("AMBARI_SERVER"));
 }
@@ -414,7 +414,7 @@ public class KerberosHelperImpl implements KerberosHelper {
 
 return (applyStackAdvisorUpdates)
 ? applyStackAdvisorUpdates(cluster, installedServices.keySet(), 
configurations, kerberosConfigurations, propertiesToIgnore,
-null, new HashMap>(), kerberosEnabled)
+new HashMap>(), kerberosEnabled)
 : kerberosConfigurations;
   }
 
@@ -423,7 +423,6 @@ public class KerberosHelperImpl implements K

[41/50] ambari git commit: AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during stack upgrade (r-kamath)

2017-03-14 Thread ncole

AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during 
stack upgrade (r-kamath)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 645407b65558110a5fa6306c034d73c09ba2bfe6
Parents: efd3b58
Author: Renjith Kamath 
Authored: Tue Mar 14 14:36:12 2017 +0530
Committer: Renjith Kamath 
Committed: Tue Mar 14 14:37:15 2017 +0530

--
 .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/645407b6/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 a460aec..38bfeb4 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
@@ -309,12 +309,12 @@ class Master(Script):
 config_data = self.get_interpreter_settings()
 interpreter_settings = config_data['interpreterSettings']
 
-if 'spark2-env' in params.config['configurations']:
+if 'spark2-defaults' in params.config['configurations']:
   spark2_config = self.get_spark2_interpreter_config()
   config_id = spark2_config["id"]
   interpreter_settings[config_id] = spark2_config
 
-if 'livy2-env' in params.config['configurations']:
+if 'livy2-defaults' in params.config['configurations']:
   livy2_config = self.get_livy2_interpreter_config()
   config_id = livy2_config["id"]
   interpreter_settings[config_id] = livy2_config

[13/50] ambari git commit: AMBARI-20323. Commands timed-out on ambari host without any error logs - addendum patch (echekanskiy)

2017-03-14 Thread ncole

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


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: b69ac43a6a7aa5c7810bca0bc1204e6641634c35
Parents: 0471b0c
Author: Eugene Chekanskiy 
Authored: Sat Mar 11 00:08:27 2017 +0200
Committer: Eugene Chekanskiy 
Committed: Sat Mar 11 00:08:27 2017 +0200

--
 .../src/main/python/ambari_agent/Controller.py  |  2 +-
 .../src/main/python/ambari_agent/ExitHelper.py  |  3 ++
 .../ambari_agent/StatusCommandsExecutor.py  | 36 
 .../src/main/python/ambari_agent/main.py|  4 +--
 4 files changed, 35 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b69ac43a/ambari-agent/src/main/python/ambari_agent/Controller.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/Controller.py 
b/ambari-agent/src/main/python/ambari_agent/Controller.py
index c152f64..c1a5f1b 100644
--- a/ambari-agent/src/main/python/ambari_agent/Controller.py
+++ b/ambari-agent/src/main/python/ambari_agent/Controller.py
@@ -477,7 +477,7 @@ class Controller(threading.Thread):
 try:
   self.actionQueue = ActionQueue(self.config, controller=self)
   self.statusCommandsExecutor = StatusCommandsExecutor(self.config, 
self.actionQueue)
-  ExitHelper().register(self.statusCommandsExecutor.kill, 
"CLEANUP_KILLING")
+  ExitHelper().register(self.statusCommandsExecutor.kill, 
"CLEANUP_KILLING", can_relaunch=False)
   self.actionQueue.start()
   self.register = Register(self.config)
   self.heartbeat = Heartbeat(self.actionQueue, self.config, 
self.alert_scheduler_handler.collector())

http://git-wip-us.apache.org/repos/asf/ambari/blob/b69ac43a/ambari-agent/src/main/python/ambari_agent/ExitHelper.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ExitHelper.py 
b/ambari-agent/src/main/python/ambari_agent/ExitHelper.py
index e51646f..66e29e6 100644
--- a/ambari-agent/src/main/python/ambari_agent/ExitHelper.py
+++ b/ambari-agent/src/main/python/ambari_agent/ExitHelper.py
@@ -39,6 +39,9 @@ class ExitHelper(object):
   """
   Class to cleanup resources before exiting. Replacement for atexit module. 
sys.exit(code) works only from threads and
   os._exit(code) will ignore atexit and cleanup will be ignored.
+
+  WARNING: always import as `ambari_agent.ExitHelper import ExitHelper`, 
otherwise it will be imported twice and nothing
+  will work as expected.
   """
   __metaclass__ = _singleton
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b69ac43a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py 
b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
index 3f7ef4c..5c1c54a 100644
--- a/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
@@ -37,6 +37,9 @@ class StatusCommandsExecutor(object):
 self.config = config
 self.actionQueue = actionQueue
 
+self._can_relaunch_lock = threading.RLock()
+self._can_relaunch = True
+
 # used to prevent queues from been used during creation of new one to 
prevent threads messing up with combination of
 # old and new queues
 self.usage_lock = threading.RLock()
@@ -53,6 +56,16 @@ class StatusCommandsExecutor(object):
 self.mp_result_logs = multiprocessing.Queue()
 self.mp_task_queue = multiprocessing.Queue()
 
+  @property
+  def can_relaunch(self):
+with self._can_relaunch_lock:
+  return self._can_relaunch
+
+  @can_relaunch.setter
+  def can_relaunch(self, value):
+with self._can_relaunch_lock:
+  self._can_relaunch = value
+
   def _log_message(self, level, message, exception=None):
 """
 Put log message to logging queue. Must be used only for logging from child 
process(in _worker_process_target).
@@ -163,7 +176,7 @@ class StatusCommandsExecutor(object):
   self._log_message(logging.ERROR, "StatusCommandsExecutor process failed 
with exception:", e)
   raise
 
-self._log_message(logging.WARN, "StatusCommandsExecutor subprocess 
finished")
+self._log_message(logging.INFO, "StatusCommandsExecutor subprocess 
finished")
 
   def _set_timed_out(self, command):
 """
@@ -242,23 +255,32 @@ class StatusCommandsExecutor(object):
 :param

[07/50] ambari git commit: AMBARI-20385 : Grafana is storing credentials in plain text in its configuration. (Unit test fix) (avijayan)

2017-03-14 Thread ncole

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


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 1bc0f0a02049fd31d128eb1fd8d41c8d4483ff36
Parents: d4839a9
Author: Aravindan Vijayan 
Authored: Fri Mar 10 07:18:10 2017 -0800
Committer: Aravindan Vijayan 
Committed: Fri Mar 10 07:18:10 2017 -0800

--
 .../python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1bc0f0a0/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
 
b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
index 67750b7..fcfbcf1 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
@@ -36,9 +36,10 @@ class TestMetricsGrafana(RMFTestCase):
   sys.path.append(file_path)
   global metrics_grafana_util
 
+  @patch("metrics_grafana_util.create_grafana_admin_pwd")
   @patch("metrics_grafana_util.create_ams_datasource")
   @patch("metrics_grafana_util.create_ams_dashboards")
-  def test_start(self, create_ams_datasource_mock, create_ams_dashboards_mock):
+  def test_start(self, create_grafana_admin_pwd, create_ams_datasource_mock, 
create_ams_dashboards_mock):
 self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + 
"/metrics_grafana.py",
classname = "AmsGrafana",
command = "start",
@@ -75,6 +76,7 @@ class TestMetricsGrafana(RMFTestCase):
 not_if = "ambari-sudo.sh su ams -l -s /bin/bash -c 
'[RMF_EXPORT_PLACEHOLDER]test -f 
/var/run/ambari-metrics-grafana/grafana-server.pid && ps -p `cat 
/var/run/ambari-metrics-grafana/grafana-server.pid`'",
 user = 'ams',
 )
+create_grafana_admin_pwd.assertCalled()
 create_ams_datasource_mock.assertCalled()
 create_ams_dashboards_mock.assertCalled()
 self.assertNoMoreResources()

[42/50] ambari git commit: AMBARI-20441. Alert Definition "Last Changed" field is shown incorrect if alert wan't triggered any time (onechiporenko)

2017-03-14 Thread ncole

AMBARI-20441. Alert Definition "Last Changed" field is shown incorrect if alert 
wan't triggered any time (onechiporenko)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: e2818c61c15ec703e15581ca149c27bbfb7c1909
Parents: 645407b
Author: Oleg Nechiporenko 
Authored: Tue Mar 14 11:32:45 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Tue Mar 14 11:32:45 2017 +0200

--
 ambari-web/app/models/alerts/alert_definition.js  | 3 ++-
 .../main/service/configs/component_actions_by_configs_test.js | 2 +-
 ambari-web/test/models/alerts/alert_definition_test.js| 7 +++
 3 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/app/models/alerts/alert_definition.js
--
diff --git a/ambari-web/app/models/alerts/alert_definition.js 
b/ambari-web/app/models/alerts/alert_definition.js
index b55ef1b..09089e6 100644
--- a/ambari-web/app/models/alerts/alert_definition.js
+++ b/ambari-web/app/models/alerts/alert_definition.js
@@ -100,7 +100,8 @@ App.AlertDefinition = DS.Model.extend({
* @type {string}
*/
   lastTriggeredFormatted: function () {
-return dateUtils.dateFormat(this.get('lastTriggered'));
+let lastTriggered = this.get('lastTriggered');
+return lastTriggered ? dateUtils.dateFormat(lastTriggered) : '';
   }.property('lastTriggered'),
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
--
diff --git 
a/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
 
b/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
index f987c52..9a73a9a 100644
--- 
a/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
+++ 
b/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
@@ -226,7 +226,7 @@ describe('App.ComponentActionsByConfigs', function () {
 name: 'common.batch.request_schedules',
 sender: mixin,
 data: {
-  intervalTimeSeconds: 1,
+  intervalTimeSeconds: 60,
   tolerateSize: 0,
   batches: [{}, {}]
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/test/models/alerts/alert_definition_test.js
--
diff --git a/ambari-web/test/models/alerts/alert_definition_test.js 
b/ambari-web/test/models/alerts/alert_definition_test.js
index 3d8b62d..26309ae 100644
--- a/ambari-web/test/models/alerts/alert_definition_test.js
+++ b/ambari-web/test/models/alerts/alert_definition_test.js
@@ -175,6 +175,13 @@ describe('App.AlertDefinition', function () {
 RECOVERY: 'glyphicon glyphicon-oil'
   }});
 
+  describe('#lastTriggeredFormatted', function () {
+it('should be empty', function () {
+  model.set('lastTriggered', 0);
+  expect(model.get('lastTriggeredFormatted')).to.be.equal('');
+});
+  });
+
   describe('REOPEN', function () {
 
 describe('#getSortDefinitionsByStatus', function () {

[03/50] ambari git commit: AMBARI-20360. Need to show appropriate error message in cases of UI failures. (M Madhan Mohan Reddy via dipayanb)

2017-03-14 Thread ncole

AMBARI-20360. Need to show appropriate error message in cases of UI failures. 
(M Madhan Mohan Reddy via dipayanb)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 7f3bee58260080c786bd8882663c9daa67c81d81
Parents: 03a832e
Author: Dipayan Bhowmick 
Authored: Fri Mar 10 17:27:21 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Fri Mar 10 17:27:56 2017 +0530

--
 .../ui/app/components/bundle-config.js  | 15 
 .../resources/ui/app/components/coord-config.js | 25 ++--
 .../ui/app/components/designer-errors.js|  3 +++
 .../ui/app/components/flow-designer.js  | 25 +++-
 .../ui/app/domain/bundle/bundle-xml-importer.js |  4 
 .../coordinator/coordinator-xml-importer.js |  4 
 .../ui/app/domain/workflow-importer.js  | 12 +++---
 .../templates/components/designer-errors.hbs| 11 ++---
 8 files changed, 76 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f3bee58/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 e94d51a..7c63b47 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
@@ -144,9 +144,12 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
 return deferred;
   },
   importBundle (filePath){
-this.set("bundleFilePath", filePath);
+if (!filePath) {
+  return;
+}
 this.set("isImporting", true);
 filePath = this.appendFileName(filePath, 'bundle');
+this.set("bundleFilePath", filePath);
 var deferred = this.getBundleFromHdfs(filePath);
 deferred.promise.then(function(response){
   if(response.type === 'xml'){
@@ -209,9 +212,11 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   getBundleFromXml(bundleXml){
 var bundleXmlImporter = BundleXmlImporter.create();
 var bundleObj = bundleXmlImporter.importBundle(bundleXml);
-this.set("bundle", bundleObj.bundle);
 this.get("errors").clear();
 this.get("errors").pushObjects(bundleObj.errors);
+if (bundleObj.bundle) {
+  this.set("bundle", bundleObj.bundle);
+}
   },
   getJobProperties(coordinatorPath){
 var deferred = Ember.RSVP.defer();
@@ -386,8 +391,10 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   var deferred = this.importSampleBundle();
   deferred.promise.then(function(data){
 this.getBundleFromXml(data);
-  }.bind(this)).catch(function(e){
-throw new Error(e);
+  }.bind(this)).catch(function(data){
+console.error(data);
+this.set("errorMsg", "There is some problem while importing.");
+this.set("data", data);
   });
 },
 openTab(type, path){

http://git-wip-us.apache.org/repos/asf/ambari/blob/7f3bee58/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 c87ea99..e8f8cc1 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
@@ -76,7 +76,7 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
   }.on('willDestroyElement'),
   initialize : function(){
 var self = this;
-
+this.set('errors', Ember.A([]));
 
this.get('workspaceManager').restoreWorkInProgress(this.get('tabInfo.id')).promise.then(function(draftCoordinator){
   self.loadCoordinator(draftCoordinator);
 }.bind(this)).catch(function(data){
@@ -262,9 +262,12 @@ export default Ember.Component.extend(Validations, 
Ember.Evented, {
 return deferred;
   },
   importCoordinator (filePath){
+if (!filePath) {
+  return;
+}
+this.set("isImporting", true);
 filePath = this.appendFileName(filePath, 'coord');
 this.set("coordinatorFilePath", filePath);
-this.set("isImporting", false);
 var deferred = this.readCoordinatorFromHdfs(filePath);
 deferred.promise.then(function(response){
   if(response.type === 'xml

[10/50] ambari git commit: AMBARI-20365 Display Ranger DB backup instruction in sections on the manual step during RU (dili)

2017-03-14 Thread ncole

AMBARI-20365 Display Ranger DB backup instruction in sections on the manual 
step during RU (dili)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 971eaff1d16949a38112eeb9d1869dec45affc44
Parents: 528ac5c
Author: Di Li 
Authored: Fri Mar 10 12:50:50 2017 -0500
Committer: Di Li 
Committed: Fri Mar 10 12:50:50 2017 -0500

--
 .../resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml| 11 ++-
 .../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml| 11 ++-
 .../resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml|  9 -
 .../resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml|  9 -
 .../resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml| 10 +-
 .../resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml|  9 -
 .../resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml|  9 -
 7 files changed, 33 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
index 6bf2d4c..89b5126 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
@@ -96,11 +96,12 @@
 
   
 
-  Before continuing, please backup the Ranger Admin database 
and Ranger Audit database.
-If audit database size is too large( > 3GB ) then follow the below 
instructions:
-1. Backup the audit table from audit database.
-2. Truncate audit table.
-3. Follow upgrade process and once completed then restore audit 
data to audit table.
+  
+Before continuing, please backup the Ranger Admin database and 
Ranger Audit database. If audit database size is too large( > 3GB ) then follow 
the below instructions:
+  
+  1. Backup the audit table from audit database.
+  2. Truncate audit table.
+  3. Follow upgrade process and once completed then restore 
audit data to audit table.
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
index 91c8cdf..4e897a0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
@@ -90,11 +90,12 @@
 
   
 
-  Before continuing, please backup the Ranger Admin database 
and Ranger Audit database.
-If audit database size is too large( > 3GB ) then follow the 
below instructions:
-1. Backup the audit table from audit database.
-2. Truncate audit table.
-3. Follow upgrade process and once completed then restore 
audit data to audit table.
+  
+Before continuing, please backup the Ranger Admin database and 
Ranger Audit database. If audit database size is too large( > 3GB ) then follow 
the below instructions:
+  
+  1. Backup the audit table from audit database.
+  2. Truncate audit table.
+  3. Follow upgrade process and once completed then restore 
audit data to audit table.
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
index fd93829..9396f80 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
@@ -102,11 +102,10 @@
 
   
 
-  Before continuing, please backup the Ranger Admin database 
and Ranger Audit database.
-If audit database size is too large( > 3GB ) then follow the 
below instructions:
-1. Backup the audit table from audit database.
-

[18/50] ambari git commit: AMBARI-20406. Inconsistent behavior of stack advisor while deleting Spark service (akovalenko)

2017-03-14 Thread ncole

AMBARI-20406. Inconsistent behavior of stack advisor while deleting Spark 
service (akovalenko)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: ff235b4904fc4a3334e841ea06b65df17109f5f6
Parents: 1cb3da8
Author: Aleksandr Kovalenko 
Authored: Sun Mar 12 03:37:15 2017 +0200
Committer: Aleksandr Kovalenko 
Committed: Sun Mar 12 03:40:01 2017 +0200

--
 ambari-web/app/controllers/main/service/item.js | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ff235b49/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 817d5d9..5169564 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -191,6 +191,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
*/
   loadConfigs: function(){
 this.set('isServiceConfigsLoaded', false);
+this.set('stepConfigs', []);
 App.ajax.send({
   name: 'config.tags',
   sender: this,
@@ -1317,6 +1318,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 isDefault: true
   })
 });
+this.loadConfigs();
 App.get('router.mainController.isLoading').call(this, 
'isServiceConfigsLoaded').done(callback);
 return App.ModalPopup.show({
   controller: self,

[26/50] ambari git commit: AMBARI-20391. Ambari Metrics Grafana Datasource plugin does not work when configured with a reverse proxy with subpath. (yusaku)

2017-03-14 Thread ncole

AMBARI-20391. Ambari Metrics Grafana Datasource plugin does not work when 
configured with a reverse proxy with subpath. (yusaku)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 0c010b3177fcc2d03688ba035139e0f86d9f581d
Parents: bc28cd7
Author: Yusaku Sako 
Authored: Mon Mar 13 07:58:57 2017 -0700
Committer: Yusaku Sako 
Committed: Mon Mar 13 07:58:57 2017 -0700

--
 .../ambari-metrics/datasource.js| 45 +++-
 1 file changed, 24 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c010b31/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
--
diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js 
b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
index 3a0fb66..97de6e7 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -41,8 +41,9 @@ define([
 
 //We get a list of components and their associated metrics.
 AmbariMetricsDatasource.prototype.initMetricAppidMapping = function () 
{
-  return backendSrv.get(this.url + '/ws/v1/timeline/metrics/metadata')
+  return this.doAmbariRequest({ url: 
'/ws/v1/timeline/metrics/metadata' })
 .then(function (items) {
+  items = items.data;
   allMetrics = {};
   appIds = [];
   _.forEach(items, function (metric,app) {
@@ -101,6 +102,7 @@ define([
 if(!_.isEmpty(templateSrv.variables) && 
templateSrv.variables[0].query === "kafka-topics") {
 alias = alias + ' on ' + target.kbTopic; }
 return function (res) {
+  res = res.data;
   console.log('processing metric ' + target.metric);
   if (!res.metrics[0] || target.hide) {
 return $q.when(emptyData(target));
@@ -143,6 +145,7 @@ define([
   alias = alias.replace('$druidDataSource', target.sDataSource);
 }
 return function (res) {
+  res = res.data;
   console.log('processing metric ' + target.metric);
   if (!res.metrics[0] || target.hide) {
 return $q.when(emptyData(target));
@@ -217,9 +220,9 @@ define([
 var metricAggregator = target.aggregator === "none" ? '' : '._' + 
target.aggregator;
 var metricTransform = !target.transform || target.transform === 
"none" ? '' : '._' + target.transform;
 var seriesAggregator = !target.seriesAggregator || 
target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + 
target.seriesAggregator;
-return backendSrv.get(self.url + 
'/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform +
+return self.doAmbariRequest({ url: 
'/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform +
 metricAggregator + "&hostname=" + target.hosts + '&appId=' + 
target.app + '&startTime=' + from +
-'&endTime=' + to + precision + seriesAggregator).then(
+'&endTime=' + to + precision + seriesAggregator }).then(
 getMetricsData(target)
 );
   };
@@ -239,9 +242,9 @@ define([
 var metricAggregator = target.aggregator === "none" ? '' : '._' + 
target.aggregator;
 var metricTransform = !target.transform || target.transform === 
"none" ? '' : '._' + target.transform;
 var seriesAggregator = !target.seriesAggregator || 
target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + 
target.seriesAggregator;
-return backendSrv.get(self.url + 
'/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform
+return self.doAmbariRequest({ url: 
'/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform
   + metricAggregator + '&hostname=' + tHost + '&appId=' + 
target.app + '&startTime=' + from +
-  '&endTime=' + to + precision + seriesAggregator).then(
+  '&endTime=' + to + precision + seriesAggregator }).then(
   getMetricsData(target)
 );
   };
@@ -261,9 +264,9 @@ define([
 var metricTransform = !target.transform || target.transform === 
"none" ? '' : '._' + target.transform;
 var seriesAggregator = !target.seriesAggregator || 
target.seriesAggregator === "none" ? '' : '&seriesAggregateFunction=' + 
targ

[31/50] ambari git commit: AMBARI-20425 Empty current and recommended values in "Recommended configs" panel during Add Service. (ababiichuk)

2017-03-14 Thread ncole

AMBARI-20425 Empty current and recommended values in "Recommended configs" 
panel during Add Service. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 592c1a90c66b621cada4c6f335196dce2121814a
Parents: 369057a
Author: ababiichuk 
Authored: Mon Mar 13 18:12:23 2017 +0200
Committer: ababiichuk 
Committed: Mon Mar 13 19:51:42 2017 +0200

--
 ambari-web/app/messages.js  |  3 +-
 ambari-web/app/styles/application.less  | 19 -
 .../views/common/configs/config_diff_view.js| 29 ++--
 3 files changed, 40 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/592c1a90/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 2e80a2b..1a26516 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -477,7 +477,8 @@ Em.I18n.translations = {
   'popup.dependent.configs.table.currentValue': 'Current Value',
   'popup.dependent.configs.table.recommendedValue': 'Recommended Value',
   'popup.dependent.configs.table.newValue': 'New Value',
-  'popup.dependent.configs.table.not.defined': 'Not Defined',
+  'popup.dependent.configs.table.undefined': 'Property undefined',
+  'popup.dependent.configs.table.removed': 'Property removed',
 
 
   'popup.dependent.configs.select.config.group.header': 'Select Config Group',

http://git-wip-us.apache.org/repos/asf/ambari/blob/592c1a90/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 8a15fb1..151e404 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2293,6 +2293,10 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
 @config-dependency-t-group-width: 140px;
 @config-dependency-t-filename-width: 150px;
 @config-dependency-t-value-width: 230px;
+@diff-background-insert: #eaffea;
+@diff-background-delete: #ffecec;
+@diff-background-equal: #fff;
+@diff-background-empty: #ddd;
 
 #config-dependencies {
   max-height: 500px;
@@ -2327,17 +2331,18 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
 &.empty {
   width: 50%;
 }
-&.delete, &.insert, &.replace {
-  color: #fff;
-}
 &.delete {
-  background-color: @health-status-red !important;
+  background-color: @diff-background-delete !important;
 }
 &.insert {
-  background-color: @health-status-green !important;
+  background-color: @diff-background-insert !important;
+}
+&.equal, &.not-defined:last-of-type, &.is-removed:first-of-type {
+  background-color: @diff-background-equal;
 }
-&.replace {
-  background-color: @health-status-orange !important;
+&.not-defined:first-of-type, &.is-removed:last-of-type {
+  background-color: @diff-background-empty;
+  font-style: italic;
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/592c1a90/ambari-web/app/views/common/configs/config_diff_view.js
--
diff --git a/ambari-web/app/views/common/configs/config_diff_view.js 
b/ambari-web/app/views/common/configs/config_diff_view.js
index 135efb7..cbaf2b0 100644
--- a/ambari-web/app/views/common/configs/config_diff_view.js
+++ b/ambari-web/app/views/common/configs/config_diff_view.js
@@ -29,12 +29,35 @@ App.ConfigDiffView = Em.View.extend({
   }).sort().join("\n");
   return difflib.stringAsLines(values);
 };
-var initialValues = trimAndSort(this.get('config.initialValue'));
-var recommendedValues = trimAndSort(this.get('config.recommendedValue'));
+var initialValues = trimAndSort(this.get('config.initialValue')),
+  recommendedValues = trimAndSort(this.get('config.recommendedValue')),
+  opcodes = new difflib.SequenceMatcher(initialValues, 
recommendedValues).get_opcodes();
+if (initialValues.length === 1 && recommendedValues.length === 1) {
+  // changes in properties with single-line values shouldn't be highlighted
+  opcodes[0][0] = 'equal';
+}
+if (!initialValues.length) {
+  if (recommendedValues.length > 1) {
+// initial and recommended values should have the same number of rows
+initialValues = Array(recommendedValues

[14/50] ambari git commit: AMBARI-20405. Side Nav: several issues tested on IE 11 .(XIWANG)

2017-03-14 Thread ncole

AMBARI-20405. Side Nav: several issues tested on IE 11 .(XIWANG)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 01ef69524317f87b4223f9b0c9b26058ae6a73bd
Parents: b69ac43
Author: Xi Wang 
Authored: Fri Mar 10 16:27:39 2017 -0800
Committer: Xi Wang 
Committed: Fri Mar 10 16:27:47 2017 -0800

--
 ambari-web/app/styles/theme/bootstrap-ambari.css| 1 +
 ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/01ef6952/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index 3adcbe9..a0b24e5 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -750,6 +750,7 @@ input.radio:checked + label:after {
   width: 190px;
   background-color: #323544;
   padding: 0;
+  -ms-overflow-style: none;
 }
 .navigation-bar-container ul.nav.side-nav-header {
   width: 190px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/01ef6952/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index c193f7f..e75bd6b 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -49,7 +49,7 @@
 $navigationContainer.find('li a').each(function (index, link) {
   var $link = $(link);
   var href = $link.attr('data-href') || $link.attr('href');
-  if (path.indexOf(href) !== -1 && !['', '#'].includes(href)) {
+  if (path.indexOf(href) !== -1 && !['', '#'].contains(href)) {
 $link.parent().addClass('active');
   } else {
 $link.parent().removeClass('active');

[05/50] ambari git commit: AMBARI-20395 Clicking on ambari logo on ambari-admin ui takes to broken layout on ambari-web. (atkach)

2017-03-14 Thread ncole

AMBARI-20395 Clicking on ambari logo on ambari-admin ui takes to broken layout 
on ambari-web. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: eb41a375ba4acdd01bdd37fca8a28746144a9c32
Parents: 0da5fc0
Author: Andrii Tkach 
Authored: Fri Mar 10 15:12:28 2017 +0200
Committer: Andrii Tkach 
Committed: Fri Mar 10 15:42:26 2017 +0200

--
 ambari-web/app/routes/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eb41a375/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 4607033..aace4a2 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -71,14 +71,16 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 if (App.isAuthorized('AMBARI.ADD_DELETE_CLUSTERS')) {
   self.redirectToInstaller(router, 
currentClusterStatus, false);
 } else {
+  App.router.get('clusterController').set('isLoaded', 
true);
   Em.run.next(function () {
 App.router.transitionTo('main.views.index');
   });
 }
+  } else {
+App.router.get('clusterController').set('isLoaded', 
true);
   }
 });
   });
-  App.router.get('clusterController').set('isLoaded', true);
 }
   }
 });

[35/50] ambari git commit: AMBARI-20070. Agent heartbeat lost due to subprocess.Popen race condition -- addendum for multiprocessing

2017-03-14 Thread ncole

AMBARI-20070. Agent heartbeat lost due to subprocess.Popen race condition -- 
addendum for multiprocessing


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 19c9e25587316bceb46c1585fce712fdf5056e39
Parents: 9446252
Author: Attila Doroszlai 
Authored: Sat Mar 11 19:13:16 2017 +0100
Committer: Attila Doroszlai 
Committed: Mon Mar 13 22:21:59 2017 +0100

--
 .../src/main/python/ambari_agent/main.py| 21 ++--
 1 file changed, 15 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/19c9e255/ambari-agent/src/main/python/ambari_agent/main.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/main.py 
b/ambari-agent/src/main/python/ambari_agent/main.py
index ddef473..8e55916 100644
--- a/ambari-agent/src/main/python/ambari_agent/main.py
+++ b/ambari-agent/src/main/python/ambari_agent/main.py
@@ -45,23 +45,32 @@ def fix_subprocess_racecondition():
 
 def fix_subprocess_popen():
   '''
-  http://bugs.python.org/issue19809
+  Workaround for race condition in starting subprocesses concurrently from
+  multiple threads via the subprocess and multiprocessing modules.
+  See http://bugs.python.org/issue19809 for details and repro script.
   '''
   import os
   import sys
 
   if os.name == 'posix' and sys.version_info[0] < 3:
+from multiprocessing import forking
 import subprocess
 import threading
 
-original_init = subprocess.Popen.__init__
-lock = threading.RLock()
+sp_original_init = subprocess.Popen.__init__
+mp_original_init = forking.Popen.__init__
+lock = threading.RLock() # guards subprocess creation
 
-def locked_init(self, *a, **kw):
+def sp_locked_init(self, *a, **kw):
   with lock:
-original_init(self, *a, **kw)
+sp_original_init(self, *a, **kw)
 
-subprocess.Popen.__init__ = locked_init
+def mp_locked_init(self, *a, **kw):
+  with lock:
+mp_original_init(self, *a, **kw)
+
+subprocess.Popen.__init__ = sp_locked_init
+forking.Popen.__init__ = mp_locked_init
 
 
 fix_subprocess_popen()

[50/50] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556

2017-03-14 Thread ncole

Merge branch 'trunk' into branch-feature-AMBARI-12556


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: eb568132bd58fd734985c1aea57221b5afe247d8
Parents: 353cd9d 75f1a29
Author: Nate Cole 
Authored: Tue Mar 14 14:41:32 2017 -0400
Committer: Nate Cole 
Committed: Tue Mar 14 14:41:32 2017 -0400

--
 .../scripts/controllers/users/UsersShowCtrl.js  |  10 +-
 .../ui/admin-web/app/scripts/i18n.config.js |   4 +-
 .../resources/ui/admin-web/app/styles/main.css  |   5 +
 .../admin-web/app/views/stackVersions/list.html |   2 +-
 .../src/main/python/ambari_agent/ActionQueue.py |  53 +--
 .../main/python/ambari_agent/AmbariConfig.py|   3 +
 .../src/main/python/ambari_agent/Controller.py  |  57 +--
 .../ambari_agent/CustomServiceOrchestrator.py   |   6 +-
 .../src/main/python/ambari_agent/ExitHelper.py  |   3 +
 .../ambari_agent/StatusCommandsExecutor.py  | 384 ---
 .../src/main/python/ambari_agent/main.py|  35 +-
 .../test/python/ambari_agent/TestActionQueue.py |   6 +-
 .../test/python/ambari_agent/TestController.py  |   3 -
 .../src/test/python/ambari_agent/TestMain.py|   9 +-
 .../resource_management/TestDatanodeHelper.py   |  16 +-
 .../python/resource_management/core/source.py   |   5 +-
 .../libraries/functions/stack_select.py |   5 +-
 .../timeline/AbstractTimelineMetricsSink.java   |  16 +-
 .../ambari-metrics/datasource.js|  45 ++-
 .../timeline/HadoopTimelineMetricsSink.java |  15 +-
 .../conf/unix/metric_monitor.ini|   2 +
 .../src/main/python/core/config_reader.py   |   7 +-
 .../src/main/python/core/host_info.py   |  41 +-
 .../src/test/python/core/TestHostInfo.py| 147 ++-
 ambari-server/docs/api/v1/alert-definitions.md  |   2 +-
 ambari-server/docs/configuration/index.md   |  13 +-
 .../ambari/server/api/services/Result.java  |   2 +-
 .../server/configuration/Configuration.java | 103 -
 .../ambari/server/controller/AmbariServer.java  |   4 +
 .../server/controller/KerberosHelper.java   |   3 -
 .../server/controller/KerberosHelperImpl.java   | 104 ++---
 .../controller/RootServiceResponseFactory.java  |   5 +
 .../BlueprintConfigurationProcessor.java|   5 +-
 .../internal/ClientConfigResourceProvider.java  |   3 +-
 .../upgrade/StackUpgradeFinishListener.java |  14 +-
 .../events/publishers/AlertEventPublisher.java  |  21 +-
 .../system/impl/AmbariMetricSinkImpl.java   |   2 +-
 .../apache/ambari/server/orm/DBAccessor.java|  11 +-
 .../ambari/server/orm/DBAccessorImpl.java   |  29 +-
 .../server/orm/entities/AlertNoticeEntity.java  |   4 +-
 .../AbstractPrepareKerberosServerAction.java| 237 
 .../PrepareDisableKerberosServerAction.java | 108 +-
 .../PrepareEnableKerberosServerAction.java  |  19 +-
 .../PrepareKerberosIdentitiesServerAction.java  | 127 ++
 .../org/apache/ambari/server/state/Service.java |   7 +
 .../apache/ambari/server/state/ServiceImpl.java |  33 +-
 .../state/stack/upgrade/HostOrderGrouping.java  |  15 +-
 .../server/upgrade/AbstractUpgradeCatalog.java  |  96 -
 .../server/upgrade/UpgradeCatalog250.java   | 251 +---
 .../src/main/python/ambari_server/utils.py  |  14 +-
 .../src/main/python/ambari_server_main.py   |  28 +-
 .../0.1.0/configuration/ams-env.xml |  16 +
 .../0.1.0/configuration/ams-grafana-ini.xml |   2 +-
 .../0.1.0/configuration/ams-ssl-client.xml  |   3 +
 .../0.1.0/configuration/ams-ssl-server.xml  |   9 +
 .../0.1.0/package/scripts/metrics_grafana.py|   4 +-
 .../package/scripts/metrics_grafana_util.py |  42 ++
 .../0.1.0/package/scripts/params.py |  23 +-
 .../package/templates/metric_monitor.ini.j2 |   2 +
 .../DRUID/0.9.2/package/scripts/superset.py |   2 +-
 .../FLUME/1.4.0.2.0/metainfo.xml|   4 +
 .../HDFS/3.0.0.3.0/configuration/hdfs-log4j.xml |   1 +
 .../package/scripts/hive_interactive.py |   3 +-
 .../package/scripts/setup_ranger_knox.py|  18 +-
 .../common-services/LOGSEARCH/0.5.0/alerts.json |   2 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |   2 +-
 .../PXF/3.0.0/package/alerts/api_status.py  |  36 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py   |   6 +
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py |  15 +
 .../0.5.0.2.3/package/scripts/params.py |   5 +-
 .../0.60.0.2.2/package/scripts/service_check.py |   2 +-
 .../0.91.0.3.0/configuration/slider-client.xml  |  56 +++
 .../0.91.0.3.0/configuration/slider-env.xml |  46 +++
 .../0.91.0.3.0/configuration/slider-log4j.xml   |  92 +
 .../SLIDER/0.91.0.3.0

[09/50] ambari git commit: AMBARI-19835 HDP 3.0 support for Slider with configs, kerberos, widgets, metrics, quicklinks, and themes (dsen)

2017-03-14 Thread ncole

AMBARI-19835 HDP 3.0 support for Slider with configs, kerberos, widgets, 
metrics, quicklinks, and themes (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 528ac5c33d0549f18c5d4518478d274ce1551a15
Parents: 0d2f2c2
Author: Dmytro Sen 
Authored: Fri Mar 10 18:46:49 2017 +0200
Committer: Dmytro Sen 
Committed: Fri Mar 10 18:46:49 2017 +0200

--
 .../0.91.0.3.0/configuration/slider-client.xml  |  56 ++
 .../0.91.0.3.0/configuration/slider-env.xml |  46 
 .../0.91.0.3.0/configuration/slider-log4j.xml   |  92 
 .../SLIDER/0.91.0.3.0/kerberos.json |  17 +++
 .../SLIDER/0.91.0.3.0/metainfo.xml  | 109 +++
 .../package/files/hbaseSmokeVerify.sh   |  34 ++
 .../0.91.0.3.0/package/scripts/__init__.py  |  19 
 .../SLIDER/0.91.0.3.0/package/scripts/params.py |  54 +
 .../0.91.0.3.0/package/scripts/params_linux.py  |  80 ++
 .../package/scripts/params_windows.py   |  45 
 .../0.91.0.3.0/package/scripts/service_check.py |  63 +++
 .../SLIDER/0.91.0.3.0/package/scripts/slider.py |  96 
 .../0.91.0.3.0/package/scripts/slider_client.py |  71 
 .../package/templates/storm-slider-env.sh.j2|  38 +++
 .../stacks/HDP/3.0/services/SLIDER/metainfo.xml |  51 +
 15 files changed, 871 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/528ac5c3/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-client.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-client.xml
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-client.xml
new file mode 100644
index 000..adeba58
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-client.xml
@@ -0,0 +1,56 @@
+
+
+
+
+  
+  
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/528ac5c3/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-env.xml
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-env.xml
new file mode 100644
index 000..ce06a18
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-env.xml
@@ -0,0 +1,46 @@
+
+
+
+
+  
+  
+content
+slider-env template
+This is the jinja template for slider-env.sh 
file
+
+# Set Slider-specific environment variables here.
+
+# The only required environment variable is JAVA_HOME.  All others are
+# optional.  When running a distributed configuration it is best to
+# set JAVA_HOME in this file, so that it is correctly defined on
+# remote nodes.
+
+# The java implementation to use.  Required.
+export JAVA_HOME={{java64_home}}
+# The hadoop conf directory.  Optional as slider-client.xml can be edited to 
add properties.
+export HADOOP_CONF_DIR={{hadoop_conf_dir}}
+
+
+  content
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/528ac5c3/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-log4j.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-log4j.xml
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-log4j.xml
new file mode 100644
index 000..cd9b2a4
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/configuration/slider-log4j.xml
@@ -0,0 +1,92 @@
+
+
+
+
+  
+content
+slider-log4j template
+Custom log4j.properties
+
+# 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

[25/50] ambari git commit: AMBARI-20415. JS error when filtering config history table (onechiporenko)

2017-03-14 Thread ncole

AMBARI-20415. JS error when filtering config history table (onechiporenko)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: bc28cd782d1d7cd92c693e3a4884b0ea66ef3484
Parents: 938fed1
Author: Oleg Nechiporenko 
Authored: Mon Mar 13 13:38:22 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Mon Mar 13 16:40:38 2017 +0200

--
 ambari-web/app/mixins/common/table_server_view_mixin.js   | 6 ++
 ambari-web/app/views/main/dashboard/config_history_view.js| 4 
 ambari-web/test/mixins/common/table_server_view_mixin_test.js | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bc28cd78/ambari-web/app/mixins/common/table_server_view_mixin.js
--
diff --git a/ambari-web/app/mixins/common/table_server_view_mixin.js 
b/ambari-web/app/mixins/common/table_server_view_mixin.js
index d44a09e..a4e6db7 100644
--- a/ambari-web/app/mixins/common/table_server_view_mixin.js
+++ b/ambari-web/app/mixins/common/table_server_view_mixin.js
@@ -149,6 +149,12 @@ App.TableServerViewMixin = Em.Mixin.create({
   this.refresh();
 }
   },
+
+  /**
+   * Placeholder for `saveStartIndex`
+   */
+  saveStartIndex: Em.K,
+
   /**
* when new filter applied page index should be reset to first page
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/bc28cd78/ambari-web/app/views/main/dashboard/config_history_view.js
--
diff --git a/ambari-web/app/views/main/dashboard/config_history_view.js 
b/ambari-web/app/views/main/dashboard/config_history_view.js
index 7bd9e4a..0acf556 100644
--- a/ambari-web/app/views/main/dashboard/config_history_view.js
+++ b/ambari-web/app/views/main/dashboard/config_history_view.js
@@ -231,6 +231,10 @@ App.MainConfigHistoryView = 
App.TableView.extend(App.TableServerViewMixin, {
 App.loadTimer.finish('Config History Page');
   },
 
+  saveStartIndex: function() {
+App.db.setStartIndex(this.get('controller.name'), this.get('startIndex'));
+  }.observes('startIndex'),
+
   /**
* associations between host property and column index
* @type {Array}

http://git-wip-us.apache.org/repos/asf/ambari/blob/bc28cd78/ambari-web/test/mixins/common/table_server_view_mixin_test.js
--
diff --git a/ambari-web/test/mixins/common/table_server_view_mixin_test.js 
b/ambari-web/test/mixins/common/table_server_view_mixin_test.js
index ae750de..4c9db12 100644
--- a/ambari-web/test/mixins/common/table_server_view_mixin_test.js
+++ b/ambari-web/test/mixins/common/table_server_view_mixin_test.js
@@ -28,7 +28,6 @@ describe('App.MainConfigHistoryView', function() {
 filteredContent: [],
 refresh: Em.K,
 saveFilterConditions: Em.K,
-saveStartIndex: sinon.spy(),
 controller: Em.Object.create({
   name: 'mainConfigHistoryController',
   paginationProps: [
@@ -212,8 +211,10 @@ describe('App.MainConfigHistoryView', function() {
   describe('#resetStartIndex()', function() {
 beforeEach(function () {
   sinon.stub(view, 'updatePagination');
+  sinon.spy(view, 'saveStartIndex');
 });
 afterEach(function () {
+  view.saveStartIndex.restore();
   view.updatePagination.restore();
 });
 it('resetStartIndex is false and filteredCount is 0', function() {

[20/50] ambari git commit: AMBARI-20403 : Yarn Container metrics are not being collected by AMS (avijayan)

2017-03-14 Thread ncole

AMBARI-20403 : Yarn Container metrics are not being collected by AMS (avijayan)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: c4fce5383b650dc6e2480b554cb6832876ced311
Parents: b13467f
Author: Aravindan Vijayan 
Authored: Sun Mar 12 16:11:02 2017 -0700
Committer: Aravindan Vijayan 
Committed: Sun Mar 12 16:11:02 2017 -0700

--
 .../sink/timeline/AbstractTimelineMetricsSink.java  | 16 +---
 .../sink/timeline/HadoopTimelineMetricsSink.java| 15 +--
 .../metrics/system/impl/AmbariMetricSinkImpl.java   |  2 +-
 .../system/impl/TestAmbariMetricsSinkImpl.java  |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c4fce538/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
index a1fd008..46f32f9 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
@@ -209,7 +209,7 @@ public abstract class AbstractTimelineMetricsSink {
 }
   }
 
-  protected boolean emitMetrics(TimelineMetrics metrics) {
+  protected String getCurrentCollectorHost() {
 String collectorHost;
 // Get cached target
 if (targetCollectorHostSupplier != null) {
@@ -232,11 +232,14 @@ public abstract class AbstractTimelineMetricsSink {
   } else {
 
nullCollectorCounter.compareAndSet(NUMBER_OF_NULL_COLLECTOR_EXCEPTIONS, 0);
   }
-  return false;
 } else {
   nullCollectorCounter.set(0);
 }
+return collectorHost;
+  }
 
+  protected boolean emitMetrics(TimelineMetrics metrics) {
+String collectorHost = getCurrentCollectorHost();
 String connectUrl = getCollectorUri(collectorHost);
 String jsonData = null;
 LOG.debug("EmitMetrics connectUrl = "  + connectUrl);
@@ -499,15 +502,6 @@ public abstract class AbstractTimelineMetricsSink {
 return sb.toString();
   }
 
-  protected String constructContainerMetricUri(String protocol, String host, 
String port) {
-StringBuilder sb = new StringBuilder(protocol);
-sb.append("://");
-sb.append(host);
-sb.append(":");
-sb.append(port);
-sb.append(WS_V1_TIMELINE_METRICS);
-return sb.toString();
-  }
   /**
* Parses input Sting of format "host1,host2" into Collection of hostnames
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/c4fce538/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
index 6e0eba5..a112ef2 100644
--- 
a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
@@ -201,7 +201,7 @@ public class HadoopTimelineMetricsSink extends 
AbstractTimelineMetricsSink imple
   /**
* Parses input Stings array of format "host1,host2" into Collection of 
hostnames
*/
-  protected Collection parseHostsStringArrayIntoCollection(String[] 
hostStrings) {
+  protected Collection  parseHostsStringArrayIntoCollection(String[] 
hostStrings) {
 Collection result = new HashSet<>();
 if (hostStrings == null) return result;
 for (String s : hostStrings) {
@@ -428,11 +428,22 @@ public class HadoopTimelineMetricsSink extends 
AbstractTimelineMetricsSink imple
   LOG.error("Unable to parse container metrics ", e);
 }
 if (jsonData != null) {
-  // TODO: Container metrics should be able to utilize failover mechanism
+  String collectorHost = getCurrentCollectorHost();
+  containerMetricsUri = constructContainerMetricUri(protocol, 
collectorHost, port);

[43/50] ambari git commit: AMBARI-20410. Need to remove Tech Preview label from Hive View config for HSI. (dipayanb)

2017-03-14 Thread ncole

AMBARI-20410. Need to remove Tech Preview label from Hive View config for HSI. 
(dipayanb)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: c3b5615cdf38d9edc3aafd63808ccefa7901cb61
Parents: e2818c6
Author: Dipayan Bhowmick 
Authored: Tue Mar 14 17:01:29 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Tue Mar 14 17:06:55 2017 +0530

--
 contrib/views/hive-next/src/main/resources/view.xml | 2 +-
 contrib/views/hive20/src/main/resources/view.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3b5615c/contrib/views/hive-next/src/main/resources/view.xml
--
diff --git a/contrib/views/hive-next/src/main/resources/view.xml 
b/contrib/views/hive-next/src/main/resources/view.xml
index 4c131b5..2a4628f 100644
--- a/contrib/views/hive-next/src/main/resources/view.xml
+++ b/contrib/views/hive-next/src/main/resources/view.xml
@@ -226,7 +226,7 @@
 
 use.hive.interactive.mode
 Connects to the hive interactive server if set 
true
-Use Interactive Mode(Tech Preview)
+Use Interactive Mode
 false
 true
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c3b5615c/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 f0e9e34..8349b14 100644
--- a/contrib/views/hive20/src/main/resources/view.xml
+++ b/contrib/views/hive20/src/main/resources/view.xml
@@ -253,7 +253,7 @@
 
 use.hive.interactive.mode
 Connects to the hive interactive server if set 
true
-Use Interactive Mode(Tech Preview)
+Use Interactive Mode
 false
 true

[08/50] ambari git commit: AMBARI-20389. Fix superset start when username and password have special characters (Nishant Bangarwa via smohanty)

2017-03-14 Thread ncole

AMBARI-20389. Fix superset start when username and password have special 
characters (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/0d2f2c2b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d2f2c2b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d2f2c2b

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 0d2f2c2be5b41265c7769518ee8306a445b332b1
Parents: 1bc0f0a
Author: Sumit Mohanty 
Authored: Fri Mar 10 07:24:04 2017 -0800
Committer: Sumit Mohanty 
Committed: Fri Mar 10 07:24:39 2017 -0800

--
 .../common-services/DRUID/0.9.2/package/scripts/superset.py| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0d2f2c2b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/superset.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/superset.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/superset.py
index f0077fa..9173b09 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/superset.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/superset.py
@@ -76,7 +76,7 @@ class Superset(Script):
 # Initialize DB and create admin user.
 Execute(format("source {params.superset_config_dir}/superset-env.sh ; 
{params.superset_bin_dir}/superset db upgrade"),
 user=params.druid_user)
-Execute(format("source {params.superset_config_dir}/superset-env.sh ; 
{params.superset_bin_dir}/fabmanager create-admin --app superset --username 
{params.superset_admin_user} --password {params.superset_admin_password} 
--firstname {params.superset_admin_firstname} --lastname 
{params.superset_admin_lastname} --email {params.superset_admin_email}"),
+Execute(format("source {params.superset_config_dir}/superset-env.sh ; 
{params.superset_bin_dir}/fabmanager create-admin --app superset --username 
'{params.superset_admin_user}' --password '{params.superset_admin_password}' 
--firstname '{params.superset_admin_firstname}' --lastname 
'{params.superset_admin_lastname}' --email '{params.superset_admin_email}'"),
 user=params.druid_user)
 Execute(format("source {params.superset_config_dir}/superset-env.sh ; 
{params.superset_bin_dir}/superset init"),
 user=params.druid_user)

[06/50] ambari git commit: AMBARI-20387 - Upgrades on MySQL Should Also Drop Indexes With Foreign Key Names (jonathanhurley)

2017-03-14 Thread ncole

AMBARI-20387 - Upgrades on MySQL Should Also Drop Indexes With Foreign Key 
Names (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d4839a9bc2942cb5aca7659b95f59d6bcb9ff95d
Parents: eb41a37
Author: Jonathan Hurley 
Authored: Thu Mar 9 16:29:52 2017 -0500
Committer: Jonathan Hurley 
Committed: Fri Mar 10 08:44:44 2017 -0500

--
 .../apache/ambari/server/orm/DBAccessor.java| 11 ++--
 .../ambari/server/orm/DBAccessorImpl.java   | 29 +++-
 2 files changed, 24 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d4839a9b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index 5d9eb6c..c132a3d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -352,9 +352,14 @@ public interface DBAccessor {
   void dropSequence(String sequenceName) throws SQLException;
 
   /**
-   * Drop a FK constraint from table
-   * @param tableName name of the table
-   * @param constraintName name of the constraint
+   * Drops a FK constraint from a table. In the case of
+   * {@link DatabaseType#MYSQL}, this will also ensure that any associated
+   * indexes are also dropped.
+   *
+   * @param tableName
+   *  name of the table
+   * @param constraintName
+   *  name of the constraint
* @throws SQLException
*/
   void dropFKConstraint(String tableName, String constraintName) throws 
SQLException;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d4839a9b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 1c0ab30..1dd3b54 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -285,7 +285,7 @@ public class DBAccessorImpl implements DBAccessor {
 
   @Override
   public boolean tableHasColumn(String tableName, String... columnName) throws 
SQLException {
-List columnsList = new 
ArrayList(Arrays.asList(columnName));
+List columnsList = new ArrayList<>(Arrays.asList(columnName));
 DatabaseMetaData metaData = getDatabaseMetaData();
 
 CustomStringUtils.toUpperCase(columnsList);
@@ -376,11 +376,11 @@ public class DBAccessorImpl implements DBAccessor {
 ResultSet rs = metaData.getCrossReference(null, dbSchema, 
convertObjectName(referenceTableName),
 null, dbSchema, convertObjectName(tableName));
 
-List pkColumns = new ArrayList(referenceColumns.length);
+List pkColumns = new ArrayList<>(referenceColumns.length);
 for (String referenceColumn : referenceColumns) {
   pkColumns.add(convertObjectName(referenceColumn));
 }
-List fkColumns = new ArrayList(keyColumns.length);
+List fkColumns = new ArrayList<>(keyColumns.length);
 for (String keyColumn : keyColumns) {
   fkColumns.add(convertObjectName(keyColumn));
 }
@@ -888,23 +888,26 @@ public class DBAccessorImpl implements DBAccessor {
 dropFKConstraint(tableName, constraintName, false);
   }
 
+  /**
+   * {@inheritDoc}
+   */
   @Override
   public void dropFKConstraint(String tableName, String constraintName, 
boolean ignoreFailure) throws SQLException {
-// ToDo: figure out if name of index and constraint differs
 String checkedConstraintName = 
getCheckedForeignKey(convertObjectName(tableName), constraintName);
 if (checkedConstraintName != null) {
   String query = dbmsHelper.getDropFKConstraintStatement(tableName, 
checkedConstraintName);
   executeQuery(query, ignoreFailure);
+} else {
+  LOG.warn("Foreign key {} from {} table does not exist and will not be 
dropped",
+  constraintName, tableName);
+}
 
-  // MySQL also adds indexes in addition to the FK which should be dropped
-  Configuration.DatabaseType databaseType = 
configuration.getDatabaseType();
-  if (databaseType == DatabaseType.MYSQL) {
-query = dbmsHelper.getDropIndexStatement(constraintName, tableName);
+// even if the FK didn'

ambari git commit: AMBARI-20446 Clock widget is not displayed. (ababiichuk)

2017-03-14 Thread ababiichuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 1fc41441f -> 75f1a29e6


AMBARI-20446 Clock widget is not displayed. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 75f1a29e6c99cdbaf39a9e6afa6ba97fc81b1209
Parents: 1fc4144
Author: ababiichuk 
Authored: Tue Mar 14 18:49:01 2017 +0200
Committer: ababiichuk 
Committed: Tue Mar 14 18:49:01 2017 +0200

--
 ambari-web/app/styles/application.less | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/75f1a29e/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 151e404..2112c51 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -69,16 +69,6 @@ ul.typeahead.dropdown-menu {
   overflow: visible;
   padding-bottom: @footer-height;
   min-width: 980px;
-
-   .clock-view {
- top: 10px;
- left: 4px;
- position: fixed;
- color: red;
- font-weight: bold;
- padding: 4px;
- background-color: rgba(0, 0, 0, 0.6);
-  }
 }
 
 footer {
@@ -2661,3 +2651,13 @@ a.abort-icon:hover {
 text-transform: none;
   }
 }
+
+.clock-view {
+  bottom: 10px;
+  right: 4px;
+  position: fixed;
+  color: red;
+  font-weight: bold;
+  padding: 4px;
+  background-color: rgba(0, 0, 0, 0.6);
+}

ambari git commit: AMBARI-20442. Knox proxy - Navigating to Hive view from Hive Summary page is not working (Go to view link) (alexantonenko)

2017-03-14 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/trunk ece203b29 -> 1fc41441f


AMBARI-20442. Knox proxy - Navigating to Hive view from Hive Summary page is 
not working (Go to view link) (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 1fc41441f16a40950af9cc0530bb416ac6519ab7
Parents: ece203b
Author: Alex Antonenko 
Authored: Tue Mar 14 14:43:58 2017 +0200
Committer: Alex Antonenko 
Committed: Tue Mar 14 17:36:48 2017 +0200

--
 ambari-web/app/assets/test/tests.js |  1 +
 .../controllers/main/service/info/summary.js|  2 +-
 .../app/controllers/main/views_controller.js| 32 
 ambari-web/app/models.js|  1 +
 ambari-web/app/models/view_instance.js  | 81 
 .../templates/main/service/services/hive.hbs|  2 +-
 .../app/views/main/service/services/hive.js | 14 ++--
 .../controllers/main/views_controller_test.js   | 38 ++---
 ambari-web/test/models/view_instance_test.js| 59 ++
 9 files changed, 193 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1fc41441/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js 
b/ambari-web/app/assets/test/tests.js
index ab007f0..8fadb44 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -418,6 +418,7 @@ var files = [
   'test/models/stack_test',
   'test/models/stack_service_test',
   'test/models/user_test',
+  'test/models/view_instance_test',
   'test/models/widget_test',
   'test/models/widget_property_test',
   'test/models/host_stack_version_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/1fc41441/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 15f3861..1554c61 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -856,7 +856,7 @@ App.MainServiceInfoSummaryController = 
Em.Controller.extend(App.WidgetSectionMix
   },
 
   goToView: function(event) {
-App.router.route('main' + event.context.href);
+App.router.route(event.context.get('internalAmbariUrl'));
   }
 
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/1fc41441/ambari-web/app/controllers/main/views_controller.js
--
diff --git a/ambari-web/app/controllers/main/views_controller.js 
b/ambari-web/app/controllers/main/views_controller.js
index eb5775d..398cdd8 100644
--- a/ambari-web/app/controllers/main/views_controller.js
+++ b/ambari-web/app/controllers/main/views_controller.js
@@ -80,19 +80,20 @@ App.MainViewsController = Em.Controller.extend({
 data.items.forEach(function (view) {
   view.versions.forEach(function (version) {
 version.instances.forEach(function (instance) {
-  var current_instance = Em.Object.create({
-iconPath: instance.ViewInstanceInfo.icon_path || 
"/img/ambari-view-default.png",
-label: instance.ViewInstanceInfo.label || 
version.ViewVersionInfo.label || instance.ViewInstanceInfo.view_name,
-visible: instance.ViewInstanceInfo.visible || false,
-version: instance.ViewInstanceInfo.version,
-description: instance.ViewInstanceInfo.description || 
Em.I18n.t('views.main.instance.noDescription'),
-viewName: instance.ViewInstanceInfo.view_name,
-shortUrl:instance.ViewInstanceInfo.short_url,
-instanceName: instance.ViewInstanceInfo.instance_name,
-href: instance.ViewInstanceInfo.context_path + "/"
+  var info = instance.ViewInstanceInfo;
+  var currentInstance = App.ViewInstance.create({
+iconPath: info.icon_path || '/img/ambari-view-default.png',
+label: info.label || version.ViewVersionInfo.label || 
info.view_name,
+visible: info.visible || false,
+version: info.version,
+description: info.description || 
Em.I18n.t('views.main.instance.noDescription'),
+viewName: info.view_name,
+shortUrl:info.short_url,
+instanceName: info.instance_name,
+href: info.context_path + '/'
   });
-  if (current_instance.visible) {
-instances.push(current_insta

ambari git commit: AMBARI-20442. Knox proxy - Navigating to Hive view from Hive Summary page is not working (Go to view link) (alexantonenko)

2017-03-14 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 5cd4d0ee9 -> a526a07cb


AMBARI-20442. Knox proxy - Navigating to Hive view from Hive Summary page is 
not working (Go to view link) (alexantonenko)


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

Branch: refs/heads/branch-2.5
Commit: a526a07cb63155d6f3c218006f2932eb8b4ebebe
Parents: 5cd4d0e
Author: Alex Antonenko 
Authored: Tue Mar 14 14:46:53 2017 +0200
Committer: Alex Antonenko 
Committed: Tue Mar 14 17:35:53 2017 +0200

--
 ambari-web/app/assets/test/tests.js |  1 +
 .../controllers/main/service/info/summary.js|  2 +-
 .../app/controllers/main/views_controller.js| 32 
 ambari-web/app/models.js|  1 +
 ambari-web/app/models/view_instance.js  | 81 
 .../templates/main/service/services/hive.hbs|  2 +-
 .../app/views/main/service/services/hive.js | 14 ++--
 .../controllers/main/views_controller_test.js   | 38 ++---
 ambari-web/test/models/view_instance_test.js| 59 ++
 9 files changed, 193 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a526a07c/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js 
b/ambari-web/app/assets/test/tests.js
index 11ab9a5..3fd3157 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -386,6 +386,7 @@ var files = [
   'test/models/stack_test',
   'test/models/stack_service_test',
   'test/models/user_test',
+  'test/models/view_instance_test',
   'test/models/widget_test',
   'test/models/widget_property_test',
   'test/models/host_stack_version_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/a526a07c/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 7327255..4d21b10 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -855,7 +855,7 @@ App.MainServiceInfoSummaryController = 
Em.Controller.extend(App.WidgetSectionMix
   },
 
   goToView: function(event) {
-App.router.route('main' + event.context.href);
+App.router.route(event.context.get('internalAmbariUrl'));
   }
 
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/a526a07c/ambari-web/app/controllers/main/views_controller.js
--
diff --git a/ambari-web/app/controllers/main/views_controller.js 
b/ambari-web/app/controllers/main/views_controller.js
index e2e9281..8af470a 100644
--- a/ambari-web/app/controllers/main/views_controller.js
+++ b/ambari-web/app/controllers/main/views_controller.js
@@ -78,19 +78,20 @@ App.MainViewsController = Em.Controller.extend({
 data.items.forEach(function (view) {
   view.versions.forEach(function (version) {
 version.instances.forEach(function (instance) {
-  var current_instance = Em.Object.create({
-iconPath: instance.ViewInstanceInfo.icon_path || 
"/img/ambari-view-default.png",
-label: instance.ViewInstanceInfo.label || 
version.ViewVersionInfo.label || instance.ViewInstanceInfo.view_name,
-visible: instance.ViewInstanceInfo.visible || false,
-version: instance.ViewInstanceInfo.version,
-description: instance.ViewInstanceInfo.description || 
Em.I18n.t('views.main.instance.noDescription'),
-viewName: instance.ViewInstanceInfo.view_name,
-shortUrl:instance.ViewInstanceInfo.short_url,
-instanceName: instance.ViewInstanceInfo.instance_name,
-href: instance.ViewInstanceInfo.context_path + "/"
+  var info = instance.ViewInstanceInfo;
+  var currentInstance = App.ViewInstance.create({
+iconPath: info.icon_path || '/img/ambari-view-default.png',
+label: info.label || version.ViewVersionInfo.label || 
info.view_name,
+visible: info.visible || false,
+version: info.version,
+description: info.description || 
Em.I18n.t('views.main.instance.noDescription'),
+viewName: info.view_name,
+shortUrl:info.short_url,
+instanceName: info.instance_name,
+href: info.context_path + '/'
   });
-  if (current_instance.visible) {
-instances.push(cur

ambari git commit: AMBARI-20444 Services actions menu is not fully displayed under some circumstances. (ababiichuk)

2017-03-14 Thread ababiichuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 9dc4a3dfd -> ece203b29


AMBARI-20444 Services actions menu is not fully displayed under some 
circumstances. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: ece203b295bbacd7d069e74201381a5f07280d1e
Parents: 9dc4a3d
Author: ababiichuk 
Authored: Tue Mar 14 16:39:45 2017 +0200
Committer: ababiichuk 
Committed: Tue Mar 14 17:22:15 2017 +0200

--
 ambari-web/app/styles/theme/bootstrap-ambari.css| 12 ++--
 ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 12 +---
 2 files changed, 11 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ece203b2/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index a0b24e5..98606e9 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1148,14 +1148,22 @@ input.radio:checked + label:after {
   top: 0;
 }
 .navigation-bar-fit-height .side-nav-menu {
-  position: fixed;
+  position: absolute;
   top: 55px;
   bottom: 50px;
 }
 .navigation-bar-fit-height .side-nav-footer {
-  position: fixed;
+  position: absolute;
   bottom: 0;
 }
+.navigation-bar-fit-height .more-actions .dropdown-menu {
+  position: fixed;
+  top: auto;
+  left: auto;
+}
+.navigation-bar-fit-height .navigation-bar-container {
+  height: 100%;
+}
 .navigation-bar-fit-height .navigation-bar-container:not(.collapsed) 
.side-nav-menu {
   overflow-y: auto;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ece203b2/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index e75bd6b..1f61104 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -49,7 +49,7 @@
 $navigationContainer.find('li a').each(function (index, link) {
   var $link = $(link);
   var href = $link.attr('data-href') || $link.attr('href');
-  if (path.indexOf(href) !== -1 && !['', '#'].contains(href)) {
+  if (path.indexOf(href) !== -1 && ['', '#'].indexOf(href) === -1) {
 $link.parent().addClass('active');
   } else {
 $link.parent().removeClass('active');
@@ -124,16 +124,6 @@
   $moreActions.hover(function () {
 $(this).css('display', 'inline-block');
   });
-  $moreActions.on('click', function () {
-if (settings.fitHeight) {
-  // set actions submenu position
-  var $moreIcon = $(this);
-  var $header = $('.side-nav-header');
-  $moreIcon.children('.dropdown-menu').css('position', 'fixed');
-  $moreIcon.children('.dropdown-menu').css('top', 
$moreIcon.offset().top - $header.offset().top  + 20 + 'px');
-  $moreIcon.children('.dropdown-menu').css('left', 
$moreIcon.offset().left);
-}
-  });
   $moreActions.children('.dropdown-menu').on('click', function () {
 // some action was triggered, should hide this icon
 var moreIcon = $(this).parent();

ambari git commit: AMBARI-20408. Atlas MetaData server start fails while granting permissions to HBase tables after unkerberizing the cluster (rlevas)

2017-03-14 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a6eb31308 -> 5cd4d0ee9


AMBARI-20408. Atlas MetaData server start fails while granting permissions to 
HBase tables after unkerberizing the cluster (rlevas)


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

Branch: refs/heads/branch-2.5
Commit: 5cd4d0ee987e6e37529d70037ff69e0ca6d71163
Parents: a6eb313
Author: Robert Levas 
Authored: Tue Mar 14 11:09:55 2017 -0400
Committer: Robert Levas 
Committed: Tue Mar 14 11:09:55 2017 -0400

--
 .../server/controller/KerberosHelper.java   |  15 +-
 .../server/controller/KerberosHelperImpl.java   | 109 +++-
 .../AbstractPrepareKerberosServerAction.java| 262 ---
 .../PrepareDisableKerberosServerAction.java | 127 ++---
 .../PrepareEnableKerberosServerAction.java  |  33 ++-
 .../PrepareKerberosIdentitiesServerAction.java  | 142 +++---
 ...AbstractPrepareKerberosServerActionTest.java |  30 +--
 7 files changed, 304 insertions(+), 414 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5cd4d0ee/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
index 35235db..d000571 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
@@ -18,6 +18,12 @@
 
 package org.apache.ambari.server.controller;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.internal.RequestStageContainer;
 import org.apache.ambari.server.security.credential.PrincipalKeyCredential;
@@ -33,12 +39,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosConfigurationDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 public interface KerberosHelper {
   /**
* directive used to override the behavior of the 
kerberos-env/manage_identities property
@@ -293,8 +293,6 @@ public interface KerberosHelper {
* @param existingConfigurations the cluster's existing configurations
* @param kerberosConfigurations the configuration updates to make
* @param propertiesToIgnore the configuration properties that should be 
ignored when applying recommendations
-   * @param propertiesToInsert the configuration properties that must be 
inserted to cluster config are inserted
-   *   into this map in case if provided (not 
null) and kerberosEnabled = false
* @param propertiesToRemove the configuration properties that must be 
removed from cluster config are inserted
*   into this map in case if provided (not 
null) and kerberosEnabled
* @param kerberosEnabledtrue if kerberos is (to be) enabled; 
otherwise false
@@ -305,7 +303,6 @@ public interface KerberosHelper {
 Map> existingConfigurations,
 Map> kerberosConfigurations,
 Map> propertiesToIgnore,
-Map> propertiesToInsert,
 Map> propertiesToRemove,
 boolean 
kerberosEnabled)
   throws AmbariException;

http://git-wip-us.apache.org/repos/asf/ambari/blob/5cd4d0ee/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index c2fde46..4975e72 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -364,7 +36

ambari git commit: AMBARI-20408. Atlas MetaData server start fails while granting permissions to HBase tables after unkerberizing the cluster (rlevas)

2017-03-14 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/trunk 0c76e2f83 -> 9dc4a3dfd


AMBARI-20408. Atlas MetaData server start fails while granting permissions to 
HBase tables after unkerberizing the cluster (rlevas)


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

Branch: refs/heads/trunk
Commit: 9dc4a3dfd25f160ab7014bf78e98efa9237a0ebf
Parents: 0c76e2f
Author: Robert Levas 
Authored: Tue Mar 14 10:42:43 2017 -0400
Committer: Robert Levas 
Committed: Tue Mar 14 10:42:43 2017 -0400

--
 .../server/controller/KerberosHelper.java   |   3 -
 .../server/controller/KerberosHelperImpl.java   | 104 +++-
 .../AbstractPrepareKerberosServerAction.java| 237 ---
 .../PrepareDisableKerberosServerAction.java | 108 ++---
 .../PrepareEnableKerberosServerAction.java  |  19 +-
 .../PrepareKerberosIdentitiesServerAction.java  | 127 ++
 ...AbstractPrepareKerberosServerActionTest.java |  30 +--
 7 files changed, 257 insertions(+), 371 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9dc4a3df/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
index 0e27d03..d000571 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
@@ -293,8 +293,6 @@ public interface KerberosHelper {
* @param existingConfigurations the cluster's existing configurations
* @param kerberosConfigurations the configuration updates to make
* @param propertiesToIgnore the configuration properties that should be 
ignored when applying recommendations
-   * @param propertiesToInsert the configuration properties that must be 
inserted to cluster config are inserted
-   *   into this map in case if provided (not 
null) and kerberosEnabled = false
* @param propertiesToRemove the configuration properties that must be 
removed from cluster config are inserted
*   into this map in case if provided (not 
null) and kerberosEnabled
* @param kerberosEnabledtrue if kerberos is (to be) enabled; 
otherwise false
@@ -305,7 +303,6 @@ public interface KerberosHelper {
 Map> existingConfigurations,
 Map> kerberosConfigurations,
 Map> propertiesToIgnore,
-Map> propertiesToInsert,
 Map> propertiesToRemove,
 boolean 
kerberosEnabled)
   throws AmbariException;

http://git-wip-us.apache.org/repos/asf/ambari/blob/9dc4a3df/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index baa90e7..5204322 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -363,7 +363,7 @@ public class KerberosHelperImpl implements KerberosHelper {
 
 // If Ambari is managing it own identities then add AMBARI to the set of 
installed servcie so
 // that its Kerberos descriptor entries will be included.
-if(createAmbariIdentities(existingConfigurations.get("kerberos-env"))) {
+if (createAmbariIdentities(existingConfigurations.get("kerberos-env"))) {
   installedServices = new HashMap>(installedServices);
   installedServices.put("AMBARI", Collections.singleton("AMBARI_SERVER"));
 }
@@ -414,7 +414,7 @@ public class KerberosHelperImpl implements KerberosHelper {
 
 return (applyStackAdvisorUpdates)
 ? applyStackAdvisorUpdates(cluster, installedServices.keySet(), 
configurations, kerberosConfigurations, propertiesToIgnore,
-null, new HashMap>(), kerberosEnabled)
+new HashMap>(), kerberosEnabled)
 : kerberosConfigurations;
   }
 
@@ -4

ambari git commit: AMBARI-20428 UI - bugs with styles. (atkach)

2017-03-14 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/trunk 87e82c7c0 -> 0c76e2f83


AMBARI-20428 UI - bugs with styles. (atkach)


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

Branch: refs/heads/trunk
Commit: 0c76e2f837dcc02b72cf76e08583dbd09c2cbd6e
Parents: 87e82c7
Author: Andrii Tkach 
Authored: Tue Mar 14 15:43:17 2017 +0200
Committer: Andrii Tkach 
Committed: Tue Mar 14 15:43:35 2017 +0200

--
 .../src/main/resources/ui/admin-web/app/styles/main.css| 5 +
 .../resources/ui/admin-web/app/views/stackVersions/list.html   | 2 +-
 .../src/main/resources/ui/hive-web/app/styles/app.scss | 6 ++
 .../src/main/resources/ui/hive-web/app/templates/splash.hbs| 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c76e2f8/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css 
b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
index 95aa66b..882a4b4 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
@@ -1872,4 +1872,9 @@ legend {
 .spinner-container {
   text-align: center;
   padding-bottom: 10px;
+}
+
+.ellipsis-overflow {
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c76e2f8/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
index 120aed6..58326aa 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html
@@ -72,7 +72,7 @@
   
 {{repo.repository_version}}
   
-  
+  
 
   {{repo.cluster}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c76e2f8/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss
--
diff --git 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss
index 7598b0e..2fec04b 100644
--- a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss
+++ b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/styles/app.scss
@@ -714,3 +714,9 @@ pre.explainprint{
   color:#ddd;
   cursor: default;
 }
+
+#splash {
+  .table i {
+cursor: default;
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c76e2f8/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
--
diff --git 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
index 5612542..b6c59f3 100644
--- 
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
+++ 
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/templates/splash.hbs
@@ -17,7 +17,7 @@
 }}
 
 
-
+
   {{#if allTestsCompleted }}
 Service checks completed.
   {{else}}

ambari git commit: AMBARI-20416. Need some way to know a plan is vectorized (pallavkul)

2017-03-14 Thread pallavkul

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 8620f4c4e -> a6eb31308


AMBARI-20416. Need some way to know a plan is vectorized (pallavkul)


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

Branch: refs/heads/branch-2.5
Commit: a6eb313086dd03ac63fd8a9a6e57d0e8ff0b5270
Parents: 8620f4c
Author: pallavkul 
Authored: Tue Mar 14 17:16:14 2017 +0530
Committer: pallavkul 
Committed: Tue Mar 14 17:17:56 2017 +0530

--
 .../main/resources/ui/app/components/visual-explain.js| 10 +-
 .../hive20/src/main/resources/ui/app/routes/databases.js  |  4 +++-
 .../resources/ui/app/routes/databases/database/tables.js  |  4 +++-
 .../ui/app/templates/components/visual-explain-detail.hbs |  3 +++
 .../ui/app/templates/components/visual-explain.hbs|  2 +-
 .../resources/ui/app/utils/hive-explainer/renderer.js |  5 -
 .../resources/ui/app/utils/hive-explainer/transformer.js  |  1 +
 7 files changed, 24 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a6eb3130/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
index fd450cc..10ff616 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
@@ -29,6 +29,8 @@ export default Ember.Component.extend({
 
   explainDetailData: '',
 
+  vectorizedInfo: null,
+
   draggable: Ember.Object.create(),
 
   visualExplainInput: Ember.computed('visualExplainJson', function () {
@@ -39,8 +41,13 @@ export default Ember.Component.extend({
 
   didInsertElement() {
 this._super(...arguments);
-const onRequestDetail = data => this.set('explainDetailData', 
JSON.stringify( data, null, '  ') );
 const explainData = JSON.parse(this.get('visualExplainInput'));
+const onRequestDetail = (data, vectorized) => {
+  this.set('explainDetailData', JSON.stringify( data, null, '  ') );
+  console.log('vectorizedInfo', vectorized['Execution mode:']);
+  this.set('vectorizedInfo', vectorized['Execution mode:']);
+};
+
 // if(explainData) {
   explain(explainData, '#explain-container', onRequestDetail, 
this.get('draggable'));
 // }
@@ -68,6 +75,7 @@ export default Ember.Component.extend({
 closeModal(){
   this.set('showDetailsModal', false);
   this.set('explainDetailData', '');
+  this.set('vectorizedInfo', '');
   return false;
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6eb3130/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 02dbcac..185be01 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
@@ -34,7 +34,9 @@ export default Ember.Route.extend(UILoggerMixin, {
   },
 
   deactivate() {
-this.get('autoRefresh').stopDatabasesAutoRefresh();
+if(ENV.APP.SHOULD_AUTO_REFRESH_DATABASES) {
+  this.get('autoRefresh').stopDatabasesAutoRefresh();
+}
   },
 
   _databasesRefreshed() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6eb3130/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 f5940e3..0e9042e 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
@@ -32,7 +32,9 @@ export default Ember.Route.extend(UILoggerMixin, {
   },
 
   deactivate() {
-
this.get('autoRefresh').stopTablesAutoRefresh(this.controller.get('database.name'));
+if(ENV.APP.SHOULD_AUTO_REFRESH_TABLES) {
+  
this.get('autoRefresh').stopTablesAutoRefresh(this.controller.get('database.name'));
+}
   },
 
   tableRefreshStarting(databaseName) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6eb3130/contrib/views/hive20/src/main/resources/ui/app/templates/components/visual-expla

ambari git commit: AMBARI-20416. Need some way to know a plan is vectorized (pallavkul)

2017-03-14 Thread pallavkul

Repository: ambari
Updated Branches:
  refs/heads/trunk c3b5615cd -> 87e82c7c0


AMBARI-20416. Need some way to know a plan is vectorized (pallavkul)


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

Branch: refs/heads/trunk
Commit: 87e82c7c0dfa2c26560a1bdbc743b360eb787a3a
Parents: c3b5615
Author: pallavkul 
Authored: Tue Mar 14 17:16:14 2017 +0530
Committer: pallavkul 
Committed: Tue Mar 14 17:16:14 2017 +0530

--
 .../main/resources/ui/app/components/visual-explain.js| 10 +-
 .../hive20/src/main/resources/ui/app/routes/databases.js  |  4 +++-
 .../resources/ui/app/routes/databases/database/tables.js  |  4 +++-
 .../ui/app/templates/components/visual-explain-detail.hbs |  3 +++
 .../ui/app/templates/components/visual-explain.hbs|  2 +-
 .../resources/ui/app/utils/hive-explainer/renderer.js |  5 -
 .../resources/ui/app/utils/hive-explainer/transformer.js  |  1 +
 7 files changed, 24 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/87e82c7c/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
index fd450cc..10ff616 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/visual-explain.js
@@ -29,6 +29,8 @@ export default Ember.Component.extend({
 
   explainDetailData: '',
 
+  vectorizedInfo: null,
+
   draggable: Ember.Object.create(),
 
   visualExplainInput: Ember.computed('visualExplainJson', function () {
@@ -39,8 +41,13 @@ export default Ember.Component.extend({
 
   didInsertElement() {
 this._super(...arguments);
-const onRequestDetail = data => this.set('explainDetailData', 
JSON.stringify( data, null, '  ') );
 const explainData = JSON.parse(this.get('visualExplainInput'));
+const onRequestDetail = (data, vectorized) => {
+  this.set('explainDetailData', JSON.stringify( data, null, '  ') );
+  console.log('vectorizedInfo', vectorized['Execution mode:']);
+  this.set('vectorizedInfo', vectorized['Execution mode:']);
+};
+
 // if(explainData) {
   explain(explainData, '#explain-container', onRequestDetail, 
this.get('draggable'));
 // }
@@ -68,6 +75,7 @@ export default Ember.Component.extend({
 closeModal(){
   this.set('showDetailsModal', false);
   this.set('explainDetailData', '');
+  this.set('vectorizedInfo', '');
   return false;
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/87e82c7c/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 02dbcac..185be01 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
@@ -34,7 +34,9 @@ export default Ember.Route.extend(UILoggerMixin, {
   },
 
   deactivate() {
-this.get('autoRefresh').stopDatabasesAutoRefresh();
+if(ENV.APP.SHOULD_AUTO_REFRESH_DATABASES) {
+  this.get('autoRefresh').stopDatabasesAutoRefresh();
+}
   },
 
   _databasesRefreshed() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/87e82c7c/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 f5940e3..0e9042e 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
@@ -32,7 +32,9 @@ export default Ember.Route.extend(UILoggerMixin, {
   },
 
   deactivate() {
-
this.get('autoRefresh').stopTablesAutoRefresh(this.controller.get('database.name'));
+if(ENV.APP.SHOULD_AUTO_REFRESH_TABLES) {
+  
this.get('autoRefresh').stopTablesAutoRefresh(this.controller.get('database.name'));
+}
   },
 
   tableRefreshStarting(databaseName) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/87e82c7c/contrib/views/hive20/src/main/resources/ui/app/templates/components/visual-explain-detail.

ambari git commit: AMBARI-20410. Need to remove Tech Preview label from Hive View config for HSI. (dipayanb)

2017-03-14 Thread dbhowmick

Repository: ambari
Updated Branches:
  refs/heads/trunk e2818c61c -> c3b5615cd


AMBARI-20410. Need to remove Tech Preview label from Hive View config for HSI. 
(dipayanb)


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

Branch: refs/heads/trunk
Commit: c3b5615cdf38d9edc3aafd63808ccefa7901cb61
Parents: e2818c6
Author: Dipayan Bhowmick 
Authored: Tue Mar 14 17:01:29 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Tue Mar 14 17:06:55 2017 +0530

--
 contrib/views/hive-next/src/main/resources/view.xml | 2 +-
 contrib/views/hive20/src/main/resources/view.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3b5615c/contrib/views/hive-next/src/main/resources/view.xml
--
diff --git a/contrib/views/hive-next/src/main/resources/view.xml 
b/contrib/views/hive-next/src/main/resources/view.xml
index 4c131b5..2a4628f 100644
--- a/contrib/views/hive-next/src/main/resources/view.xml
+++ b/contrib/views/hive-next/src/main/resources/view.xml
@@ -226,7 +226,7 @@
 
 use.hive.interactive.mode
 Connects to the hive interactive server if set 
true
-Use Interactive Mode(Tech Preview)
+Use Interactive Mode
 false
 true
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c3b5615c/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 f0e9e34..8349b14 100644
--- a/contrib/views/hive20/src/main/resources/view.xml
+++ b/contrib/views/hive20/src/main/resources/view.xml
@@ -253,7 +253,7 @@
 
 use.hive.interactive.mode
 Connects to the hive interactive server if set 
true
-Use Interactive Mode(Tech Preview)
+Use Interactive Mode
 false
 true

ambari git commit: AMBARI-20410. Need to remove Tech Preview label from Hive View config for HSI. (dipayanb)

2017-03-14 Thread dbhowmick

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 bf03c8ee2 -> 8620f4c4e


AMBARI-20410. Need to remove Tech Preview label from Hive View config for HSI. 
(dipayanb)


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

Branch: refs/heads/branch-2.5
Commit: 8620f4c4ec30ca7257241bc70cd4eb8595b2254d
Parents: bf03c8e
Author: Dipayan Bhowmick 
Authored: Tue Mar 14 17:01:29 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Tue Mar 14 17:01:53 2017 +0530

--
 contrib/views/hive-next/src/main/resources/view.xml | 2 +-
 contrib/views/hive20/src/main/resources/view.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8620f4c4/contrib/views/hive-next/src/main/resources/view.xml
--
diff --git a/contrib/views/hive-next/src/main/resources/view.xml 
b/contrib/views/hive-next/src/main/resources/view.xml
index 4c131b5..2a4628f 100644
--- a/contrib/views/hive-next/src/main/resources/view.xml
+++ b/contrib/views/hive-next/src/main/resources/view.xml
@@ -226,7 +226,7 @@
 
 use.hive.interactive.mode
 Connects to the hive interactive server if set 
true
-Use Interactive Mode(Tech Preview)
+Use Interactive Mode
 false
 true
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8620f4c4/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 f0e9e34..8349b14 100644
--- a/contrib/views/hive20/src/main/resources/view.xml
+++ b/contrib/views/hive20/src/main/resources/view.xml
@@ -253,7 +253,7 @@
 
 use.hive.interactive.mode
 Connects to the hive interactive server if set 
true
-Use Interactive Mode(Tech Preview)
+Use Interactive Mode
 false
 true

ambari git commit: AMBARI-20441. Alert Definition "Last Changed" field is shown incorrect if alert wan't triggered any time (onechiporenko)

2017-03-14 Thread onechiporenko

Repository: ambari
Updated Branches:
  refs/heads/trunk 645407b65 -> e2818c61c


AMBARI-20441. Alert Definition "Last Changed" field is shown incorrect if alert 
wan't triggered any time (onechiporenko)


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

Branch: refs/heads/trunk
Commit: e2818c61c15ec703e15581ca149c27bbfb7c1909
Parents: 645407b
Author: Oleg Nechiporenko 
Authored: Tue Mar 14 11:32:45 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Tue Mar 14 11:32:45 2017 +0200

--
 ambari-web/app/models/alerts/alert_definition.js  | 3 ++-
 .../main/service/configs/component_actions_by_configs_test.js | 2 +-
 ambari-web/test/models/alerts/alert_definition_test.js| 7 +++
 3 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/app/models/alerts/alert_definition.js
--
diff --git a/ambari-web/app/models/alerts/alert_definition.js 
b/ambari-web/app/models/alerts/alert_definition.js
index b55ef1b..09089e6 100644
--- a/ambari-web/app/models/alerts/alert_definition.js
+++ b/ambari-web/app/models/alerts/alert_definition.js
@@ -100,7 +100,8 @@ App.AlertDefinition = DS.Model.extend({
* @type {string}
*/
   lastTriggeredFormatted: function () {
-return dateUtils.dateFormat(this.get('lastTriggered'));
+let lastTriggered = this.get('lastTriggered');
+return lastTriggered ? dateUtils.dateFormat(lastTriggered) : '';
   }.property('lastTriggered'),
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
--
diff --git 
a/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
 
b/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
index f987c52..9a73a9a 100644
--- 
a/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
+++ 
b/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js
@@ -226,7 +226,7 @@ describe('App.ComponentActionsByConfigs', function () {
 name: 'common.batch.request_schedules',
 sender: mixin,
 data: {
-  intervalTimeSeconds: 1,
+  intervalTimeSeconds: 60,
   tolerateSize: 0,
   batches: [{}, {}]
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/test/models/alerts/alert_definition_test.js
--
diff --git a/ambari-web/test/models/alerts/alert_definition_test.js 
b/ambari-web/test/models/alerts/alert_definition_test.js
index 3d8b62d..26309ae 100644
--- a/ambari-web/test/models/alerts/alert_definition_test.js
+++ b/ambari-web/test/models/alerts/alert_definition_test.js
@@ -175,6 +175,13 @@ describe('App.AlertDefinition', function () {
 RECOVERY: 'glyphicon glyphicon-oil'
   }});
 
+  describe('#lastTriggeredFormatted', function () {
+it('should be empty', function () {
+  model.set('lastTriggered', 0);
+  expect(model.get('lastTriggeredFormatted')).to.be.equal('');
+});
+  });
+
   describe('REOPEN', function () {
 
 describe('#getSortDefinitionsByStatus', function () {

[2/2] ambari git commit: AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during stack upgrade (r-kamath)

2017-03-14 Thread rkamath

AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during 
stack upgrade (r-kamath)


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

Branch: refs/heads/trunk
Commit: 645407b65558110a5fa6306c034d73c09ba2bfe6
Parents: efd3b58
Author: Renjith Kamath 
Authored: Tue Mar 14 14:36:12 2017 +0530
Committer: Renjith Kamath 
Committed: Tue Mar 14 14:37:15 2017 +0530

--
 .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/645407b6/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 a460aec..38bfeb4 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
@@ -309,12 +309,12 @@ class Master(Script):
 config_data = self.get_interpreter_settings()
 interpreter_settings = config_data['interpreterSettings']
 
-if 'spark2-env' in params.config['configurations']:
+if 'spark2-defaults' in params.config['configurations']:
   spark2_config = self.get_spark2_interpreter_config()
   config_id = spark2_config["id"]
   interpreter_settings[config_id] = spark2_config
 
-if 'livy2-env' in params.config['configurations']:
+if 'livy2-defaults' in params.config['configurations']:
   livy2_config = self.get_livy2_interpreter_config()
   config_id = livy2_config["id"]
   interpreter_settings[config_id] = livy2_config

[1/2] ambari git commit: AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during stack upgrade (r-kamath)

2017-03-14 Thread rkamath

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 b6b8e1c7a -> bf03c8ee2
  refs/heads/trunk efd3b5847 -> 645407b65


AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during 
stack upgrade (r-kamath)


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

Branch: refs/heads/branch-2.5
Commit: bf03c8ee2ce1e678d2f8241244aba8e54bf6b807
Parents: b6b8e1c
Author: Renjith Kamath 
Authored: Tue Mar 14 14:36:12 2017 +0530
Committer: Renjith Kamath 
Committed: Tue Mar 14 14:36:12 2017 +0530

--
 .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bf03c8ee/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 a460aec..38bfeb4 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
@@ -309,12 +309,12 @@ class Master(Script):
 config_data = self.get_interpreter_settings()
 interpreter_settings = config_data['interpreterSettings']
 
-if 'spark2-env' in params.config['configurations']:
+if 'spark2-defaults' in params.config['configurations']:
   spark2_config = self.get_spark2_interpreter_config()
   config_id = spark2_config["id"]
   interpreter_settings[config_id] = spark2_config
 
-if 'livy2-env' in params.config['configurations']:
+if 'livy2-defaults' in params.config['configurations']:
   livy2_config = self.get_livy2_interpreter_config()
   config_id = livy2_config["id"]
   interpreter_settings[config_id] = livy2_config

69 matches

Mail list logo