You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/12/02 18:43:19 UTC
ambari git commit: AMBARI-14150 Remove Obsolete Upgrade Pre-requisite
Check Logic (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 35f0d3c42 -> 2a970f8de
AMBARI-14150 Remove Obsolete Upgrade Pre-requisite Check Logic (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a970f8d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a970f8d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a970f8d
Branch: refs/heads/trunk
Commit: 2a970f8de48656012d7aba364f1066cec31de99b
Parents: 35f0d3c
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Dec 2 19:42:46 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed Dec 2 19:43:01 2015 +0200
----------------------------------------------------------------------
ambari-server/conf/unix/ambari.properties | 2 --
.../server/checks/AbstractCheckDescriptor.java | 34 --------------------
.../server/configuration/Configuration.java | 12 -------
.../checks/ClientRetryPropertyCheckTest.java | 2 --
.../checks/ComponentsInstallationCheckTest.java | 2 --
.../checks/ConfigurationMergeCheckTest.java | 2 --
.../HiveDynamicServiceDiscoveryCheckTest.java | 2 --
.../checks/HiveMultipleMetastoreCheckTest.java | 2 --
.../server/checks/HostsHeartbeatCheckTest.java | 2 --
.../checks/HostsMasterMaintenanceCheckTest.java | 2 --
.../checks/HostsRepositoryVersionCheckTest.java | 2 --
.../server/checks/InstallPackagesCheckTest.java | 2 --
...duce2JobHistoryStatePreservingCheckTest.java | 2 --
.../SecondaryNamenodeDeletedCheckTest.java | 2 --
.../ServicesMaintenanceModeCheckTest.java | 2 --
...vicesMapReduceDistributedCacheCheckTest.java | 2 --
...rvicesNamenodeHighAvailabilityCheckTest.java | 2 --
.../ServicesNamenodeTruncateCheckTest.java | 2 --
.../ServicesTezDistributedCacheCheckTest.java | 2 --
.../server/checks/ServicesUpCheckTest.java | 2 --
.../ServicesYarnWorkPreservingCheckTest.java | 2 --
...nTimelineServerStatePreservingCheckTest.java | 2 --
22 files changed, 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index 8f2978c..3dac63e 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -93,8 +93,6 @@ user.inactivity.timeout.role.readonly.default=0
# to skip service checks during deploy
skip.service.checks=false
-rolling.upgrade.min.stack=HDP-2.2
-rolling.upgrade.max.stack=
rolling.upgrade.skip.packages.prefixes=
# HTTP Header settings for Ambari Server UI
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
index c29d64c..80f1c1c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
@@ -133,40 +133,6 @@ public abstract class AbstractCheckDescriptor {
}
/**
- * Gets the earliest stack that the upgrade check is compatible with. By
- * default, all checks will return rolling.upgrade.min.stack since this is the
- * first stack version that supports automated upgrades.
- *
- * @return the earliest stack that the upgrade check is compatible with, or
- * {@code null} for all.
- */
- public StackId getSourceStack(){
- String minStackId = config.getRollingUpgradeMinStack();
- if(minStackId == null || minStackId.isEmpty()) {
- return null;
- }
- return new StackId(minStackId);
- }
-
- /**
- * Gets the most recent stack that the upgrade check is compatible with. By
- * default, this will return rolling.upgrade.max.stack, which is typically
- * set to null to indicate all future stacks are compatible.
- * If an upgrade check is not compatible with a future stack, then
- * this method should be overridden.
- *
- * @return the most recent stack that the upgrade check is compatible with, or
- * {@code null} for all.
- */
- public StackId getTargetStack() {
- String maxStackId = config.getRollingUpgradeMaxStack();
- if(maxStackId == null || maxStackId.isEmpty()) {
- return null;
- }
- return new StackId(maxStackId);
- }
-
- /**
* Executes check against given cluster.
*
* @param prerequisiteCheck dto for upgrade check results
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 63cff01..c31a119 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -190,11 +190,7 @@ public class Configuration {
public static final String SERVER_JDBC_DRIVER_KEY = "server.jdbc.driver";
public static final String SERVER_JDBC_URL_KEY = "server.jdbc.url";
public static final String SERVER_JDBC_PROPERTIES_PREFIX = "server.jdbc.properties.";
- public static final String ROLLING_UPGRADE_MIN_STACK_KEY = "rolling.upgrade.min.stack";
- public static final String ROLLING_UPGRADE_MAX_STACK_KEY = "rolling.upgrade.max.stack";
public static final String ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_KEY = "rolling.upgrade.skip.packages.prefixes";
- public static final String ROLLING_UPGRADE_MIN_STACK_DEFAULT = "HDP-2.2";
- public static final String ROLLING_UPGRADE_MAX_STACK_DEFAULT = "";
public static final String ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_DEFAULT = "";
public static final String JWT_AUTH_ENBABLED = "authentication.jwt.enabled";
public static final String JWT_AUTH_PROVIDER_URL = "authentication.jwt.providerUrl";
@@ -1002,14 +998,6 @@ public class Configuration {
return properties.getProperty(STACK_ADVISOR_SCRIPT, STACK_ADVISOR_SCRIPT_DEFAULT);
}
- public String getRollingUpgradeMinStack() {
- return properties.getProperty(ROLLING_UPGRADE_MIN_STACK_KEY, ROLLING_UPGRADE_MIN_STACK_DEFAULT);
- }
-
- public String getRollingUpgradeMaxStack() {
- return properties.getProperty(ROLLING_UPGRADE_MAX_STACK_KEY, ROLLING_UPGRADE_MAX_STACK_DEFAULT);
- }
-
/**
* @return a list of prefixes. Packages whose name starts with any of these
* prefixes, should be skipped during upgrade.
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
index 6221112..7b8239c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
@@ -57,8 +57,6 @@ public class ClientRetryPropertyCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
m_check.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
index 5c93f44..450d74e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
@@ -69,8 +69,6 @@ public class ComponentsInstallationCheckTest {
checkRequest.setTargetStackId(new StackId("HDP", "2.2"));
ComponentsInstallationCheck cic = new ComponentsInstallationCheck();
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
cic.config = config;
Assert.assertTrue(cic.isApplicable(checkRequest));
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java
index dae0a58..68a0522 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java
@@ -90,8 +90,6 @@ public class ConfigurationMergeCheckTest {
ConfigurationMergeCheck cmc = new ConfigurationMergeCheck();
Configuration config = EasyMock.createMock(Configuration.class);
- expect(config.getRollingUpgradeMinStack()).andReturn("HDP-2.2").anyTimes();
- expect(config.getRollingUpgradeMaxStack()).andReturn("").anyTimes();
replay(config);
cmc.config = config;
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveDynamicServiceDiscoveryCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveDynamicServiceDiscoveryCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveDynamicServiceDiscoveryCheckTest.java
index 047c8f7..cdf13eb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveDynamicServiceDiscoveryCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveDynamicServiceDiscoveryCheckTest.java
@@ -58,8 +58,6 @@ public class HiveDynamicServiceDiscoveryCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
m_check.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
index 263ec1f..16f383a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
@@ -57,8 +57,6 @@ public class HiveMultipleMetastoreCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
m_check.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsHeartbeatCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsHeartbeatCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsHeartbeatCheckTest.java
index 4ad2819..cc2c276 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsHeartbeatCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsHeartbeatCheckTest.java
@@ -52,8 +52,6 @@ public class HostsHeartbeatCheckTest {
checkRequest.setTargetStackId(new StackId("HDP", "2.2"));
HostsHeartbeatCheck hhc = new HostsHeartbeatCheck();
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
hhc.config = config;
Assert.assertTrue(hhc.isApplicable(checkRequest));
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
index 3f79767..9fcb319 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
@@ -57,8 +57,6 @@ public class HostsMasterMaintenanceCheckTest {
request.setRepositoryVersion("not null");
HostsMasterMaintenanceCheck hmmc = new HostsMasterMaintenanceCheck();
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
hmmc.config = config;
Assert.assertTrue(hmmc.isApplicable(request));
Assert.assertTrue(new HostsMasterMaintenanceCheck().isApplicable(request));
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheckTest.java
index 42a3bb4..4529554 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheckTest.java
@@ -57,8 +57,6 @@ public class HostsRepositoryVersionCheckTest {
request.setRepositoryVersion("not null");
HostsRepositoryVersionCheck hrvc = new HostsRepositoryVersionCheck();
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
hrvc.config = config;
Assert.assertTrue(hrvc.isApplicable(request));
Assert.assertTrue(new HostsMasterMaintenanceCheck().isApplicable(request));
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java
index 18672e3..56aa1f3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java
@@ -74,8 +74,6 @@ public class InstallPackagesCheckTest {
checkRequest.setTargetStackId(targetStackId);
InstallPackagesCheck ipc = new InstallPackagesCheck();
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
ipc.config = config;
Assert.assertTrue(ipc.isApplicable(checkRequest));
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheckTest.java
index 0ee00d5..bfe0c3e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheckTest.java
@@ -60,8 +60,6 @@ public class MapReduce2JobHistoryStatePreservingCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
m_check.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheckTest.java
index 80740b3..e2617bf 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheckTest.java
@@ -68,8 +68,6 @@ public class SecondaryNamenodeDeletedCheckTest {
secondaryNamenodeDeletedCheck.hostComponentStateDao = hostComponentStateDAO;
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
secondaryNamenodeDeletedCheck.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java
index 0eb3ace..a941b7a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java
@@ -51,8 +51,6 @@ public class ServicesMaintenanceModeCheckTest {
ServicesMaintenanceModeCheck smmc = new ServicesMaintenanceModeCheck();
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
smmc.config = config;
Assert.assertTrue(smmc.isApplicable(checkRequest));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
index 77d3469..22f2b1b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
@@ -56,8 +56,6 @@ public class ServicesMapReduceDistributedCacheCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
servicesMapReduceDistributedCacheCheck.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheckTest.java
index 5713f59..abe7abe 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheckTest.java
@@ -57,8 +57,6 @@ public class ServicesNamenodeHighAvailabilityCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
servicesNamenodeHighAvailabilityCheck.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java
index 7255ddc..87d4167 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java
@@ -72,8 +72,6 @@ public class ServicesNamenodeTruncateCheckTest {
replay(m_clusters, cluster, config);
Configuration configuration = EasyMock.createMock(Configuration.class);
- expect(configuration.getRollingUpgradeMinStack()).andReturn("HDP-2.2").anyTimes();
- expect(configuration.getRollingUpgradeMaxStack()).andReturn("").anyTimes();
replay(configuration);
m_check.config = configuration;
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
index 49db159..334b3b3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
@@ -56,8 +56,6 @@ public class ServicesTezDistributedCacheCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
servicesTezDistributedCacheCheck.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
index 67b801c..88826a0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
@@ -67,8 +67,6 @@ public class ServicesUpCheckTest {
checkRequest.setTargetStackId(new StackId("HDP", "2.2"));
ServicesUpCheck suc = new ServicesUpCheck();
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
suc.config = config;
Assert.assertTrue(suc.isApplicable(checkRequest));
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java
index 5658f17..98cfb18 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java
@@ -57,8 +57,6 @@ public class ServicesYarnWorkPreservingCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
servicesYarnWorkPreservingCheck.config = config;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a970f8d/ambari-server/src/test/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheckTest.java
index 1657722..7469bbc 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheckTest.java
@@ -61,8 +61,6 @@ public class YarnTimelineServerStatePreservingCheckTest {
}
};
Configuration config = Mockito.mock(Configuration.class);
- Mockito.when(config.getRollingUpgradeMinStack()).thenReturn("HDP-2.2");
- Mockito.when(config.getRollingUpgradeMaxStack()).thenReturn("");
m_check.config = config;
}