ambari git commit: AMBARI-19285 - HOU pre-checks indicate HA as a requirement (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 0878b7e5f -> 675a02bf1
AMBARI-19285 - HOU pre-checks indicate HA as a requirement (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/675a02bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/675a02bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/675a02bf
Branch: refs/heads/branch-2.5
Commit: 675a02bf1898cab0c9e31b7d0cfde8dbf59a9540
Parents: 0878b7e5
Author: Jonathan Hurley
Authored: Thu Dec 22 12:07:25 2016 -0500
Committer: Jonathan Hurley
Committed: Fri Dec 23 11:05:00 2016 -0500
--
.../server/checks/AbstractCheckDescriptor.java | 22 +++-
.../ambari/server/checks/CheckDescription.java | 6 --
.../server/checks/ClientRetryPropertyCheck.java | 5 +-
.../checks/ComponentsInstallationCheck.java | 6 +-
.../server/checks/ConfigurationMergeCheck.java | 5 +-
.../HardcodedStackVersionPropertiesCheck.java | 6 +-
.../ambari/server/checks/HealthCheck.java | 5 +-
.../HiveDynamicServiceDiscoveryCheck.java | 6 +-
.../server/checks/HiveNotRollingWarning.java| 2 +-
.../server/checks/HostMaintenanceModeCheck.java | 5 +-
.../server/checks/HostsHeartbeatCheck.java | 6 +-
.../checks/HostsMasterMaintenanceCheck.java | 7 +-
.../checks/HostsRepositoryVersionCheck.java | 5 +-
.../server/checks/InstallPackagesCheck.java | 6 +-
.../server/checks/PreviousUpgradeCompleted.java | 32 +++---
.../server/checks/RangerPasswordCheck.java | 6 +-
.../checks/ServiceCheckValidityCheck.java | 5 +-
.../checks/ServicesMaintenanceModeCheck.java| 8 +-
.../ambari/server/checks/ServicesUpCheck.java | 6 +-
.../server/checks/StormRestAPIDeletedCheck.java | 108 ---
.../server/checks/StormShutdownWarning.java | 2 +-
.../ambari/server/checks/UpgradeCheck.java | 14 ++-
.../server/checks/UpgradeCheckRegistry.java | 2 +-
.../server/checks/VersionMismatchCheck.java | 6 +-
.../HDP/2.5/upgrades/host-upgrade-2.5.xml | 12 ---
.../checks/AbstractCheckDescriptorTest.java | 70
26 files changed, 189 insertions(+), 174 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/675a02bf/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 4bc64d4..27fc2c0 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
@@ -38,7 +38,9 @@ import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.stack.PrereqCheckType;
import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import org.apache.ambari.server.state.stack.UpgradePack;
import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -284,13 +286,23 @@ public abstract class AbstractCheckDescriptor {
}
/**
- * Return the optionality flag of the Upgrade Check
- * @return
+ * Gets whether this upgrade check is required for the specified
+ * {@link UpgradeType}. Checks which are marked as required do not need to be
+ * explicitely declared in the {@link UpgradePack} to be run.
+ *
+ * @return {@code true} if it is required, {@code false} otherwise.
*/
- public Boolean isRequired(){
- return getClass().getAnnotation(UpgradeCheck.class).required();
+ public boolean isRequired(UpgradeType upgradeType) {
+UpgradeType[] upgradeTypes =
getClass().getAnnotation(UpgradeCheck.class).required();
+for (UpgradeType requiredType : upgradeTypes) {
+ if (upgradeType == requiredType) {
+return true;
+ }
+}
+
+return false;
}
-
+
/**
* Return a boolean indicating whether or not configs allow bypassing errors
during the RU/EU PreChecks.
* @return
http://git-wip-us.apache.org/repos/asf/ambari/blob/675a02bf/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 45497b5..a
ambari git commit: AMBARI-19285 - HOU pre-checks indicate HA as a requirement (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 163fa4c9c -> 2304971d0
AMBARI-19285 - HOU pre-checks indicate HA as a requirement (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2304971d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2304971d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2304971d
Branch: refs/heads/trunk
Commit: 2304971d09f3c525ebd2b1cf864d82ee9b858d5e
Parents: 163fa4c
Author: Jonathan Hurley
Authored: Thu Dec 22 12:07:25 2016 -0500
Committer: Jonathan Hurley
Committed: Fri Dec 23 10:50:25 2016 -0500
--
.../server/checks/AbstractCheckDescriptor.java | 22 +++-
.../ambari/server/checks/CheckDescription.java | 6 -
.../server/checks/ClientRetryPropertyCheck.java | 5 +-
.../checks/ComponentsInstallationCheck.java | 6 +-
.../server/checks/ConfigurationMergeCheck.java | 5 +-
.../HardcodedStackVersionPropertiesCheck.java | 5 +-
.../ambari/server/checks/HealthCheck.java | 5 +-
.../HiveDynamicServiceDiscoveryCheck.java | 6 +-
.../server/checks/HiveNotRollingWarning.java| 2 +-
.../server/checks/HostMaintenanceModeCheck.java | 5 +-
.../server/checks/HostsHeartbeatCheck.java | 6 +-
.../checks/HostsMasterMaintenanceCheck.java | 7 +-
.../checks/HostsRepositoryVersionCheck.java | 5 +-
.../server/checks/InstallPackagesCheck.java | 6 +-
.../server/checks/PreviousUpgradeCompleted.java | 8 +-
.../server/checks/RangerPasswordCheck.java | 6 +-
.../checks/ServiceCheckValidityCheck.java | 5 +-
.../checks/ServicesMaintenanceModeCheck.java| 8 +-
.../ambari/server/checks/ServicesUpCheck.java | 6 +-
.../server/checks/StormRestAPIDeletedCheck.java | 109 ---
.../server/checks/StormShutdownWarning.java | 2 +-
.../ambari/server/checks/UpgradeCheck.java | 14 ++-
.../server/checks/UpgradeCheckRegistry.java | 2 +-
.../server/checks/VersionMismatchCheck.java | 6 +-
.../HDP/2.5/upgrades/host-ordered-upgrade.xml | 12 --
.../checks/AbstractCheckDescriptorTest.java | 70
26 files changed, 181 insertions(+), 158 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2304971d/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 3fc8650..36467c9 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
@@ -37,7 +37,9 @@ import org.apache.ambari.server.state.DesiredConfig;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.stack.PrereqCheckType;
import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import org.apache.ambari.server.state.stack.UpgradePack;
import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -283,13 +285,23 @@ public abstract class AbstractCheckDescriptor {
}
/**
- * Return the optionality flag of the Upgrade Check
- * @return
+ * Gets whether this upgrade check is required for the specified
+ * {@link UpgradeType}. Checks which are marked as required do not need to be
+ * explicitely declared in the {@link UpgradePack} to be run.
+ *
+ * @return {@code true} if it is required, {@code false} otherwise.
*/
- public Boolean isRequired(){
- return getClass().getAnnotation(UpgradeCheck.class).required();
+ public boolean isRequired(UpgradeType upgradeType) {
+UpgradeType[] upgradeTypes =
getClass().getAnnotation(UpgradeCheck.class).required();
+for (UpgradeType requiredType : upgradeTypes) {
+ if (upgradeType == requiredType) {
+return true;
+ }
+}
+
+return false;
}
-
+
/**
* Return a boolean indicating whether or not configs allow bypassing errors
during the RU/EU PreChecks.
* @return
http://git-wip-us.apache.org/repos/asf/ambari/blob/2304971d/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 45497b5..a204ada 1006
