ambari git commit: AMBARI-13676. Unit tests are consistently failing on builds.apache.org (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 a5c8dfc58 -> f024718c6


AMBARI-13676. Unit tests are consistently failing on builds.apache.org 
(aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: f024718c640baafac9495259cc8af3ece7496c0b
Parents: a5c8dfc
Author: Andrew Onishuk 
Authored: Mon Nov 2 15:52:17 2015 +0200
Committer: Andrew Onishuk 
Committed: Mon Nov 2 15:53:00 2015 +0200

--
 .../metrics/timeline/TestClusterSuite.java  |  2 ++
 ...ClusterStackVersionResourceProviderTest.java | 16 +++--
 .../internal/UpgradeResourceProviderTest.java   | 10 +++---
 .../cache/TimelineMetricCacheSizingTest.java|  2 ++
 .../stacks/2.1/STORM/test_storm_drpc_server.py  |  6 ++--
 .../stacks/2.1/STORM/test_storm_nimbus.py   |  8 ++---
 .../2.1/STORM/test_storm_rest_api_service.py| 38 
 .../stacks/2.1/STORM/test_storm_supervisor.py   |  8 ++---
 .../stacks/2.1/STORM/test_storm_ui_server.py| 14 
 9 files changed, 41 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f024718c/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
index 640604d..8405b49 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
@@ -18,11 +18,13 @@
 package 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline;
 
 
+import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 import static org.junit.runners.Suite.SuiteClasses;
 
+@Ignore
 @RunWith(Suite.class)
 @SuiteClasses({ITMetricAggregator.class, ITClusterAggregator.class, 
ITPhoenixHBaseAccessor.class})
 public class TestClusterSuite {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f024718c/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
index afa1fa2..0188702 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
@@ -71,6 +71,7 @@ import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.MaintenanceState;
+import org.apache.ambari.server.state.RepositoryVersionState;
 import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.ServiceOsSpecific;
@@ -257,10 +258,18 @@ public class ClusterStackVersionResourceProviderTest {
 
 
expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes();
 
+ClusterEntity clusterEntity = new ClusterEntity();
+clusterEntity.setClusterId(1l);
+clusterEntity.setClusterName(clusterName);
+ClusterVersionEntity cve = new ClusterVersionEntity(clusterEntity,
+repoVersion, RepositoryVersionState.INSTALL_FAILED, 0, "");
+
expect(clusterVersionDAO.findByClusterAndStackAndVersion(anyObject(String.class),
+anyObject(StackId.class), anyObject(String.class))).andReturn(cve);
+
 // replay
 replay(managementController, response, clusters, resourceProviderFactory, 
csvResourceProvider,
 cluster, repositoryVersionDAOMock, configHelper, sch, actionManager,
-executionCommand, executionCommandWrapper,stage, 

ambari git commit: AMBARI-13676. Unit tests are consistently failing on builds.apache.org (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0f0cf13d7 -> a6f9562d3


AMBARI-13676. Unit tests are consistently failing on builds.apache.org 
(aonishuk)


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

Branch: refs/heads/trunk
Commit: a6f9562d38cbe0cd7700df4c6e426dd9a05c837a
Parents: 0f0cf13
Author: Andrew Onishuk 
Authored: Mon Nov 2 15:53:36 2015 +0200
Committer: Andrew Onishuk 
Committed: Mon Nov 2 15:53:36 2015 +0200

--
 .../metrics/timeline/TestClusterSuite.java   | 2 ++
 .../timeline/cache/TimelineMetricCacheSizingTest.java| 2 ++
 .../src/test/python/stacks/2.1/STORM/test_storm_nimbus.py| 8 
 .../test/python/stacks/2.1/STORM/test_storm_supervisor.py| 8 
 .../src/test/python/stacks/2.1/STORM/test_storm_ui_server.py | 8 
 5 files changed, 16 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a6f9562d/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
index 640604d..8405b49 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestClusterSuite.java
@@ -18,11 +18,13 @@
 package 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline;
 
 
+import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 import static org.junit.runners.Suite.SuiteClasses;
 
+@Ignore
 @RunWith(Suite.class)
 @SuiteClasses({ITMetricAggregator.class, ITClusterAggregator.class, 
ITPhoenixHBaseAccessor.class})
 public class TestClusterSuite {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6f9562d/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java
index 69dcff3..51f16ce 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java
@@ -24,6 +24,7 @@ import org.apache.ambari.server.controller.spi.TemporalInfo;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import java.util.HashSet;
 import java.util.Set;
@@ -55,6 +56,7 @@ public class TimelineMetricCacheSizingTest {
 return metric;
   }
 
+  @Ignore
   @Test
   public void testTimelineMetricCacheSizing() throws Exception {
 Set metricNames = new HashSet<>();

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6f9562d/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py 
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
index d80dde7..4c12470 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
@@ -66,8 +66,8 @@ class TestStormNimbus(TestStormBase):
 
   @patch("os.path.exists")
   def test_stop_default(self, path_exists_mock):
-# Last bool is for the pid file
-path_exists_mock.side_effect = [False, False, True]
+# Bool for the pid file
+path_exists_mock.side_effect = [True]
 self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nimbus.py",
classname = "Nimbus",

ambari git commit: AMBARI-13677. hive.server2.logging.operation.log.location incorrectly set in ambari.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 f024718c6 -> 915b05e0b


AMBARI-13677. hive.server2.logging.operation.log.location incorrectly set in 
ambari.(vbrodetskyi)


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

Branch: refs/heads/branch-2.1
Commit: 915b05e0bb62c611f121cecfd876eada2c1c8ad4
Parents: f024718
Author: Vitaly Brodetskyi 
Authored: Mon Nov 2 17:47:03 2015 +0200
Committer: Vitaly Brodetskyi 
Committed: Mon Nov 2 17:47:03 2015 +0200

--
 .../server/upgrade/UpgradeCatalog213.java   |  54 ++---
 .../services/HIVE/configuration/hive-site.xml   |   2 +-
 .../catalog/UpgradeCatalog_1.3_to_2.2.json  |   2 +-
 .../catalog/UpgradeCatalog_2.0_to_2.2.2.json|   2 +-
 .../catalog/UpgradeCatalog_2.0_to_2.2.4.json|   2 +-
 .../catalog/UpgradeCatalog_2.0_to_2.2.json  |   2 +-
 .../catalog/UpgradeCatalog_2.1_to_2.2.2.json|   2 +-
 .../catalog/UpgradeCatalog_2.1_to_2.2.4.json|   2 +-
 .../catalog/UpgradeCatalog_2.1_to_2.2.json  |   2 +-
 .../catalog/UpgradeCatalog_2.1_to_2.3.json  |   2 +-
 .../server/upgrade/UpgradeCatalog213Test.java   | 116 ++-
 .../python/stacks/2.2/configs/hive-upgrade.json |   2 +-
 .../journalnode-upgrade-hdfs-secure.json|   2 +-
 .../stacks/2.2/configs/journalnode-upgrade.json |   2 +-
 14 files changed, 131 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/915b05e0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 5f57b3e..2823a07 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -18,20 +18,11 @@
 
 package org.apache.ambari.server.upgrade;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
@@ -69,11 +60,19 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 /**
  * Upgrade catalog for version 2.1.3.
@@ -87,10 +86,12 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
   private static final String AMS_ENV = "ams-env";
   private static final String AMS_HBASE_ENV = "ams-hbase-env";
   private static final String HBASE_ENV_CONFIG = "hbase-env";
+  private static final String HIVE_SITE_CONFIG = "hive-site";
   private static final String RANGER_ENV_CONFIG = "ranger-env";
   private static final String ZOOKEEPER_LOG4J_CONFIG = "zookeeper-log4j";
   private static final String HADOOP_ENV_CONFIG = "hadoop-env";
   private static final String NIMBS_MONITOR_FREQ_SECS_PROPERTY = 
"nimbus.monitor.freq.secs";
+  private static final String HIVE_SERVER2_OPERATION_LOG_LOCATION_PROPERTY = 
"hive.server2.logging.operation.log.location";
   private static final String CONTENT_PROPERTY = "content";
   private static final String HADOOP_ENV_CONTENT_TO_APPEND = "\n{% if 
is_datanode_max_locked_memory_set %}\n" +
 "# Fix temporary bug, when ulimit from 
conf files is not picked up, without full relogin. \n" +
@@ -271,6 +272,7 @@ public class 

ambari git commit: AMBARI-13525 Exception in collector logs for JOIN queries (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/trunk 223247120 -> 646de5754


AMBARI-13525 Exception in collector logs for JOIN queries (dsen)


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

Branch: refs/heads/trunk
Commit: 646de5754fd031270ed265cf7332a925ada24df2
Parents: 2232471
Author: Dmytro Sen 
Authored: Mon Nov 2 18:08:47 2015 +0200
Committer: Dmytro Sen 
Committed: Mon Nov 2 18:08:47 2015 +0200

--
 .../metrics/timeline/PhoenixHBaseAccessor.java  | 22 
 .../timeline/query/PhoenixTransactSQL.java  | 20 ++-
 .../timeline/PhoenixHBaseAccessorTest.java  | 58 ++--
 .../timeline/TestPhoenixTransactSQL.java| 24 
 .../0.1.0/configuration/ams-hbase-site.xml  | 22 +++-
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  4 ++
 .../stacks/2.2/common/test_stack_advisor.py |  1 +
 7 files changed, 145 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/646de575/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
index 214cf1d..3ce30fd 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
@@ -21,6 +21,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.util.RetryCounter;
 import org.apache.hadoop.hbase.util.RetryCounterFactory;
 import org.apache.hadoop.metrics2.sink.timeline.Precision;
@@ -39,6 +40,7 @@ import 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.PhoenixTransactSQL;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.SplitByMetricNamesCondition;
 import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
+import org.apache.phoenix.exception.PhoenixIOException;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
@@ -463,6 +465,26 @@ public class PhoenixHBaseAccessor {
 }
   }
 
+} catch (PhoenixIOException pioe) {
+  Throwable pioe2 = pioe.getCause();
+  // Need to find out if this is exception "Could not find hash cache
+  // for joinId" or another PhoenixIOException
+  if (pioe2 instanceof PhoenixIOException &&
+pioe2.getCause() instanceof DoNotRetryIOException) {
+String className = null;
+for (StackTraceElement ste : pioe2.getCause().getStackTrace()) {
+  className = ste.getClassName();
+}
+
+if (className != null && className.equals("HashJoinRegionScanner")) {
+  LOG.error("The cache might have expired and have been removed. Try 
to" +
+" increase the cache size by setting bigger value for " +
+"phoenix.coprocessor.maxMetaDataCacheSize in ams-hbase-site 
config." +
+" Falling back to sort-merge join algorithm.");
+  PhoenixTransactSQL.setSortMergeJoinEnabled(true);
+}
+  }
+  throw pioe;
 } catch (RuntimeException ex) {
   // We need to find out if this is a real IO exception
   // or exception "maxStamp is smaller than minStamp"

http://git-wip-us.apache.org/repos/asf/ambari/blob/646de575/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
 

ambari git commit: AMBARI-13629 Oozie service have required, empty configs:oozie.authentication.kerberos.name.rules (after upgrade from 2.1.1 to 2.1.2.1) (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 4eb2b31ff -> ef9afb28c


AMBARI-13629 Oozie service have required, empty 
configs:oozie.authentication.kerberos.name.rules (after upgrade from 2.1.1 to 
2.1.2.1) (dsen)


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

Branch: refs/heads/branch-2.1.2
Commit: ef9afb28c1a9767a112f8063df3d1470cda90b99
Parents: 4eb2b31
Author: Dmytro Sen 
Authored: Mon Nov 2 20:18:13 2015 +0200
Committer: Dmytro Sen 
Committed: Mon Nov 2 20:19:41 2015 +0200

--
 .../org/apache/ambari/server/upgrade/UpgradeCatalog2121.java | 2 +-
 .../org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ef9afb28/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
index be88597..c5f2327 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
@@ -184,7 +184,7 @@ public class UpgradeCatalog2121 extends 
AbstractUpgradeCatalog {
 if (StringUtils.isBlank(oozieAuthKerbRules)) {
   Set removeProperties = new HashSet();
   removeProperties.add(OOZIE_AUTHENTICATION_KERBEROS_NAME_RULES);
-  updateConfigurationPropertiesForCluster(cluster, OOZIE_SITE_CONFIG, 
null, removeProperties, true, false);
+  updateConfigurationPropertiesForCluster(cluster, OOZIE_SITE_CONFIG, 
new HashMap(), removeProperties, true, false);
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ef9afb28/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
index 3bef3a3..249647b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
@@ -119,7 +119,7 @@ public class UpgradeCatalog2121Test {
 final Clusters mockClusters = 
easyMockSupport.createStrictMock(Clusters.class);
 final Cluster mockClusterExpected = 
easyMockSupport.createNiceMock(Cluster.class);
 final Map propertiesOozieSite = new HashMap() {{
-  put("oozie.authentication.kerberos.name.rules", " ");
+  put("oozie.authentication.kerberos.name.rules", "\n ");
 }};
 final Config oozieSiteConf = easyMockSupport.createNiceMock(Config.class);
 final Injector mockInjector = Guice.createInjector(new AbstractModule() {
@@ -148,7 +148,7 @@ public class UpgradeCatalog2121Test {
 Map.class, Set.class, boolean.class, boolean.class)
 .createMock();
 
upgradeCatalog2121.updateConfigurationPropertiesForCluster(mockClusterExpected,
-"oozie-site", null, 
Collections.singleton("oozie.authentication.kerberos.name.rules"),
+"oozie-site", new HashMap(), 
Collections.singleton("oozie.authentication.kerberos.name.rules"),
 true, false);
 expectLastCall().once();
 

ambari git commit: AMBARI-13629 Oozie service have required, empty configs:oozie.authentication.kerberos.name.rules (after upgrade from 2.1.1 to 2.1.2.1) (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 f98f37767 -> 61ff1a756


AMBARI-13629 Oozie service have required, empty 
configs:oozie.authentication.kerberos.name.rules (after upgrade from 2.1.1 to 
2.1.2.1) (dsen)


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

Branch: refs/heads/branch-2.1
Commit: 61ff1a756a436f53a1617b96dfc2f8b1d97afe38
Parents: f98f377
Author: Dmytro Sen 
Authored: Mon Nov 2 20:16:38 2015 +0200
Committer: Dmytro Sen 
Committed: Mon Nov 2 20:18:13 2015 +0200

--
 .../org/apache/ambari/server/upgrade/UpgradeCatalog2121.java | 2 +-
 .../org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/61ff1a75/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
index be88597..c5f2327 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
@@ -184,7 +184,7 @@ public class UpgradeCatalog2121 extends 
AbstractUpgradeCatalog {
 if (StringUtils.isBlank(oozieAuthKerbRules)) {
   Set removeProperties = new HashSet();
   removeProperties.add(OOZIE_AUTHENTICATION_KERBEROS_NAME_RULES);
-  updateConfigurationPropertiesForCluster(cluster, OOZIE_SITE_CONFIG, 
null, removeProperties, true, false);
+  updateConfigurationPropertiesForCluster(cluster, OOZIE_SITE_CONFIG, 
new HashMap(), removeProperties, true, false);
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/61ff1a75/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
index 3bef3a3..249647b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
@@ -119,7 +119,7 @@ public class UpgradeCatalog2121Test {
 final Clusters mockClusters = 
easyMockSupport.createStrictMock(Clusters.class);
 final Cluster mockClusterExpected = 
easyMockSupport.createNiceMock(Cluster.class);
 final Map propertiesOozieSite = new HashMap() {{
-  put("oozie.authentication.kerberos.name.rules", " ");
+  put("oozie.authentication.kerberos.name.rules", "\n ");
 }};
 final Config oozieSiteConf = easyMockSupport.createNiceMock(Config.class);
 final Injector mockInjector = Guice.createInjector(new AbstractModule() {
@@ -148,7 +148,7 @@ public class UpgradeCatalog2121Test {
 Map.class, Set.class, boolean.class, boolean.class)
 .createMock();
 
upgradeCatalog2121.updateConfigurationPropertiesForCluster(mockClusterExpected,
-"oozie-site", null, 
Collections.singleton("oozie.authentication.kerberos.name.rules"),
+"oozie-site", new HashMap(), 
Collections.singleton("oozie.authentication.kerberos.name.rules"),
 true, false);
 expectLastCall().once();
 

ambari git commit: AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> HDP-2.3 (jluniya)

[jluniya]

Repository: ambari
Updated Branches:
  refs/heads/trunk bb5c8975f -> b38be7fc9


AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> 
HDP-2.3 (jluniya)


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

Branch: refs/heads/trunk
Commit: b38be7fc9abcd72ccc1cbe61b7ba0d071a213f0b
Parents: bb5c897
Author: Jayush Luniya 
Authored: Mon Nov 2 22:05:49 2015 -0800
Committer: Jayush Luniya 
Committed: Mon Nov 2 22:05:49 2015 -0800

--
 .../ambari/server/api/handlers/CreateHandler.java   |  2 +-
 .../internal/ClusterStackVersionResourceProvider.java   | 12 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b38be7fc/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
index c1bd91b..9690bcd 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
@@ -54,7 +54,7 @@ public class CreateHandler extends BaseManagementHandler {
   result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.NOT_FOUND, 
e.getMessage()));
 } catch (SystemException e) {
   if (LOG.isErrorEnabled()) {
-LOG.error("Caught a system exception while attempting to create a 
resource", e.getMessage());
+LOG.error("Caught a system exception while attempting to create a 
resource: {}", e.getMessage());
   }
   result = new ResultImpl(new 
ResultStatus(ResultStatus.STATUS.SERVER_ERROR, e.getMessage()));
 } catch (ResourceAlreadyExistsException e) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b38be7fc/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index adae105..22212bf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -383,10 +383,10 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
   // Create next stage
   String stageName;
   if (batchCount > 1) {
-stageName = INSTALL_PACKAGES_FULL_NAME;
-  } else {
 stageName = String.format(INSTALL_PACKAGES_FULL_NAME + ". Batch %d of 
%d", batchId,
 batchCount);
+  } else {
+stageName = INSTALL_PACKAGES_FULL_NAME;
   }
 
   Stage stage = stageFactory.createNew(req.getId(), "/tmp/ambari", 
cluster.getClusterName(),
@@ -414,7 +414,6 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 } else {
   directTransitions.add(host);
 }
-
   }
 }
 
@@ -550,8 +549,11 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 componentInfo = ami.getComponent(stackId.getStackName(),
 stackId.getStackVersion(), component.getServiceName(), 
component.getServiceComponentName());
   } catch (AmbariException e) {
-throw new SystemException(String.format("Exception while accessing 
component %s of service %s for stack %s",
-component.getServiceName(), 
component.getServiceComponentName(), stackId));
+// It is possible that the component has been removed from the new 
stack
+// (example: STORM_REST_API has been removed from HDP-2.2)
+LOG.warn(String.format("Exception while accessing component %s of 
service %s for stack %s",
+component.getServiceComponentName(), component.getServiceName(), 
stackId));
+continue;
   }
   if (componentInfo.isVersionAdvertised()) {
 return true;

ambari git commit: Revert "AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> HDP-2.3 (jluniya)"

[jluniya]

Repository: ambari
Updated Branches:
  refs/heads/trunk b38be7fc9 -> 8098e39de


Revert "AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for 
HDP-2.1-> HDP-2.3 (jluniya)"

This reverts commit b38be7fc9abcd72ccc1cbe61b7ba0d071a213f0b.


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

Branch: refs/heads/trunk
Commit: 8098e39dedc2035f4e97adfe646965a9a326b128
Parents: b38be7f
Author: Jayush Luniya 
Authored: Mon Nov 2 22:08:32 2015 -0800
Committer: Jayush Luniya 
Committed: Mon Nov 2 22:08:32 2015 -0800

--
 .../ambari/server/api/handlers/CreateHandler.java   |  2 +-
 .../internal/ClusterStackVersionResourceProvider.java   | 12 +---
 2 files changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8098e39d/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
index 9690bcd..c1bd91b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
@@ -54,7 +54,7 @@ public class CreateHandler extends BaseManagementHandler {
   result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.NOT_FOUND, 
e.getMessage()));
 } catch (SystemException e) {
   if (LOG.isErrorEnabled()) {
-LOG.error("Caught a system exception while attempting to create a 
resource: {}", e.getMessage());
+LOG.error("Caught a system exception while attempting to create a 
resource", e.getMessage());
   }
   result = new ResultImpl(new 
ResultStatus(ResultStatus.STATUS.SERVER_ERROR, e.getMessage()));
 } catch (ResourceAlreadyExistsException e) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8098e39d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 22212bf..adae105 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -383,10 +383,10 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
   // Create next stage
   String stageName;
   if (batchCount > 1) {
+stageName = INSTALL_PACKAGES_FULL_NAME;
+  } else {
 stageName = String.format(INSTALL_PACKAGES_FULL_NAME + ". Batch %d of 
%d", batchId,
 batchCount);
-  } else {
-stageName = INSTALL_PACKAGES_FULL_NAME;
   }
 
   Stage stage = stageFactory.createNew(req.getId(), "/tmp/ambari", 
cluster.getClusterName(),
@@ -414,6 +414,7 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 } else {
   directTransitions.add(host);
 }
+
   }
 }
 
@@ -549,11 +550,8 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 componentInfo = ami.getComponent(stackId.getStackName(),
 stackId.getStackVersion(), component.getServiceName(), 
component.getServiceComponentName());
   } catch (AmbariException e) {
-// It is possible that the component has been removed from the new 
stack
-// (example: STORM_REST_API has been removed from HDP-2.2)
-LOG.warn(String.format("Exception while accessing component %s of 
service %s for stack %s",
-component.getServiceComponentName(), component.getServiceName(), 
stackId));
-continue;
+throw new SystemException(String.format("Exception while accessing 
component %s of service %s for stack %s",
+component.getServiceName(), 
component.getServiceComponentName(), stackId));
   }
   if (componentInfo.isVersionAdvertised()) {
 return true;

ambari git commit: AMBARI-13687: Express Upgrade: Install Packages is throwing exception Caught a system exception while attempting to create a resource (jluniya)

[jluniya]

Repository: ambari
Updated Branches:
  refs/heads/trunk 14537c6f1 -> 9b87326e8


AMBARI-13687: Express Upgrade: Install Packages is throwing exception Caught a 
system exception while attempting to create a resource (jluniya)


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

Branch: refs/heads/trunk
Commit: 9b87326e877311927b5d4b76d7c5733b50ae
Parents: 14537c6
Author: Jayush Luniya 
Authored: Mon Nov 2 22:20:21 2015 -0800
Committer: Jayush Luniya 
Committed: Mon Nov 2 22:20:21 2015 -0800

--
 .../ambari/server/api/handlers/CreateHandler.java   |  2 +-
 .../internal/ClusterStackVersionResourceProvider.java   | 12 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b87326e/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
index c1bd91b..9690bcd 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
@@ -54,7 +54,7 @@ public class CreateHandler extends BaseManagementHandler {
   result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.NOT_FOUND, 
e.getMessage()));
 } catch (SystemException e) {
   if (LOG.isErrorEnabled()) {
-LOG.error("Caught a system exception while attempting to create a 
resource", e.getMessage());
+LOG.error("Caught a system exception while attempting to create a 
resource: {}", e.getMessage());
   }
   result = new ResultImpl(new 
ResultStatus(ResultStatus.STATUS.SERVER_ERROR, e.getMessage()));
 } catch (ResourceAlreadyExistsException e) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b87326e/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index adae105..22212bf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -383,10 +383,10 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
   // Create next stage
   String stageName;
   if (batchCount > 1) {
-stageName = INSTALL_PACKAGES_FULL_NAME;
-  } else {
 stageName = String.format(INSTALL_PACKAGES_FULL_NAME + ". Batch %d of 
%d", batchId,
 batchCount);
+  } else {
+stageName = INSTALL_PACKAGES_FULL_NAME;
   }
 
   Stage stage = stageFactory.createNew(req.getId(), "/tmp/ambari", 
cluster.getClusterName(),
@@ -414,7 +414,6 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 } else {
   directTransitions.add(host);
 }
-
   }
 }
 
@@ -550,8 +549,11 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 componentInfo = ami.getComponent(stackId.getStackName(),
 stackId.getStackVersion(), component.getServiceName(), 
component.getServiceComponentName());
   } catch (AmbariException e) {
-throw new SystemException(String.format("Exception while accessing 
component %s of service %s for stack %s",
-component.getServiceName(), 
component.getServiceComponentName(), stackId));
+// It is possible that the component has been removed from the new 
stack
+// (example: STORM_REST_API has been removed from HDP-2.2)
+LOG.warn(String.format("Exception while accessing component %s of 
service %s for stack %s",
+component.getServiceComponentName(), component.getServiceName(), 
stackId));
+continue;
   }
   if (componentInfo.isVersionAdvertised()) {
 return true;

ambari git commit: AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> HDP-2.3 (jluniya)

[jluniya]

Repository: ambari
Updated Branches:
  refs/heads/trunk 8098e39de -> 14537c6f1


AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> 
HDP-2.3 (jluniya)


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

Branch: refs/heads/trunk
Commit: 14537c6f16116c1cd7745d5dc8aa9a5798986722
Parents: 8098e39
Author: Jayush Luniya 
Authored: Mon Nov 2 22:13:05 2015 -0800
Committer: Jayush Luniya 
Committed: Mon Nov 2 22:13:05 2015 -0800

--
 .../HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase_service.py  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/14537c6f/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
index 30b71a3..ecab844 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
@@ -75,7 +75,7 @@ class HbaseRegionServerDefault(HbaseRegionServer):
 env.set_params(params)
 upgrade.prestart(env, "hbase-regionserver")
 
-  def post_upgrade_restart(self, env):
+  def post_upgrade_restart(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 upgrade.post_regionserver(env)

http://git-wip-us.apache.org/repos/asf/ambari/blob/14537c6f/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
index 427ed63..95cd49d 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
@@ -43,6 +43,7 @@ def hbase_service(
 
   Execute ( daemon_cmd,
 user = params.hbase_user,
+only_if = no_op_test,
 # BUGFIX: hbase regionserver sometimes hangs when nn is in safemode
 timeout = 30,
 on_timeout = format("! ( {no_op_test} ) || {sudo} -H -E kill -9 `cat 
{pid_file}`"),

ambari git commit: AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> HDP-2.3 (jluniya)

[jluniya]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 4acd15106 -> 59cf4b76c


AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> 
HDP-2.3 (jluniya)


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

Branch: refs/heads/branch-2.1
Commit: 59cf4b76c30df5a7cec25697d2258d712cb8fe13
Parents: 4acd151
Author: Jayush Luniya 
Authored: Mon Nov 2 22:13:05 2015 -0800
Committer: Jayush Luniya 
Committed: Mon Nov 2 22:21:48 2015 -0800

--
 .../HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase_service.py  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/59cf4b76/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
index 30b71a3..ecab844 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
@@ -75,7 +75,7 @@ class HbaseRegionServerDefault(HbaseRegionServer):
 env.set_params(params)
 upgrade.prestart(env, "hbase-regionserver")
 
-  def post_upgrade_restart(self, env):
+  def post_upgrade_restart(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 upgrade.post_regionserver(env)

http://git-wip-us.apache.org/repos/asf/ambari/blob/59cf4b76/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
index 427ed63..95cd49d 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
@@ -43,6 +43,7 @@ def hbase_service(
 
   Execute ( daemon_cmd,
 user = params.hbase_user,
+only_if = no_op_test,
 # BUGFIX: hbase regionserver sometimes hangs when nn is in safemode
 timeout = 30,
 on_timeout = format("! ( {no_op_test} ) || {sudo} -H -E kill -9 `cat 
{pid_file}`"),

ambari git commit: AMBARI-13578. Set 20 second timeout for Ranger REST API calls

[gautam]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 b240d6f39 -> 4acd15106


AMBARI-13578. Set 20 second timeout for Ranger REST API calls


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

Branch: refs/heads/branch-2.1
Commit: 4acd151061efb9a97898d9b29b6977dbf6a109bf
Parents: b240d6f
Author: Gautam Borad 
Authored: Wed Oct 21 12:40:30 2015 +0530
Committer: Gautam Borad 
Committed: Tue Nov 3 11:08:11 2015 +0530

--
 .../libraries/functions/ranger_functions.py   | 14 +++---
 .../libraries/functions/ranger_functions_v2.py| 10 +-
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4acd1510/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
index dcf59c1..4beeca9 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
@@ -61,7 +61,7 @@ class Rangeradmin:
   request.add_header("Content-Type", "application/json")
   request.add_header("Accept", "application/json")
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(result.read())
   if response_code == 200 and len(response['vXRepositories']) > 0:
@@ -144,7 +144,7 @@ class Rangeradmin:
   }
   request = urllib2.Request(searchRepoURL, data, headers)
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(json.JSONEncoder().encode(result.read()))
   if response_code == 200:
@@ -195,7 +195,7 @@ class Rangeradmin:
 return: Returns login check response 
 """
 try:
-  response = urllib2.urlopen(url)
+  response = urllib2.urlopen(url, timeout=20)
   response_code = response.getcode()
   return response_code
 except urllib2.URLError, e:
@@ -223,7 +223,7 @@ class Rangeradmin:
   request.add_header("Content-Type", "application/json")
   request.add_header("Accept", "application/json")
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(result.read())
   if response_code == 200 and len(response['vXPolicies']) > 0:
@@ -257,7 +257,7 @@ class Rangeradmin:
   request = urllib2.Request(searchRepoURL, data, headers)
   request.add_header("Authorization", "Basic {0}".format(base64string))
   request.get_method = lambda: 'PUT'
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(json.JSONEncoder().encode(result.read()))
   if response_code == 200:
@@ -320,7 +320,7 @@ class Rangeradmin:
   request.add_header("Content-Type", "application/json")
   request.add_header("Accept", "application/json")
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(result.read())
   if response_code == 200 and len(response['vXUsers']) >= 0:
@@ -352,7 +352,7 @@ class Rangeradmin:
   }
   request = urllib2.Request(url, data, headers)
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code =  result.getcode()
   response = json.loads(json.JSONEncoder().encode(result.read()))
   if response_code == 200 and response is not None:

http://git-wip-us.apache.org/repos/asf/ambari/blob/4acd1510/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py

ambari git commit: AMBARI-13578. Set 20 second timeout for Ranger REST API calls

[gautam]

Repository: ambari
Updated Branches:
  refs/heads/trunk 715437a5f -> bb5c8975f


AMBARI-13578. Set 20 second timeout for Ranger REST API calls


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

Branch: refs/heads/trunk
Commit: bb5c8975f3215dcb5a13ee0ae3a08c9453031fb1
Parents: 715437a
Author: Gautam Borad 
Authored: Wed Oct 21 12:40:30 2015 +0530
Committer: Gautam Borad 
Committed: Tue Nov 3 11:07:45 2015 +0530

--
 .../libraries/functions/ranger_functions.py   | 14 +++---
 .../libraries/functions/ranger_functions_v2.py| 10 +-
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bb5c8975/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
index dcf59c1..4beeca9 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
@@ -61,7 +61,7 @@ class Rangeradmin:
   request.add_header("Content-Type", "application/json")
   request.add_header("Accept", "application/json")
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(result.read())
   if response_code == 200 and len(response['vXRepositories']) > 0:
@@ -144,7 +144,7 @@ class Rangeradmin:
   }
   request = urllib2.Request(searchRepoURL, data, headers)
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(json.JSONEncoder().encode(result.read()))
   if response_code == 200:
@@ -195,7 +195,7 @@ class Rangeradmin:
 return: Returns login check response 
 """
 try:
-  response = urllib2.urlopen(url)
+  response = urllib2.urlopen(url, timeout=20)
   response_code = response.getcode()
   return response_code
 except urllib2.URLError, e:
@@ -223,7 +223,7 @@ class Rangeradmin:
   request.add_header("Content-Type", "application/json")
   request.add_header("Accept", "application/json")
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(result.read())
   if response_code == 200 and len(response['vXPolicies']) > 0:
@@ -257,7 +257,7 @@ class Rangeradmin:
   request = urllib2.Request(searchRepoURL, data, headers)
   request.add_header("Authorization", "Basic {0}".format(base64string))
   request.get_method = lambda: 'PUT'
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(json.JSONEncoder().encode(result.read()))
   if response_code == 200:
@@ -320,7 +320,7 @@ class Rangeradmin:
   request.add_header("Content-Type", "application/json")
   request.add_header("Accept", "application/json")
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code = result.getcode()
   response = json.loads(result.read())
   if response_code == 200 and len(response['vXUsers']) >= 0:
@@ -352,7 +352,7 @@ class Rangeradmin:
   }
   request = urllib2.Request(url, data, headers)
   request.add_header("Authorization", "Basic {0}".format(base64string))
-  result = urllib2.urlopen(request)
+  result = urllib2.urlopen(request, timeout=20)
   response_code =  result.getcode()
   response = json.loads(json.JSONEncoder().encode(result.read()))
   if response_code == 200 and response is not None:

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb5c8975/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py

ambari git commit: AMBARI-13677. hive.server2.logging.operation.log.location incorrectly set in ambari.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/trunk a6f9562d3 -> 223247120


AMBARI-13677. hive.server2.logging.operation.log.location incorrectly set in 
ambari.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: 223247120318ce9f0df9ac995d0ba6c5e7974dfa
Parents: a6f9562
Author: Vitaly Brodetskyi 
Authored: Mon Nov 2 18:04:10 2015 +0200
Committer: Vitaly Brodetskyi 
Committed: Mon Nov 2 18:04:10 2015 +0200

--
 .../server/upgrade/UpgradeCatalog213.java   |  54 ++---
 .../services/HIVE/configuration/hive-site.xml   |   2 +-
 .../catalog/UpgradeCatalog_1.3_to_2.2.json  |   2 +-
 .../catalog/UpgradeCatalog_2.0_to_2.2.2.json|   2 +-
 .../catalog/UpgradeCatalog_2.0_to_2.2.4.json|   2 +-
 .../catalog/UpgradeCatalog_2.0_to_2.2.json  |   4 +-
 .../catalog/UpgradeCatalog_2.1_to_2.2.2.json|   2 +-
 .../catalog/UpgradeCatalog_2.1_to_2.2.4.json|   2 +-
 .../catalog/UpgradeCatalog_2.1_to_2.2.json  |   4 +-
 .../catalog/UpgradeCatalog_2.1_to_2.3.json  |   2 +-
 .../server/upgrade/UpgradeCatalog213Test.java   | 116 +--
 .../python/stacks/2.2/configs/hive-upgrade.json |   2 +-
 .../journalnode-upgrade-hdfs-secure.json|   4 +-
 .../stacks/2.2/configs/journalnode-upgrade.json |   4 +-
 14 files changed, 134 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/22324712/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 9503898..34072dc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -18,20 +18,11 @@
 
 package org.apache.ambari.server.upgrade;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
@@ -69,11 +60,19 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 /**
  * Upgrade catalog for version 2.1.3.
@@ -87,9 +86,11 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
   private static final String AMS_ENV = "ams-env";
   private static final String AMS_HBASE_ENV = "ams-hbase-env";
   private static final String HBASE_ENV_CONFIG = "hbase-env";
+  private static final String HIVE_SITE_CONFIG = "hive-site";
   private static final String RANGER_ENV_CONFIG = "ranger-env";
   private static final String ZOOKEEPER_LOG4J_CONFIG = "zookeeper-log4j";
   private static final String NIMBS_MONITOR_FREQ_SECS_PROPERTY = 
"nimbus.monitor.freq.secs";
+  private static final String HIVE_SERVER2_OPERATION_LOG_LOCATION_PROPERTY = 
"hive.server2.logging.operation.log.location";
   private static final String HADOOP_ENV_CONFIG = "hadoop-env";
   private static final String CONTENT_PROPERTY = "content";
   private static final String HADOOP_ENV_CONTENT_TO_APPEND = "\n{% if 
is_datanode_max_locked_memory_set %}\n" +
@@ -271,6 +272,7 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 updateKafkaConfigs();
 updateRangerEnvConfig();
 updateZookeeperLog4j();
+

ambari git commit: AMBARI-13525 Exception in collector logs for JOIN queries (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 915b05e0b -> f98f37767


AMBARI-13525 Exception in collector logs for JOIN queries (dsen)


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

Branch: refs/heads/branch-2.1
Commit: f98f37767423e076404da851a450d685e0e619d5
Parents: 915b05e
Author: Dmytro Sen 
Authored: Mon Nov 2 18:08:47 2015 +0200
Committer: Dmytro Sen 
Committed: Mon Nov 2 18:10:58 2015 +0200

--
 .../metrics/timeline/PhoenixHBaseAccessor.java  | 22 
 .../timeline/query/PhoenixTransactSQL.java  | 20 ++-
 .../timeline/PhoenixHBaseAccessorTest.java  | 58 ++--
 .../timeline/TestPhoenixTransactSQL.java| 24 
 .../0.1.0/configuration/ams-hbase-site.xml  | 22 +++-
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  4 ++
 .../stacks/2.2/common/test_stack_advisor.py |  1 +
 7 files changed, 145 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f98f3776/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
index 214cf1d..3ce30fd 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
@@ -21,6 +21,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.util.RetryCounter;
 import org.apache.hadoop.hbase.util.RetryCounterFactory;
 import org.apache.hadoop.metrics2.sink.timeline.Precision;
@@ -39,6 +40,7 @@ import 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.PhoenixTransactSQL;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.SplitByMetricNamesCondition;
 import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
+import org.apache.phoenix.exception.PhoenixIOException;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
@@ -463,6 +465,26 @@ public class PhoenixHBaseAccessor {
 }
   }
 
+} catch (PhoenixIOException pioe) {
+  Throwable pioe2 = pioe.getCause();
+  // Need to find out if this is exception "Could not find hash cache
+  // for joinId" or another PhoenixIOException
+  if (pioe2 instanceof PhoenixIOException &&
+pioe2.getCause() instanceof DoNotRetryIOException) {
+String className = null;
+for (StackTraceElement ste : pioe2.getCause().getStackTrace()) {
+  className = ste.getClassName();
+}
+
+if (className != null && className.equals("HashJoinRegionScanner")) {
+  LOG.error("The cache might have expired and have been removed. Try 
to" +
+" increase the cache size by setting bigger value for " +
+"phoenix.coprocessor.maxMetaDataCacheSize in ams-hbase-site 
config." +
+" Falling back to sort-merge join algorithm.");
+  PhoenixTransactSQL.setSortMergeJoinEnabled(true);
+}
+  }
+  throw pioe;
 } catch (RuntimeException ex) {
   // We need to find out if this is a real IO exception
   // or exception "maxStamp is smaller than minStamp"

http://git-wip-us.apache.org/repos/asf/ambari/blob/f98f3776/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
 

[3/3] ambari git commit: AMBARI-13674. Remove redundant console.* functions (onechiporenko)

[onechiporenko]

AMBARI-13674. Remove redundant console.* functions (onechiporenko)


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

Branch: refs/heads/trunk
Commit: 2cd129431dc3688bc931e565a1e6096bf94ccbca
Parents: c5d1aee
Author: Oleg Nechiporenko 
Authored: Mon Nov 2 12:18:46 2015 +0200
Committer: Oleg Nechiporenko 
Committed: Mon Nov 2 12:18:46 2015 +0200

--
 ambari-web/app/controllers/experimental.js  |  1 -
 .../controllers/global/cluster_controller.js|  7 ++--
 .../app/controllers/global/update_controller.js |  2 +-
 ambari-web/app/controllers/installer.js |  8 -
 ambari-web/app/controllers/login_controller.js  |  2 --
 ambari-web/app/controllers/main.js  |  1 -
 .../app/controllers/main/admin/advanced.js  |  2 +-
 .../nameNode/rollback_controller.js | 38 
 .../main/admin/kerberos/step2_controller.js |  1 -
 .../main/admin/kerberos/step4_controller.js |  1 -
 .../main/admin/stack_and_upgrade_controller.js  |  4 +--
 .../alert_definitions_actions_controller.js |  5 +--
 .../alerts/definition_configs_controller.js |  1 -
 .../alerts/definition_details_controller.js |  2 --
 .../alerts/manage_alert_groups_controller.js|  2 --
 ambari-web/app/controllers/main/host.js |  5 +--
 .../app/controllers/main/host/add_controller.js |  3 --
 .../main/host/bulk_operations_controller.js |  1 -
 ambari-web/app/controllers/main/host/details.js | 17 -
 .../controllers/main/service/add_controller.js  |  4 ---
 .../controllers/main/service/info/summary.js|  1 -
 ambari-web/app/controllers/main/service/item.js | 20 ---
 .../service/manage_config_groups_controller.js  |  1 -
 .../main/service/reassign/step2_controller.js   |  2 --
 .../main/service/reassign/step6_controller.js   |  2 +-
 .../main/service/reassign_controller.js |  2 --
 ambari-web/app/controllers/wizard.js| 22 
 .../app/controllers/wizard/step10_controller.js |  2 --
 .../app/controllers/wizard/step2_controller.js  |  2 --
 .../app/controllers/wizard/step3_controller.js  | 27 --
 .../app/controllers/wizard/step4_controller.js  |  1 -
 .../app/controllers/wizard/step6_controller.js  |  6 ++--
 .../app/controllers/wizard/step7_controller.js  |  1 -
 .../app/controllers/wizard/step8_controller.js  |  8 -
 .../app/controllers/wizard/step9_controller.js  | 14 
 ambari-web/app/mappers/configs/themes_mapper.js |  4 ---
 ambari-web/app/mappers/server_data_mapper.js|  1 -
 .../mixins/common/configs/enhanced_configs.js   |  1 -
 ambari-web/app/mixins/common/reload_popup.js|  3 --
 ambari-web/app/mixins/common/serverValidator.js |  7 +---
 ambari-web/app/mixins/common/userPref.js|  1 -
 .../app/mixins/common/widgets/widget_mixin.js   |  2 --
 .../main/service/configs/config_overridable.js  |  2 --
 .../app/mixins/main/service/themes_mapping.js   |  2 +-
 .../mixins/wizard/assign_master_components.js   |  6 
 .../wizard/wizardDeployProgressController.js|  1 -
 ambari-web/app/models/alerts/alert_config.js|  1 -
 ambari-web/app/models/authentication.js |  1 -
 ambari-web/app/models/cluster_states.js |  2 --
 ambari-web/app/models/form.js   |  8 -
 ambari-web/app/models/stack_service.js  |  1 -
 ambari-web/app/models/user.js   |  3 --
 ambari-web/app/models/widget_property.js|  1 -
 ambari-web/app/router.js| 19 +-
 ambari-web/app/routes/add_host_routes.js| 13 +--
 ambari-web/app/routes/add_kerberos_routes.js|  8 -
 ambari-web/app/routes/add_service_routes.js | 13 ---
 ambari-web/app/routes/installer.js  | 14 
 ambari-web/app/routes/main.js   |  1 -
 ambari-web/app/routes/reassign_master_routes.js |  8 -
 ambari-web/app/routes/stack_upgrade_routes.js   |  1 -
 ambari-web/app/utils/action_sequence.js |  4 ---
 ambari-web/app/utils/ajax/ajax.js   |  1 -
 .../app/utils/batch_scheduled_requests.js   |  1 -
 ambari-web/app/utils/blueprint.js   |  2 --
 ambari-web/app/utils/config.js  |  1 -
 ambari-web/app/utils/credentials.js |  1 -
 ambari-web/app/utils/host_progress_popup.js |  2 --
 ambari-web/app/utils/lazy_loading.js|  2 --
 ambari-web/app/utils/polling.js | 14 
 ambari-web/app/views/common/controls_view.js|  2 --
 ambari-web/app/views/common/grid.js |  4 ---
 ambari-web/app/views/common/table_view.js   |  2 --
 ambari-web/app/views/common/time_range.js   |  1 

[2/3] ambari git commit: AMBARI-13674. Remove redundant console.* functions (onechiporenko)

[onechiporenko]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd12943/ambari-web/app/mixins/common/serverValidator.js
--
diff --git a/ambari-web/app/mixins/common/serverValidator.js 
b/ambari-web/app/mixins/common/serverValidator.js
index 4d22fdd..a7753f7 100644
--- a/ambari-web/app/mixins/common/serverValidator.js
+++ b/ambari-web/app/mixins/common/serverValidator.js
@@ -171,9 +171,6 @@ App.ServerValidatorMixin = Em.Mixin.create({
* @param data
*/
   loadRecommendationsSuccess: function(data) {
-if (!data) {
-  console.warn('error while loading default config values');
-}
 this._saveRecommendedValues(data);
 var configObject = 
data.resources[0].recommendations.blueprint.configurations;
 if (configObject) this.updateInitialValue(configObject);
@@ -181,7 +178,7 @@ App.ServerValidatorMixin = Em.Mixin.create({
   },
 
   loadRecommendationsError: function(jqXHR, ajaxOptions, error, opt) {
-console.error("ERROR: Unable to determine recommendations for configs: ", 
jqXHR, ajaxOptions, error, opt);
+
   },
 
   serverSideValidation: function () {
@@ -382,7 +379,6 @@ App.ServerValidatorMixin = Em.Mixin.create({
 
   validationError: function (jqXHR, ajaxOptions, error, opt) {
 this.set('configValidationFailed', true);
-console.error('Config validation failed: ', jqXHR, ajaxOptions, error, 
opt);
   },
 
 
@@ -395,7 +391,6 @@ App.ServerValidatorMixin = Em.Mixin.create({
   warnUser: function(deferred) {
 var self = this;
 if (this.get('configValidationFailed')) {
-  console.error("Config validation failed. Going ahead with saving of 
configs");
   return App.ModalPopup.show({
 header: Em.I18n.t('installer.step7.popup.validation.failed.header'),
 primary: Em.I18n.t('common.proceedAnyway'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd12943/ambari-web/app/mixins/common/userPref.js
--
diff --git a/ambari-web/app/mixins/common/userPref.js 
b/ambari-web/app/mixins/common/userPref.js
index c4728bc..8ebc885 100644
--- a/ambari-web/app/mixins/common/userPref.js
+++ b/ambari-web/app/mixins/common/userPref.js
@@ -121,7 +121,6 @@ App.UserPref = Em.Mixin.create({
* @param {Object} data
*/
   postUserPrefBeforeSend: function(request, ajaxOptions, data){
-console.log('BeforeSend to persist: persistKeyValues', data.keyValuePair);
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd12943/ambari-web/app/mixins/common/widgets/widget_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js 
b/ambari-web/app/mixins/common/widgets/widget_mixin.js
index a0d507b..c2c7f47 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js
@@ -440,7 +440,6 @@ App.WidgetMixin = Ember.Mixin.create({
 return metrics.findProperty('name', match).data;
   } else {
 validExpression = false;
-console.warn('Metrics with name "' + match + '" not found to 
compute expression');
   }
 } else {
   return match;
@@ -450,7 +449,6 @@ App.WidgetMixin = Ember.Mixin.create({
   //check for correct math expression
   if (!(validExpression && 
this.get('MATH_EXPRESSION_REGEX').test(beforeCompute))) {
 validExpression = false;
-console.warn('Value for metric is not correct mathematical expression: 
' + beforeCompute);
   }
 
   result['${' + _expression + '}'] = (validExpression) ? 
Number(window.eval(beforeCompute)).toString() : value;

http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd12943/ambari-web/app/mixins/main/service/configs/config_overridable.js
--
diff --git a/ambari-web/app/mixins/main/service/configs/config_overridable.js 
b/ambari-web/app/mixins/main/service/configs/config_overridable.js
index 1962502..4de6d0c 100644
--- a/ambari-web/app/mixins/main/service/configs/config_overridable.js
+++ b/ambari-web/app/mixins/main/service/configs/config_overridable.js
@@ -164,7 +164,6 @@ App.ConfigOverridable = Em.Mixin.create({
   },
   doSelectConfigGroup: function (event) {
 var configGroup = event.context;
-console.log(configGroup);
 this.set('selectedConfigGroup', configGroup);
   },
   validate: function () {
@@ -257,7 +256,6 @@ App.ConfigOverridable = Em.Mixin.create({
 if (callback) {
   callback(xhr, text, errorThrown);
 }
-console.error('Error in creating new Config Group');
   }
 };
 sendData.sender = sendData;

http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd12943/ambari-web/app/mixins/main/service/themes_mapping.js
--
diff --git 

[1/3] ambari git commit: AMBARI-13673. Remove redundant App.db-functions (onechiporenko)

[onechiporenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0492aa4f2 -> 2cd129431


AMBARI-13673. Remove redundant App.db-functions (onechiporenko)


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

Branch: refs/heads/trunk
Commit: c5d1aeeb0d21adf8c4204e9a52a4bdabe490e5f0
Parents: 0492aa4
Author: Oleg Nechiporenko 
Authored: Mon Nov 2 12:17:28 2015 +0200
Committer: Oleg Nechiporenko 
Committed: Mon Nov 2 12:17:28 2015 +0200

--
 ambari-web/app/assets/test/tests.js |   1 +
 ambari-web/app/utils/db.js  | 685 ---
 ambari-web/app/utils/ember_reopen.js|  16 +-
 .../wizard/slave_component_groups_controller.js |  31 -
 .../test/controllers/wizard/step6_test.js   |   5 -
 .../test/controllers/wizard/step7_test.js   |   2 -
 .../test/controllers/wizard/step8_test.js   |   5 -
 ambari-web/test/controllers/wizard_test.js  |   2 +-
 ambari-web/test/init_router_test.js |  30 -
 .../test/mixins/common/reload_popup_test.js |   3 -
 ambari-web/test/router_test.js  |   8 +-
 ambari-web/test/utils/db_test.js|  97 +++
 ambari-web/test/views/common/table_view_test.js |   2 +
 .../upgrade_version_box_view_test.js|   9 +
 .../views/main/alert_definitions_view_test.js   |  13 +
 .../main/alerts/definition_details_view_test.js |   4 +-
 .../select_definitions_popup_body_view_test.js  |  11 +
 ambari-web/test/views/main/host/details_test.js |   1 -
 18 files changed, 295 insertions(+), 630 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c5d1aeeb/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 111b892..cb292a5 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -168,6 +168,7 @@ var files = [
   'test/utils/date/timezone_test',
   'test/utils/data_manipulation_test',
   'test/utils/config_test',
+  'test/utils/db_test',
   'test/utils/form_field_test',
   'test/utils/host_progress_popup_test',
   'test/utils/misc_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5d1aeeb/ambari-web/app/utils/db.js
--
diff --git a/ambari-web/app/utils/db.js b/ambari-web/app/utils/db.js
index f66cf55..366f5a4 100644
--- a/ambari-web/app/utils/db.js
+++ b/ambari-web/app/utils/db.js
@@ -17,7 +17,7 @@
  */
 var App = require('app');
 App.db = {};
-var InitialData =  {
+var InitialData = {
   'app': {
 'loginName': '',
 'authenticated': false,
@@ -31,12 +31,12 @@ var InitialData =  {
 }
   },
 
-  'Installer' : {},
-  'AddHost' : {},
-  'AddService' : {},
-  'WidgetWizard' : {},
+  'Installer': {},
+  'AddHost': {},
+  'AddService': {},
+  'WidgetWizard': {},
   'KerberosWizard': {},
-  'ReassignMaster' : {},
+  'ReassignMaster': {},
   'AddSecurity': {},
   'AddAlertDefinition': {
 content: {}
@@ -51,16 +51,17 @@ var InitialData =  {
 
 };
 
-if (typeof Storage !== 'undefined') {
-  Storage.prototype.setObject = function (key, value) {
-this.setItem(key, JSON.stringify(value));
-  };
+function checkNamespace(namespace) {
+  if (!namespace) {
+return false;
+  }
+  if (Em.isNone(Em.get(App.db.data, namespace))) {
+Em.setFullPath(App.db.data, namespace, {});
+  }
+  return true;
+}
 
-  Storage.prototype.getObject = function (key) {
-var value = this.getItem(key);
-return value && JSON.parse(value);
-  };
-} else {
+if (typeof Storage === 'undefined') {
   // stub for unit testing purposes
   window.localStorage = {};
   localStorage.setItem = function (key, val) {
@@ -72,64 +73,68 @@ if (typeof Storage !== 'undefined') {
   window.localStorage.setObject = function (key, value) {
 this[key] = value;
   };
-  window.localStorage.getObject = function (key, value) {
+  window.localStorage.getObject = function (key) {
 return this[key];
   };
 }
+else {
+  Storage.prototype.setObject = function (key, value) {
+this.setItem(key, JSON.stringify(value));
+  };
+
+  Storage.prototype.getObject = function (key) {
+var value = this.getItem(key);
+return value && JSON.parse(value);
+  };
+}
 
 App.db.cleanUp = function () {
-  console.log('TRACE: Entering db:cleanup function');
   App.db.data = InitialData;
-  console.log("In cleanup./..");
   localStorage.setObject('ambari', App.db.data);
 };
 
-App.db.cleanTmp = function() {
+App.db.cleanTmp = function () {
   App.db.data.tmp = {};
   

[1/2] ambari git commit: AMBARI-13672. HistoryServer fails to start due to permissions issue (umask 027) (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 55c394829 -> 5985ef4e4
  refs/heads/trunk ca4d5b1d6 -> 0492aa4f2


AMBARI-13672. HistoryServer fails to start due to permissions issue (umask 027) 
(aonishuk)


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

Branch: refs/heads/trunk
Commit: 0492aa4f21d12977b914b81bd3f640eeaad01ddc
Parents: ca4d5b1
Author: Andrew Onishuk 
Authored: Mon Nov 2 11:45:26 2015 +0200
Committer: Andrew Onishuk 
Committed: Mon Nov 2 11:45:26 2015 +0200

--
 .../libraries/functions/copy_tarball.py |  2 +-
 .../libraries/functions/get_user_call_output.py | 16 +---
 .../0.60.0.2.2/package/scripts/params_linux.py  |  2 +-
 .../SLIDER/0.60.0.2.2/package/scripts/slider.py |  6 +++---
 .../python/stacks/2.2/SLIDER/test_slider_client.py  | 10 +++---
 5 files changed, 21 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0492aa4f/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
index 51a6a3c..d442852 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
@@ -35,7 +35,7 @@ STACK_VERSION_PATTERN = "{{ stack_version }}"
 
 TARBALL_MAP = {
   "HDP": {
-"slider":  
("/usr/hdp/{0}/slider/slider.tar.gz".format(STACK_VERSION_PATTERN),
+"slider":  
("/usr/hdp/{0}/slider/lib/slider.tar.gz".format(STACK_VERSION_PATTERN),
   
"/hdp/apps/{0}/slider/slider.tar.gz".format(STACK_VERSION_PATTERN)),
 "tez":   
("/usr/hdp/{0}/tez/lib/tez.tar.gz".format(STACK_VERSION_PATTERN),
   
"/hdp/apps/{0}/tez/tez.tar.gz".format(STACK_VERSION_PATTERN)),

http://git-wip-us.apache.org/repos/asf/ambari/blob/0492aa4f/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
index 732cc7f..016161c 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
@@ -23,6 +23,8 @@ Ambari Agent
 import os
 import tempfile
 from resource_management.core import shell
+from resource_management.core.logger import Logger
+from resource_management.core.exceptions import Fail
 
 def get_user_call_output(command, user, quiet=False, is_checked_call=True, 
**call_kwargs):
   """
@@ -45,14 +47,22 @@ def get_user_call_output(command, user, quiet=False, 
is_checked_call=True, **cal
 command_string += " 1>" + out_files[0].name
 command_string += " 2>" + out_files[1].name
 
-func = shell.checked_call if is_checked_call else shell.call
-func_result = func(shell.as_user(command_string, user), quiet=quiet, 
**call_kwargs)
+code, _ = shell.call(shell.as_user(command_string, user), quiet=quiet, 
**call_kwargs)
 
 files_output = []
 for f in out_files:
   files_output.append(f.read().strip('\n'))
+  
+if code:
+  all_output = files_output[1] + '\n' + files_output[0]
+  err_msg = Logger.filter_text(("Execution of '%s' returned %d. %s") % 
(command_string, code, all_output))
+  
+  if is_checked_call:
+raise Fail(err_msg)
+  else:
+Logger.warning(err_msg)  
 
-return func_result[0], files_output[0], files_output[1]
+return code, files_output[0], files_output[1]
   finally:
 for f in out_files:
   f.close()

http://git-wip-us.apache.org/repos/asf/ambari/blob/0492aa4f/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py
index d7bd296..09b7876 100644
--- 

[2/2] ambari git commit: AMBARI-13672. HistoryServer fails to start due to permissions issue (umask 027) (aonishuk)

[aonishuk]

AMBARI-13672. HistoryServer fails to start due to permissions issue (umask 027) 
(aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 5985ef4e47789402edfbd65e9ddb3981d85dca80
Parents: 55c3948
Author: Andrew Onishuk 
Authored: Mon Nov 2 11:45:31 2015 +0200
Committer: Andrew Onishuk 
Committed: Mon Nov 2 11:45:31 2015 +0200

--
 .../libraries/functions/copy_tarball.py |  2 +-
 .../libraries/functions/get_user_call_output.py | 16 +---
 .../0.60.0.2.2/package/scripts/params_linux.py  |  2 +-
 .../SLIDER/0.60.0.2.2/package/scripts/slider.py |  6 +++---
 .../python/stacks/2.2/SLIDER/test_slider_client.py  | 10 +++---
 5 files changed, 21 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5985ef4e/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
index 51a6a3c..d442852 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
@@ -35,7 +35,7 @@ STACK_VERSION_PATTERN = "{{ stack_version }}"
 
 TARBALL_MAP = {
   "HDP": {
-"slider":  
("/usr/hdp/{0}/slider/slider.tar.gz".format(STACK_VERSION_PATTERN),
+"slider":  
("/usr/hdp/{0}/slider/lib/slider.tar.gz".format(STACK_VERSION_PATTERN),
   
"/hdp/apps/{0}/slider/slider.tar.gz".format(STACK_VERSION_PATTERN)),
 "tez":   
("/usr/hdp/{0}/tez/lib/tez.tar.gz".format(STACK_VERSION_PATTERN),
   
"/hdp/apps/{0}/tez/tez.tar.gz".format(STACK_VERSION_PATTERN)),

http://git-wip-us.apache.org/repos/asf/ambari/blob/5985ef4e/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
index 732cc7f..016161c 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_user_call_output.py
@@ -23,6 +23,8 @@ Ambari Agent
 import os
 import tempfile
 from resource_management.core import shell
+from resource_management.core.logger import Logger
+from resource_management.core.exceptions import Fail
 
 def get_user_call_output(command, user, quiet=False, is_checked_call=True, 
**call_kwargs):
   """
@@ -45,14 +47,22 @@ def get_user_call_output(command, user, quiet=False, 
is_checked_call=True, **cal
 command_string += " 1>" + out_files[0].name
 command_string += " 2>" + out_files[1].name
 
-func = shell.checked_call if is_checked_call else shell.call
-func_result = func(shell.as_user(command_string, user), quiet=quiet, 
**call_kwargs)
+code, _ = shell.call(shell.as_user(command_string, user), quiet=quiet, 
**call_kwargs)
 
 files_output = []
 for f in out_files:
   files_output.append(f.read().strip('\n'))
+  
+if code:
+  all_output = files_output[1] + '\n' + files_output[0]
+  err_msg = Logger.filter_text(("Execution of '%s' returned %d. %s") % 
(command_string, code, all_output))
+  
+  if is_checked_call:
+raise Fail(err_msg)
+  else:
+Logger.warning(err_msg)  
 
-return func_result[0], files_output[0], files_output[1]
+return code, files_output[0], files_output[1]
   finally:
 for f in out_files:
   f.close()

http://git-wip-us.apache.org/repos/asf/ambari/blob/5985ef4e/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py
index d7bd296..09b7876 100644
--- 
a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py
+++ 

ambari git commit: AMBARI-13684. Ambari Metrics Collector failed to start in Ambari 2.1.2 with UnicodeEncodeError. (swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7e62c5c11 -> cc5b61066


AMBARI-13684. Ambari Metrics Collector failed to start in Ambari 2.1.2 with 
UnicodeEncodeError. (swagle)


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

Branch: refs/heads/trunk
Commit: cc5b6106613b71f74b2e7d7791bd6adcd58fe5cc
Parents: 7e62c5c
Author: Siddharth Wagle 
Authored: Mon Nov 2 15:00:13 2015 -0800
Committer: Siddharth Wagle 
Committed: Mon Nov 2 15:00:20 2015 -0800

--
 .../package/files/service-metrics/KAFKA.txt | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cc5b6106/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
old mode 100644
new mode 100755
index a6f06b9..1e2017c
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
@@ -40,31 +40,31 @@ 
kafka.network.RequestMetrics.RequestsPerSec.request.Produce.meanRate
 kafka.network.RequestMetrics.RequestsPerSec.request.Offsets.meanRate
 kafka.network.RequestMetrics.RequestsPerSec.request.Offsets.1MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.OffsetFetch.meanRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.OffsetFetch.count

+kafka.network.RequestMetrics.RequestsPerSec.request.OffsetFetch.count
 kafka.network.RequestMetrics.RequestsPerSec.request.OffsetFetch.5MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.OffsetCommit.count
+kafka.network.RequestMetrics.RequestsPerSec.request.OffsetCommit.count
 kafka.network.RequestMetrics.RequestsPerSec.request.Metadata.count
-kafka.network.RequestMetrics.RequestsPerSec.request.LeaderAndIsr.1MinuteRate

+kafka.network.RequestMetrics.RequestsPerSec.request.LeaderAndIsr.1MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.LeaderAndIsr.15MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.meanRate

+kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.meanRate
 kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.count
-
kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.5MinuteRate

-kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.1MinuteRate

-kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.15MinuteRate

+kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.5MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.1MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.15MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.meanRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.count
-
kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.5MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.1MinuteRate

-kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.15MinuteRate

+kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.count
+kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.5MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.1MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.15MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.meanRate
-kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.5MinuteRate

+kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.5MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.1MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.15MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.meanRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.count

+kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.15MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.meanRate
+kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.count
 kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.5MinuteRate

ambari git commit: AMBARI-13684. Ambari Metrics Collector failed to start in Ambari 2.1.2 with UnicodeEncodeError. (swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 61ff1a756 -> ef0413f03


AMBARI-13684. Ambari Metrics Collector failed to start in Ambari 2.1.2 with 
UnicodeEncodeError. (swagle)


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

Branch: refs/heads/branch-2.1
Commit: ef0413f0397280e51c5444dc3f1c111322aeaeec
Parents: 61ff1a7
Author: Siddharth Wagle 
Authored: Mon Nov 2 15:18:51 2015 -0800
Committer: Siddharth Wagle 
Committed: Mon Nov 2 15:18:51 2015 -0800

--
 .../package/files/service-metrics/KAFKA.txt | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ef0413f0/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
index a6f06b9..1e2017c 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/KAFKA.txt
@@ -40,31 +40,31 @@ 
kafka.network.RequestMetrics.RequestsPerSec.request.Produce.meanRate
 kafka.network.RequestMetrics.RequestsPerSec.request.Offsets.meanRate
 kafka.network.RequestMetrics.RequestsPerSec.request.Offsets.1MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.OffsetFetch.meanRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.OffsetFetch.count

+kafka.network.RequestMetrics.RequestsPerSec.request.OffsetFetch.count
 kafka.network.RequestMetrics.RequestsPerSec.request.OffsetFetch.5MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.OffsetCommit.count
+kafka.network.RequestMetrics.RequestsPerSec.request.OffsetCommit.count
 kafka.network.RequestMetrics.RequestsPerSec.request.Metadata.count
-kafka.network.RequestMetrics.RequestsPerSec.request.LeaderAndIsr.1MinuteRate

+kafka.network.RequestMetrics.RequestsPerSec.request.LeaderAndIsr.1MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.LeaderAndIsr.15MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.meanRate

+kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.meanRate
 kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.count
-
kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.5MinuteRate

-kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.1MinuteRate

-kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.15MinuteRate

+kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.5MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.1MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.JoinGroup.15MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.meanRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.count
-
kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.5MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.1MinuteRate

-kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.15MinuteRate

+kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.count
+kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.5MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.1MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.Heartbeat.15MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.meanRate
-kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.5MinuteRate

+kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.5MinuteRate
 kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.1MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.15MinuteRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.meanRate
-
kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.count

+kafka.network.RequestMetrics.RequestsPerSec.request.FetchFollower.15MinuteRate
+kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.meanRate
+kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.count
 kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.5MinuteRate

ambari git commit: AMBARI-13648. Fix incorrect SPARK_CONF_DIR in Ambari stack definition (Saisai Shao via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/trunk 2cd129431 -> 745036ebb


AMBARI-13648. Fix incorrect SPARK_CONF_DIR in Ambari stack definition (Saisai 
Shao via smohanty)


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

Branch: refs/heads/trunk
Commit: 745036ebb5a6729c3e34a9c70a4bffd8ef713e4c
Parents: 2cd1294
Author: Sumit Mohanty 
Authored: Mon Nov 2 03:34:18 2015 -0800
Committer: Sumit Mohanty 
Committed: Mon Nov 2 03:37:41 2015 -0800

--
 .../common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/745036eb/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
index 4d30253..8e871eb 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
@@ -70,7 +70,7 @@
 # Generic options for the daemons used in the standalone deploy mode
 
 # Alternate conf dir. (Default: ${SPARK_HOME}/conf)
-export SPARK_CONF_DIR=${SPARK_HOME:-{{spark_home}}}/conf
+export SPARK_CONF_DIR=${SPARK_CONF_DIR:-{{spark_home}}/conf}
 
 # Where log files are stored.(Default:${SPARK_HOME}/logs)
 #export SPARK_LOG_DIR=${SPARK_HOME:-{{spark_home}}}/logs

ambari git commit: AMBARI-13685. Unable to compare config Versions when chosen from 'Show more'.(xiwang)

[xiwang]

Repository: ambari
Updated Branches:
  refs/heads/trunk 3bfd4cb49 -> 94b8f7b25


AMBARI-13685. Unable to compare config Versions when chosen from 'Show 
more'.(xiwang)


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

Branch: refs/heads/trunk
Commit: 94b8f7b258601a00b884ae3612ae5aeb9157
Parents: 3bfd4cb
Author: Xi Wang 
Authored: Mon Nov 2 16:02:55 2015 -0800
Committer: Xi Wang 
Committed: Mon Nov 2 17:09:51 2015 -0800

--
 ambari-web/app/styles/config_history_flow.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/94b8f7b2/ambari-web/app/styles/config_history_flow.less
--
diff --git a/ambari-web/app/styles/config_history_flow.less 
b/ambari-web/app/styles/config_history_flow.less
index 48bac18..e1732a6 100644
--- a/ambari-web/app/styles/config_history_flow.less
+++ b/ambari-web/app/styles/config_history_flow.less
@@ -246,7 +246,7 @@
 }
 .dropdown-menu {
   min-width: 400px;
-  margin-top: 4px;
+  margin-top: 4px !important;
   font-size: 13px;
   li {
 line-height: 30px;

ambari git commit: AMBARI-13666: Align to HAWQ Resource manager GUC names HAWQ-111 (bhuvnesh2703 via jaoki)

[jaoki]

Repository: ambari
Updated Branches:
  refs/heads/trunk cc5b61066 -> 3bfd4cb49


AMBARI-13666: Align to HAWQ Resource manager GUC names HAWQ-111 (bhuvnesh2703 
via jaoki)


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

Branch: refs/heads/trunk
Commit: 3bfd4cb491c50a7735e05e77c25fbe66e7d36e2d
Parents: cc5b610
Author: Jun Aoki 
Authored: Mon Nov 2 16:51:12 2015 -0800
Committer: Jun Aoki 
Committed: Mon Nov 2 16:51:12 2015 -0800

--
 .../HAWQ/2.0.0.0/configuration/hawq-site.xml| 28 -
 .../HAWQ/2.0.0.0/package/scripts/common.py  |  4 +-
 .../stacks/2.3/common/services-hawq-1-host.json | 61 
 .../2.3/common/services-hawq-3-hosts.json   | 61 
 .../services-master_ambari_colo-3-hosts.json| 61 
 .../services-master_standby_colo-3-hosts.json   | 61 
 .../common/services-normal-hawq-3-hosts.json| 61 
 .../services-standby_ambari_colo-3-hosts.json   | 61 
 .../app/utils/configs/config_property_helper.js |  4 +-
 9 files changed, 166 insertions(+), 236 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml
index 3e9573e..41b10dc 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml
@@ -91,7 +91,7 @@
   
 
   
-hawq_resourcemanager_segment_limit_memory_use
+hawq_rm_memory_limit_perseg
 64GB
 The limit of memory usage in a HAWQ segment when 
   hawq_global_rm_type is set 'none'.
@@ -99,7 +99,7 @@
   
 
   
-hawq_resourcemanager_segment_limit_core_use
+hawq_rm_nvcore_limit_perseg
 16
 The limit of virtual core usage in a HAWQ segment when 
   hawq_global_rm_type is set 'none'.
@@ -107,60 +107,56 @@
   
 
   
-hawq_resourcemanager_yarn_resourcemanager_address
+hawq_rm_yarn_address
 localhost:8032
 The address of YARN resource manager server.
   
 
   
-hawq_resourcemanager_yarn_resourcemanager_scheduler_address
+hawq_rm_yarn_scheduler_address
 localhost:8030
 The address of YARN scheduler server.
   
 
   
-hawq_resourcemanager_yarn_queue
+hawq_rm_yarn_queue_name
 default
 The YARN queue name to register HAWQ resource 
manager.
   
 
   
-hawq_resourcemanager_yarn_application_name
+hawq_rm_yarn_app_name
 hawq
 The application name to register HAWQ resource manager in 
YARN.
   
-  
-hawq_resourcemanager_log_level
-10
-  
 
   
-hawq_resourceenforcer_cpu_enable
+hawq_re_cpu_enable
 false
   
 
   
-hawq_resourceenforcer_cgroup_mount_point
+hawq_re_cgroup_mount_point
 /sys/fs/cgroup
   
 
   
-hawq_resourceenforcer_cgroup_hierarchy_name
+hawq_re_cgroup_hierarchy_name
 hadoop-yarn
   
 
   
-hawq_resourceenforcer_cleanup_period
+hawq_re_cleanup_period
 180
   
 
   
-hawq_resourceenforcer_cpu_weight
+hawq_re_cpu_weight
 1024.0
   
 
   
-hawq_resourceenforcer_vcore_pcore_ratio
+hawq_re_vcore_pcore_ratio
 1.0
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py
index 8e363c1..31ef2fa 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py
@@ -107,8 +107,8 @@ def __substitute_hostnames_in_hawq_site():
   substituted_hawq_site = params.hawq_site.copy()
   hawq_site_property_map = {"hawq_master_address_host": params.hawqmaster_host,
 "hawq_standby_address_host": 
hawqstandby_host_desired_value,
-
"hawq_resourcemanager_yarn_resourcemanager_address": params.rm_host,
-

ambari git commit: AMBARI-13516: HAWQ service's order is not available in role_command_order.js (mithmatt via jaoki)

[jaoki]

Repository: ambari
Updated Branches:
  refs/heads/trunk 94b8f7b25 -> 715437a5f


AMBARI-13516: HAWQ service's order is not available in role_command_order.js 
(mithmatt via jaoki)


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

Branch: refs/heads/trunk
Commit: 715437a5fd519005c2d868ea8dd676d0389064a0
Parents: 94b8f7b
Author: Jun Aoki 
Authored: Mon Nov 2 17:13:17 2015 -0800
Committer: Jun Aoki 
Committed: Mon Nov 2 17:13:17 2015 -0800

--
 .../src/main/resources/stacks/HDP/2.3/role_command_order.json| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/715437a5/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json 
b/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json
index 9b1625d..ad195de 100755
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json
@@ -8,6 +8,8 @@
 "RANGER_KMS_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_KMS_SERVER-START"],
 "PHOENIX_QUERY_SERVER-START": ["HBASE_MASTER-START"],
 "ATLAS_SERVICE_CHECK-SERVICE_CHECK": ["ATLAS_SERVER-START"],
-"SPARK_THRIFTSERVER-START" : ["NAMENODE-START"]
+"SPARK_THRIFTSERVER-START" : ["NAMENODE-START"],
+"HAWQMASTER-START" : 
["NAMENODE-START","DATANODE-START","HAWQSTANDBY-START"],
+"HAWQ_SERVICE_CHECK-SERVICE_CHECK" : ["HAWQMASTER-START"]
   }
 }

ambari git commit: AMBARI-13685. Unable to compare config Versions when chosen from 'Show more'.(xiwang)

[xiwang]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 ef0413f03 -> b240d6f39


AMBARI-13685. Unable to compare config Versions when chosen from 'Show 
more'.(xiwang)


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

Branch: refs/heads/branch-2.1
Commit: b240d6f39fb1c5c5a5f3754cc6fa10e605234639
Parents: ef0413f
Author: Xi Wang 
Authored: Mon Nov 2 16:02:55 2015 -0800
Committer: Xi Wang 
Committed: Mon Nov 2 17:10:33 2015 -0800

--
 ambari-web/app/styles/config_history_flow.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b240d6f3/ambari-web/app/styles/config_history_flow.less
--
diff --git a/ambari-web/app/styles/config_history_flow.less 
b/ambari-web/app/styles/config_history_flow.less
index dfa2c03..e6703bb 100644
--- a/ambari-web/app/styles/config_history_flow.less
+++ b/ambari-web/app/styles/config_history_flow.less
@@ -245,7 +245,7 @@
 }
 .dropdown-menu {
   min-width: 400px;
-  margin-top: 4px;
+  margin-top: 4px !important;
   font-size: 13px;
   li {
 line-height: 30px;

ambari git commit: AMBARI-13675 Toggling and Saving "Enable User Sync" on Ranger User Info page generates error count on Advanced tab. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/trunk 745036ebb -> 0f0cf13d7


AMBARI-13675 Toggling and Saving "Enable User Sync" on Ranger User Info page 
generates error count on Advanced tab. (atkach)


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

Branch: refs/heads/trunk
Commit: 0f0cf13d7d1931f3df4c80e9be172e73cd14a08e
Parents: 745036e
Author: Andrii Tkach 
Authored: Mon Nov 2 14:20:41 2015 +0200
Committer: Andrii Tkach 
Committed: Mon Nov 2 14:20:41 2015 +0200

--
 ambari-web/app/utils/config.js   | 3 ++-
 ambari-web/test/utils/config_test.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f0cf13d/ambari-web/app/utils/config.js
--
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index a9321be..61ad75f 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -337,7 +337,8 @@ App.config = Em.Object.create({
   dependentConfigPattern: null,
   options: null,
   radioName: null,
-  belongsToService: []
+  belongsToService: [],
+  widget: null
 };
 return Object.keys(coreObject|| {}).length ?
   $.extend(tpl, coreObject) : tpl;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f0cf13d/ambari-web/test/utils/config_test.js
--
diff --git a/ambari-web/test/utils/config_test.js 
b/ambari-web/test/utils/config_test.js
index af14cbf..8ea0d67 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -1005,7 +1005,8 @@ describe('App.config', function () {
   dependentConfigPattern: null,
   options: null,
   radioName: null,
-  belongsToService: []
+  belongsToService: [],
+  widget: null
 };
 it('create default config object', function () {
   expect(App.config.createDefaultConfig('pName', 'pServiceName', 
'pFileName', true)).to.eql(res);

ambari git commit: AMBARI-13675 Toggling and Saving "Enable User Sync" on Ranger User Info page generates error count on Advanced tab. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 2ffd510e2 -> a5c8dfc58


AMBARI-13675 Toggling and Saving "Enable User Sync" on Ranger User Info page 
generates error count on Advanced tab. (atkach)


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

Branch: refs/heads/branch-2.1
Commit: a5c8dfc58808ae5016c44834601387f221aae1c2
Parents: 2ffd510
Author: Andrii Tkach 
Authored: Mon Nov 2 14:19:38 2015 +0200
Committer: Andrii Tkach 
Committed: Mon Nov 2 14:19:38 2015 +0200

--
 ambari-web/app/utils/config.js   | 3 ++-
 ambari-web/test/utils/config_test.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a5c8dfc5/ambari-web/app/utils/config.js
--
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index d917669..6e34789 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -335,7 +335,8 @@ App.config = Em.Object.create({
   dependentConfigPattern: null,
   options: null,
   radioName: null,
-  belongsToService: []
+  belongsToService: [],
+  widget: null
 };
 return Object.keys(coreObject|| {}).length ?
   $.extend(tpl, coreObject) : tpl;

http://git-wip-us.apache.org/repos/asf/ambari/blob/a5c8dfc5/ambari-web/test/utils/config_test.js
--
diff --git a/ambari-web/test/utils/config_test.js 
b/ambari-web/test/utils/config_test.js
index bd0e9af..ee24aed 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -1046,7 +1046,8 @@ describe('App.config', function () {
   dependentConfigPattern: null,
   options: null,
   radioName: null,
-  belongsToService: []
+  belongsToService: [],
+  widget: null
 };
 it('create default config object', function () {
   expect(App.config.createDefaultConfig('pName', 'pServiceName', 
'pFileName', true)).to.eql(res);