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/06/25 22:08:49 UTC
ambari git commit: AMBARI-12145 ambari-server upgrade from Ambari
2.0.1 failed (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 1d403d5a7 -> 429535964
AMBARI-12145 ambari-server upgrade from Ambari 2.0.1 failed (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/42953596
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/42953596
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/42953596
Branch: refs/heads/branch-2.1
Commit: 4295359641cfdaac7a1e335a9762f2a1071d2fc4
Parents: 1d403d5
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Jun 25 21:06:43 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Jun 25 21:06:43 2015 +0300
----------------------------------------------------------------------
.../ambari/server/upgrade/UpgradeCatalog210.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/42953596/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index 1117abf..66c03fa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -766,6 +766,23 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
}
}
}
+ String UPDATE_CURRENT_STACK_ID_IF_NULL_TEMPLATE =
+ "UPDATE hostcomponentstate " +
+ "SET current_stack_id={0} " +
+ "WHERE current_stack_id IS NULL " +
+ "AND cluster_id={1} ";
+ rs = statement.executeQuery("SELECT cluster_id, current_stack_id FROM clusterstate");
+ if (rs != null) {
+ while (rs.next()) {
+ // if hostcomponentstate.current_stack_id is null,
+ // set to cluster's current_stack_id
+ long clusterId = rs.getLong("cluster_id");
+ long currentStackId = rs.getLong("current_stack_id");
+ String hostComponentStateSQL = MessageFormat.format(
+ UPDATE_CURRENT_STACK_ID_IF_NULL_TEMPLATE, currentStackId, clusterId);
+ dbAccessor.executeUpdate(hostComponentStateSQL, false);
+ }
+ }
} finally {
if (rs != null) {
rs.close();