You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/08/23 01:43:51 UTC
[1/2] git commit: AMBARI-2997. Update latest stack repo url.
Updated Branches:
refs/heads/branch-1.4 acbcb9df6 -> b1269557c
AMBARI-2997. Update latest stack repo url.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/b3563ae4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/b3563ae4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/b3563ae4
Branch: refs/heads/branch-1.4
Commit: b3563ae4ef563e2c9607466b02381609398fc0fd
Parents: acbcb9d
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Aug 22 14:38:40 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Aug 22 16:43:01 2013 -0700
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml | 12 ++++++------
.../resources/stacks/HDPLocal/2.0.5/repos/repoinfo.xml | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b3563ae4/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml
index f321374..4357291 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml
@@ -18,42 +18,42 @@
<reposinfo>
<os type="centos6">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/centos6</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/centos6</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="centos5">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/centos5</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/centos5</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat6">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/centos6</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/centos6</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat5">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/centos5</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/centos5</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="suse11">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/suse11</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/suse11</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="sles11">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/suse11</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/suse11</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b3563ae4/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/repos/repoinfo.xml
index 86756cc..3211836 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/repos/repoinfo.xml
@@ -18,42 +18,42 @@
<reposinfo>
<os type="centos6">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/centos6</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/centos6</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="centos5">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/centos5</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/centos5</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat6">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/centos6</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/centos6</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat5">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/centos5</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/centos5</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="suse11">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/suse11</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/suse11</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="sles11">
<repo>
- <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-41/repos/suse11</baseurl>
+ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0-55/repos/suse11</baseurl>
<repoid>HDP-2.0.5</repoid>
<reponame>HDP</reponame>
</repo>
[2/2] git commit: AMBARI-2968. Configuration update fails after
upgrade.
Posted by sm...@apache.org.
AMBARI-2968. Configuration update fails after upgrade.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/b1269557
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/b1269557
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/b1269557
Branch: refs/heads/branch-1.4
Commit: b1269557c56e0972333ad7fb90ee5cfa058a3af0
Parents: b3563ae
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Aug 22 16:21:19 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Aug 22 16:43:12 2013 -0700
----------------------------------------------------------------------
.../upgrade/dml/Ambari-DML-Postgres-UPGRADE_STACK.sql | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b1269557/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Postgres-UPGRADE_STACK.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Postgres-UPGRADE_STACK.sql b/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Postgres-UPGRADE_STACK.sql
index 88f022b..5e00413 100644
--- a/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Postgres-UPGRADE_STACK.sql
+++ b/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Postgres-UPGRADE_STACK.sql
@@ -21,6 +21,10 @@ PREPARE clusters (text, text) AS
UPDATE ambari.clusters
SET desired_stack_version = '{"stackName":"' || $1 || '","stackVersion":"' || $2 || '"}';
+PREPARE clusterstate (text, text) AS
+ UPDATE ambari.clusterstate
+ SET current_stack_version = '{"stackName":"' || $1 || '","stackVersion":"' || $2 || '"}';
+
PREPARE hostcomponentdesiredstate (text, text) AS
UPDATE ambari.hostcomponentdesiredstate
SET desired_stack_version = '{"stackName":"' || $1 || '","stackVersion":"' || $2 || '"}';
@@ -37,8 +41,14 @@ PREPARE servicedesiredstate (text, text) AS
UPDATE ambari.servicedesiredstate
SET desired_stack_version = '{"stackName":"' || $1 || '","stackVersion":"' || $2 || '"}';
+PREPARE resetcomponentstate AS
+ UPDATE ambari.hostcomponentstate
+ SET current_state = 'INSTALLED' where current_state = 'UPGRADING';
+
EXECUTE clusters(:stack_name, :stack_version);
+EXECUTE clusterstate(:stack_name, :stack_version);
EXECUTE hostcomponentdesiredstate(:stack_name, :stack_version);
EXECUTE hostcomponentstate(:stack_name, :stack_version);
EXECUTE servicecomponentdesiredstate(:stack_name, :stack_version);
-EXECUTE servicedesiredstate(:stack_name, :stack_version);
\ No newline at end of file
+EXECUTE servicedesiredstate(:stack_name, :stack_version);
+EXECUTE resetcomponentstate;
\ No newline at end of file