Repository: ambari
Updated Branches:
  refs/heads/trunk ff3a095bc -> 6f713da58


AMBARI-21840 Upgrade pre-checks failing to run on trunk (dgrinenko)


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

Branch: refs/heads/trunk
Commit: 6f713da58b2ddf4c9a988648503df99293dde477
Parents: ff3a095
Author: Dmytro Grinenko <hapyles...@apache.org>
Authored: Tue Aug 29 17:25:45 2017 +0300
Committer: Dmytro Grinenko <hapyles...@apache.org>
Committed: Tue Aug 29 17:25:45 2017 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ambari/server/state/UpgradeContext.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6f713da5/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
index 4c28be3..64da7c3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
@@ -1125,6 +1125,7 @@ public class UpgradeContext {
 
       Predicate preUpgradeCheckPredicate = new PredicateBuilder().property(
           
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID).equals(cluster.getClusterName()).and().property(
+          
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_TARGET_REPOSITORY_VERSION_ID_ID).equals(repositoryVersionId).and().property(
           
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_FOR_REVERT_PROPERTY_ID).equals(m_isRevert).and().property(
           
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_UPGRADE_TYPE_PROPERTY_ID).equals(type).and().property(
           
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_UPGRADE_PACK_PROPERTY_ID).equals(preferredUpgradePack).toPredicate();

Reply via email to