You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/11/16 12:40:45 UTC
[2/2] ambari git commit: AMBARI-13886. Stop-and-Start Upgrade: Fix
unit tests that were ignored/missing on server (dgrinenko via dlysnichenko)
AMBARI-13886. Stop-and-Start Upgrade: Fix unit tests that were ignored/missing on server (dgrinenko via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92f5d07b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92f5d07b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92f5d07b
Branch: refs/heads/trunk
Commit: 92f5d07b47330ddfa20c57a19204009b39ae144f
Parents: d71f17d
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Nov 16 13:40:24 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Nov 16 13:40:24 2015 +0200
----------------------------------------------------------------------
.../internal/UpgradeResourceProviderTest.java | 22 ++++++++++++--------
.../ambari/server/state/UpgradeHelperTest.java | 5 ++---
.../HDP/2.1.1/upgrades/config-upgrade.xml | 18 ++++++++++++++++
.../HDP/2.1.1/upgrades/upgrade_direction.xml | 14 ++++++++++++-
.../upgrades/upgrade_server_action_test.xml | 13 ++++++++++++
.../stacks/HDP/2.1.1/upgrades/upgrade_test.xml | 12 +++++++++++
.../HDP/2.1.1/upgrades/upgrade_to_new_stack.xml | 20 ++----------------
.../upgrades/upgrade_test_skip_failures.xml | 13 +++++++++++-
8 files changed, 85 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f5d07b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
index 8055f95..93360bd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
@@ -531,7 +531,6 @@ public class UpgradeResourceProviderTest {
@Test
- @Ignore
public void testCreatePartialDowngrade() throws Exception {
clusters.addHost("h2");
Host host = clusters.getHost("h2");
@@ -575,6 +574,8 @@ public class UpgradeResourceProviderTest {
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.1.1.1");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_SKIP_PREREQUISITE_CHECKS, "true");
Map<String, String> requestInfoProperties = new HashMap<String, String>();
requestInfoProperties.put(UpgradeResourceDefinition.DOWNGRADE_DIRECTIVE, "true");
@@ -601,19 +602,19 @@ public class UpgradeResourceProviderTest {
@Test
- @Ignore
public void testDowngradeToBase() throws Exception {
Cluster cluster = clusters.getCluster("c1");
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.1.1.1");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_SKIP_PREREQUISITE_CHECKS, "true");
ResourceProvider upgradeResourceProvider = createProvider(amc);
Request request = PropertyHelper.getCreateRequest(Collections.singleton(requestProps), null);
- RequestStatus status = upgradeResourceProvider.createResources(
- request);
+ RequestStatus status = upgradeResourceProvider.createResources(request);
List<UpgradeEntity> upgrades = upgradeDao.findUpgrades(cluster.getClusterId());
assertEquals(1, upgrades.size());
@@ -622,6 +623,7 @@ public class UpgradeResourceProviderTest {
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2");
requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_SKIP_PREREQUISITE_CHECKS, "true");
request = PropertyHelper.getCreateRequest(Collections.singleton(requestProps), null);
try {
status = upgradeResourceProvider.createResources(request);
@@ -633,6 +635,7 @@ public class UpgradeResourceProviderTest {
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2.0.0");
requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_SKIP_PREREQUISITE_CHECKS, "true");
requestProps.put(UpgradeResourceProvider.UPGRADE_FROM_VERSION, "2.1.1.0");
Map<String, String> requestInfoProperties = new HashMap<String, String>();
@@ -739,7 +742,6 @@ public class UpgradeResourceProviderTest {
@Test
- @Ignore
public void testDirectionUpgrade() throws Exception {
Cluster cluster = clusters.getCluster("c1");
@@ -754,6 +756,8 @@ public class UpgradeResourceProviderTest {
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2.2.3");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_direction");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_SKIP_PREREQUISITE_CHECKS, "true");
ResourceProvider upgradeResourceProvider = createProvider(amc);
@@ -780,6 +784,7 @@ public class UpgradeResourceProviderTest {
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2");
requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_direction");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_SKIP_PREREQUISITE_CHECKS, "true");
requestProps.put(UpgradeResourceProvider.UPGRADE_FROM_VERSION, "2.2.2.3");
Map<String, String> requestInfoProps = new HashMap<String, String>();
@@ -886,6 +891,8 @@ public class UpgradeResourceProviderTest {
Map<String, Object> requestProps = new HashMap<String, Object>();
requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2.0.0");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_PACK, "upgrade_test_nonrolling");
+ requestProps.put(UpgradeResourceProvider.UPGRADE_SKIP_PREREQUISITE_CHECKS, "true");
ResourceProvider upgradeResourceProvider = createProvider(amc);
@@ -899,13 +906,10 @@ public class UpgradeResourceProviderTest {
assertEquals(5, upgrade.getUpgradeGroups().size());
UpgradeGroupEntity group = upgrade.getUpgradeGroups().get(2);
- assertEquals(2, group.getItems().size());
+ assertEquals(1, group.getItems().size());
group = upgrade.getUpgradeGroups().get(0);
assertEquals(1, group.getItems().size());
- UpgradeItemEntity item = group.getItems().get(1);
- assertEquals("Value is set for the source stack upgrade pack",
- "Foo", item.getText());
assertTrue(cluster.getDesiredConfigs().containsKey("zoo.cfg"));
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f5d07b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
index 208fe00..681ee9b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
@@ -799,7 +799,6 @@ public class UpgradeHelperTest {
manualTask.message);
}
- @Ignore
@Test
public void testUpgradeOrchestrationFullTask() throws Exception {
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.1.1");
@@ -840,7 +839,7 @@ public class UpgradeHelperTest {
UpgradeGroupHolder group = groups.get(1);
// check that the display name is being used
assertTrue(group.items.get(1).getText().contains("ZooKeeper1 Server2"));
- assertEquals(group.items.get(5).getText(), "Service Check Zk");
+ assertEquals(group.items.get(4).getText(), "Service Check Zk");
group = groups.get(3);
assertEquals(8, group.items.size());
@@ -872,7 +871,7 @@ public class UpgradeHelperTest {
assertEquals(4, hosts.size());
assertEquals(4, groups.get(0).items.size());
- assertEquals(6, groups.get(1).items.size());
+ assertEquals(5, groups.get(1).items.size());
assertEquals(8, groups.get(2).items.size());
assertEquals(8, groups.get(3).items.size());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f5d07b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/config-upgrade.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/config-upgrade.xml
index c5d51f9..6a2986e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/config-upgrade.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/config-upgrade.xml
@@ -35,6 +35,11 @@
<type>hdfs-site</type>
<set key="myproperty" value="mynewvalue"/>
</definition>
+ <definition xsi:type="configure" id="hdp_2_1_1_nn_test">
+ <type>hdfs-site</type>
+ <key>myproperty</key>
+ <value>mynewvalue</value>
+ </definition>
</changes>
</component>
</service>
@@ -76,6 +81,19 @@
</condition>
</definition>
+ <definition xsi:type="configure" id="hdp_2_1_1_test_properties">
+ <condition type="hive-site" key="hive.server2.transport.mode" value="binary">
+ <type>hive-site</type>
+ <key>hive.server2.thrift.port</key>
+ <value>10010</value>
+ </condition>
+ <condition type="hive-site" key="hive.server2.transport.mode" value="http">
+ <type>hive-site</type>
+ <key>hive.server2.http.port</key>
+ <value>10011</value>
+ </condition>
+ </definition>
+
<definition xsi:type="configure" id="hdp_2_1_1_hive_server_foo">
<type>hive-site</type>
<set key="fooKey" value="fooValue"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f5d07b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
index e12fcd9..76e42d7 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
@@ -19,7 +19,19 @@
<target>2.2.*.*</target>
<target-stack>HDP-2.2.5</target-stack>
<type>ROLLING</type>
-
+ <prerequisite-checks>
+ <!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
+ <check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
+ <check>org.apache.ambari.server.checks.MapReduce2JobHistoryStatePreservingCheck</check>
+ <check>org.apache.ambari.server.checks.SecondaryNamenodeDeletedCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesMapReduceDistributedCacheCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesNamenodeHighAvailabilityCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesTezDistributedCacheCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesYarnWorkPreservingCheck</check>
+ <check>org.apache.ambari.server.checks.YarnRMHighAvailabilityCheck</check>
+ <check>org.apache.ambari.server.checks.YarnTimelineServerStatePreservingCheck</check>
+ </prerequisite-checks>
+
<order>
<group name="ZOOKEEPER" title="Zookeeper">
<service name="ZOOKEEPER">
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f5d07b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml
index ee43d1c..b6c49e9 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml
@@ -19,6 +19,19 @@
<target>2.2.*.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
+ <prerequisite-checks>
+ <!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
+ <check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
+ <check>org.apache.ambari.server.checks.MapReduce2JobHistoryStatePreservingCheck</check>
+ <check>org.apache.ambari.server.checks.SecondaryNamenodeDeletedCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesMapReduceDistributedCacheCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesNamenodeHighAvailabilityCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesTezDistributedCacheCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesYarnWorkPreservingCheck</check>
+ <check>org.apache.ambari.server.checks.YarnRMHighAvailabilityCheck</check>
+ <check>org.apache.ambari.server.checks.YarnTimelineServerStatePreservingCheck</check>
+ </prerequisite-checks>
+
<order>
<group xsi:type="cluster" name="CLUSTER_SERVER_ACTIONS" title="Cluster Server Actions">
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f5d07b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
index 0ddc231..4f71b4a 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
@@ -19,6 +19,18 @@
<target>2.2.*.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
+ <prerequisite-checks>
+ <!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
+ <check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
+ <check>org.apache.ambari.server.checks.MapReduce2JobHistoryStatePreservingCheck</check>
+ <check>org.apache.ambari.server.checks.SecondaryNamenodeDeletedCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesMapReduceDistributedCacheCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesNamenodeHighAvailabilityCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesTezDistributedCacheCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesYarnWorkPreservingCheck</check>
+ <check>org.apache.ambari.server.checks.YarnRMHighAvailabilityCheck</check>
+ <check>org.apache.ambari.server.checks.YarnTimelineServerStatePreservingCheck</check>
+ </prerequisite-checks>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Pre {{direction.text.proper}}">
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f5d07b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
index 794926e..bfd994e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
@@ -143,7 +143,6 @@
<task xsi:type="restart-task" />
</upgrade>
<post-upgrade>
- <task xsi:type="configure" />
</post-upgrade>
</component>
</service>
@@ -154,11 +153,7 @@
<task xsi:type="execute" hosts="master">
<command>su - {hdfs-user} -c 'dosomething'</command>
</task>
- <task xsi:type="configure">
- <type>hdfs-site</type>
- <key>myproperty</key>
- <value>mynewvalue</value>
- </task>
+ <task xsi:type="configure" id="hdp_2_1_1_nn_test"/>
<task xsi:type="manual">
<message>{{direction.verb.proper}} your database</message>
</task>
@@ -210,18 +205,7 @@
<message>The HiveServer port will now change to 10010 if hive is using a binary transfer mode or 10011 if hive is using an http transport mode. You can use "netstat -anp | grep 1001[01]" to determine if the port is available on each of following HiveServer host(s): {{hosts.all}}. If the port is not available, the process using it must be terminated.</message>
</task>
- <task xsi:type="configure">
- <condition type="hive-site" key="hive.server2.transport.mode" value="binary">
- <type>hive-site</type>
- <key>hive.server2.thrift.port</key>
- <value>10010</value>
- </condition>
- <condition type="hive-site" key="hive.server2.transport.mode" value="http">
- <type>hive-site</type>
- <key>hive.server2.http.port</key>
- <value>10011</value>
- </condition>
- </task>
+ <task xsi:type="configure" id="hdp_2_1_1_test_properties"/>
</pre-upgrade>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f5d07b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml
index b3520f3..597270e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml
@@ -19,7 +19,18 @@
<target>2.2.*</target>
<skip-failures>true</skip-failures>
<skip-service-check-failures>true</skip-service-check-failures>
-
+ <prerequisite-checks>
+ <check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
+ <check>org.apache.ambari.server.checks.MapReduce2JobHistoryStatePreservingCheck</check>
+ <check>org.apache.ambari.server.checks.SecondaryNamenodeDeletedCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesMapReduceDistributedCacheCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesNamenodeHighAvailabilityCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesNamenodeTruncateCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesTezDistributedCacheCheck</check>
+ <check>org.apache.ambari.server.checks.ServicesYarnWorkPreservingCheck</check>
+ <check>org.apache.ambari.server.checks.YarnRMHighAvailabilityCheck</check>
+ <check>org.apache.ambari.server.checks.YarnTimelineServerStatePreservingCheck</check>
+ </prerequisite-checks>
<order>
<group name="ZOOKEEPER" title="Zookeeper">
<skippable>true</skippable>