http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py index f696543..274f29f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py @@ -29,4 +29,6 @@ def install_packages(): packages = ['unzip', 'curl'] if params.hdp_stack_version != "" and compare_versions(params.hdp_stack_version, '2.2') >= 0: packages.append('hdp-select') - Package(packages) + Package(packages, + retry_on_repo_unavailability=params.agent_stack_retry_on_unavailability, + retry_count=params.agent_stack_retry_count)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java index 6069ba6..59ae56e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java @@ -2030,7 +2030,7 @@ public class AmbariManagementControllerImplTest { Map<String, String> defaultHostParams = helper.createDefaultHostParams(cluster); - assertEquals(defaultHostParams.size(), 13); + assertEquals(defaultHostParams.size(), 15); assertEquals(defaultHostParams.get(DB_DRIVER_FILENAME), MYSQL_JAR); assertEquals(defaultHostParams.get(STACK_NAME), SOME_STACK_NAME); assertEquals(defaultHostParams.get(STACK_VERSION), SOME_STACK_VERSION); http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/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 69ed9d7..dea83a1 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 @@ -187,6 +187,7 @@ public class ClusterStackVersionResourceProviderTest { AmbariManagementController managementController = createMock(AmbariManagementController.class); Clusters clusters = createNiceMock(Clusters.class); Cluster cluster = createNiceMock(Cluster.class); + Map<String, String> hostLevelParams = new HashMap<>(); StackId stackId = new StackId("HDP", "2.0.1"); RepositoryVersionEntity repoVersion = new RepositoryVersionEntity(); @@ -288,6 +289,8 @@ public class ClusterStackVersionResourceProviderTest { expect(stage.getExecutionCommandWrapper(anyObject(String.class), anyObject(String.class))). andReturn(executionCommandWrapper).anyTimes(); + expect(executionCommand.getHostLevelParams()).andReturn(hostLevelParams).anyTimes(); + Map<Role, Float> successFactors = new HashMap<>(); expect(stage.getSuccessFactors()).andReturn(successFactors).atLeastOnce(); http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/custom_actions/TestInstallPackages.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py index 4f9967f..478c052 100644 --- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py +++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py @@ -110,14 +110,14 @@ class TestInstallPackages(RMFTestCase): mirror_list=None, append_to_file=True, ) - self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"]) - self.assertResourceCalled('Package', 'snappy', action=["upgrade"]) - self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"]) - self.assertResourceCalled('Package', 'lzo', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"]) - self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"]) + self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'snappy', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'lzo', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) self.assertNoMoreResources() @patch("ambari_commons.os_check.OSCheck.is_suse_family") @@ -170,14 +170,14 @@ class TestInstallPackages(RMFTestCase): mirror_list=None, append_to_file=True, ) - self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"]) - self.assertResourceCalled('Package', 'snappy', action=["upgrade"]) - self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"]) - self.assertResourceCalled('Package', 'lzo', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"]) - self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"]) + self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'snappy', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'lzo', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) self.assertNoMoreResources() @@ -233,14 +233,14 @@ class TestInstallPackages(RMFTestCase): mirror_list=None, append_to_file=True, ) - self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"]) - self.assertResourceCalled('Package', 'snappy', action=["upgrade"]) - self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"]) - self.assertResourceCalled('Package', 'lzo', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"]) - self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"]) + self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'snappy', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'lzo', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) self.assertNoMoreResources() @@ -367,14 +367,14 @@ class TestInstallPackages(RMFTestCase): mirror_list=None, append_to_file=True, ) - self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"]) - self.assertResourceCalled('Package', 'snappy', action=["upgrade"]) - self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"]) - self.assertResourceCalled('Package', 'lzo', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"]) - self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"]) + self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'snappy', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'lzo', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"], retry_count=5, retry_on_repo_unavailability=False) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json index 957a3d8..c6575b5 100644 --- a/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json +++ b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json @@ -5,6 +5,8 @@ "hostname": "0b3.vm", "passiveInfo": [], "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://0b3.vm:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_67", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py index d8cecec..719ae3e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py @@ -38,7 +38,9 @@ class TestHBaseMaster(RMFTestCase): try_install=True, checked_call_mocks = [(0, "OK.", ""),(0, "OK.", "")], ) - self.assertResourceCalled('Package', 'hbase_2_3_*',) + self.assertResourceCalled('Package', 'hbase_2_3_*', + retry_count=5, + retry_on_repo_unavailability=False) self.assertNoMoreResources() @@ -57,8 +59,12 @@ class TestHBaseMaster(RMFTestCase): try_install=True, checked_call_mocks = [(0, "OK.", ""),(0, "OK.", "")], ) - self.assertResourceCalled('Package', 'hbase_2_3_*',) - self.assertResourceCalled('Package', 'phoenix_2_3_*',) + self.assertResourceCalled('Package', 'hbase_2_3_*', + retry_count=5, + retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'phoenix_2_3_*', + retry_count=5, + retry_on_repo_unavailability=False) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py index 58ca7ef..9c846c8 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py @@ -547,7 +547,7 @@ class TestHbaseRegionServer(RMFTestCase): owner='hbase', content='log4jproperties\nline2') - self.assertResourceCalled('Package', 'phoenix_2_2_*') + self.assertResourceCalled('Package', 'phoenix_2_2_*', retry_count=5, retry_on_repo_unavailability=False) self.assertResourceCalled('Execute', '/usr/hdp/current/hbase-regionserver/bin/hbase-daemon.sh --config /usr/hdp/current/hbase-regionserver/conf start regionserver', not_if = 'ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hbase/hbase-hbase-regionserver.pid && ps -p `ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E cat /var/run/hbase/hbase-hbase-regionserver.pid` >/dev/null 2>&1', http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json index 1a6c046..e45303d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json index 180aa46..d3f7f15 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json @@ -47,6 +47,8 @@ "clusterName": "c1", "hostname": "c6403.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://10.0.0.15:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json index c2bb45c..92d2052 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index 93504f7..590fb23 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "agentCacheDir": "/var/lib/ambari-agent/cache", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", @@ -1141,9 +1143,6 @@ ], "metrics_collector_hosts": [ "c6401.ambari.apache.org" - ], - "metrics_grafana_hosts": [ - "c6401.ambari.apache.org" ] } } http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json index 6172a95..1918606 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json index 941a0ac..33270ce 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json index 0fd2de3..6f1aef1 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json index cda8297..a0beca9 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json index 0a4e2ab..f2ec21b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json index b13c997..cec5431 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json index bf2b638..3acc31b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json index 7a3f4e2..adb97c9 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json @@ -4,6 +4,8 @@ "hostname": "c6401.ambari.apache.org", "passiveInfo": [], "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json index 9223a41..40e18d2 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json @@ -4,6 +4,8 @@ "hostname": "c6402.ambari.apache.org", "passiveInfo": [], "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json index b053993..b9e3b44 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json @@ -4,6 +4,8 @@ "hostname": "c6402.ambari.apache.org", "passiveInfo": [], "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json index 4d12a52..a0a2ee0 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json @@ -4,6 +4,8 @@ "hostname": "c6401.ambari.apache.org", "passiveInfo": [], "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json index 515bf2b..5799708 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json @@ -4,6 +4,8 @@ "hostname": "c6401.ambari.apache.org", "passiveInfo": [], "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json index 5f60fd1..209651d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json @@ -46,6 +46,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://10.0.0.15:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json index 6881456..bb9a3a2 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json @@ -46,6 +46,8 @@ "clusterName": "c1", "hostname": "c6403.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://10.0.0.15:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json index dc2864d..adac072 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json @@ -6,6 +6,8 @@ "componentName": "", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://10.0.0.15:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json index 13c7952..fea5e34 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json @@ -46,6 +46,8 @@ "clusterName": "c1", "hostname": "c6403.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://10.0.0.15:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json index 24b8a3e..71af43a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json @@ -46,6 +46,8 @@ "clusterName": "c1", "hostname": "c6403.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://10.0.0.15:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json index 8d3b60b..0b1be03 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json index 84db160..47bb75f 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json index 224062f..6160b6a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json @@ -36,6 +36,8 @@ "clusterName": "c1", "hostname": "c6402.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "stack_name": "HDP", "group_list": "[\"hadoop\",\"users\"]", "host_sys_prepped": "false", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json index 5d1f50f..576288c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json @@ -36,6 +36,8 @@ "clusterName": "c1", "hostname": "c6402.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "stack_name": "HDP", "group_list": "[\"hadoop\",\"users\"]", "host_sys_prepped": "false", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json index 9c8c0e2..5ae0ff2 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json @@ -14,6 +14,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://10.0.0.15:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json b/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json index 81bcd2f..9e21d9b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json index 6e3342c..8a16d0c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json @@ -36,6 +36,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://hw10897.ix:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json index 5092c91..34ffede 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json @@ -3,6 +3,8 @@ "clusterName": "pacan", "hostname": "c6402.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/lib/jvm/java-1.6.0-openjdk.x86_64", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json index daa46af..a868eeb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json @@ -3,6 +3,8 @@ "clusterName": "pacan", "hostname": "c6402.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/lib/jvm/java-1.6.0-openjdk.x86_64", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json index e17559d..d83ffc8 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "current_version" : "2.2.4.2-1234", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json index 11858f8..6b7dabc 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py index f9d69a8..aacd1f2 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py @@ -40,6 +40,6 @@ class TestHookBeforeInstall(RMFTestCase): repo_file_name='HDP', repo_template='[{{repo_id}}]\nname={{repo_id}}\n{% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% endif %}\n\npath=/\nenabled=1\ngpgcheck=0' ) - self.assertResourceCalled('Package', 'unzip',) - self.assertResourceCalled('Package', 'curl',) + self.assertResourceCalled('Package', 'unzip', retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'curl', retry_count=5, retry_on_repo_unavailability=False) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json index 11e18ff..df13b43 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json @@ -47,6 +47,8 @@ "clusterName": "c1", "hostname": "c6403.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://10.0.0.15:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.1/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json index 76d840b..f02c485 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json b/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json index 0fbc282..888666a 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json @@ -23,6 +23,8 @@ "clusterName": "c1", "hostname": "c6402.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "stack_name": "HDP", "group_list": "[\"hadoop\",\"users\"]", "host_sys_prepped": "false", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.1/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json index 3346ee6..1b0a80c 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.2/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default.json b/ambari-server/src/test/python/stacks/2.2/configs/default.json index 4159a58..319eb05 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/default.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json index 9e597ef..d70ab3f 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json @@ -34,6 +34,8 @@ "clusterName": "c1", "hostname": "c6402.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://hw10897.ix:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json index 494069c..9d2fd4a 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json @@ -64,6 +64,8 @@ "clusterName": "c1", "hostname": "c6406.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6406.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_67", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json index 231c395..ab32b44 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json @@ -64,6 +64,8 @@ "clusterName": "c1", "hostname": "c6406.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6406.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_67", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json index 40a6e95..b9beed1 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json @@ -31,6 +31,8 @@ "clusterName": "c1", "hostname": "c6402.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://hw10897.ix:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json index 66089c8..1c5f4bc 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json @@ -31,6 +31,8 @@ "clusterName": "c1", "hostname": "c6402.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.2/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/secured.json b/ambari-server/src/test/python/stacks/2.2/configs/secured.json index 11cf1eb..dbe7252 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/secured.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py b/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py index aaee2a5..299638b 100644 --- a/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py +++ b/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py @@ -67,11 +67,21 @@ class TestPxf(RMFTestCase): target=RMFTestCase.TARGET_COMMON_SERVICES, try_install=True) - self.assertResourceCalled('Package', 'pxf-service',) - self.assertResourceCalled('Package', 'apache-tomcat',) - self.assertResourceCalled('Package', 'pxf-hive',) - self.assertResourceCalled('Package', 'pxf-hdfs',) - self.assertResourceCalled('Package', 'pxf-hbase',) + self.assertResourceCalled('Package', 'pxf-service', + retry_count=5, + retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'apache-tomcat', + retry_count=5, + retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'pxf-hive', + retry_count=5, + retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'pxf-hdfs', + retry_count=5, + retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'pxf-hbase', + retry_count=5, + retry_on_repo_unavailability=False) self.assert_configure_default() http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json index e40c3c4..db157af 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.3/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.json b/ambari-server/src/test/python/stacks/2.3/configs/default.json index 4a72f08..253e833 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/default.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json index bad20f3..f560704 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json @@ -39,6 +39,8 @@ "clusterName": "c1", "hostname": "c6405.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6405.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.8.0_40", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json index 0e2a064..3a8133a 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json @@ -44,6 +44,8 @@ "clusterName": "c1", "hostname": "c6405.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6405.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "java_home": "/usr/jdk64/jdk1.8.0_40", http://git-wip-us.apache.org/repos/asf/ambari/blob/7e81d376/ambari-server/src/test/python/stacks/2.3/configs/pxf_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/pxf_default.json b/ambari-server/src/test/python/stacks/2.3/configs/pxf_default.json index ba06162..1f6afe4 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/pxf_default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/pxf_default.json @@ -3,6 +3,8 @@ "clusterName": "c1", "hostname": "c6401.ambari.apache.org", "hostLevelParams": { + "agent_stack_retry_count": "5", + "agent_stack_retry_on_unavailability": "false", "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, "ambari_db_rca_password": "mapred", "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
