You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/01/24 03:11:54 UTC
ambari git commit: AMBARI-9315. RU - Finalize failed because some
SQOOP and HCAT not in upgrade pack (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 49955a359 -> 85f61a73e
AMBARI-9315. RU - Finalize failed because some SQOOP and HCAT not in upgrade pack (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85f61a73
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85f61a73
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85f61a73
Branch: refs/heads/trunk
Commit: 85f61a73e7f345673106410f972ba438aaa49a96
Parents: 49955a3
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Fri Jan 23 16:15:17 2015 -0800
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Fri Jan 23 18:11:42 2015 -0800
----------------------------------------------------------------------
.../SQOOP/1.4.4.2.0/package/scripts/params.py | 3 +++
.../1.4.4.2.0/package/scripts/sqoop_client.py | 8 ++++++++
.../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 18 ++++++++++++++++++
3 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/85f61a73/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py
index 27a75e4..92e2b82 100644
--- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py
@@ -28,6 +28,9 @@ stack_name = default("/hostLevelParams/stack_name", None)
stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
+# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade
+version = default("/commandParams/version", None)
+
#hadoop params
if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0:
sqoop_conf_dir = '/etc/sqoop/conf'
http://git-wip-us.apache.org/repos/asf/ambari/blob/85f61a73/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py
index a795cfc..d836513 100644
--- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py
+++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py
@@ -20,6 +20,7 @@ limitations under the License.
import sys
from resource_management import *
+from resource_management.libraries.functions.version import compare_versions, format_hdp_stack_version
from sqoop import sqoop
@@ -29,6 +30,13 @@ class SqoopClient(Script):
def get_stack_to_component(self):
return {"HDP": "sqoop-client"}
+ def pre_rolling_restart(self, env):
+ import params
+ env.set_params(params)
+
+ if params.version and compare_versions(format_hdp_stack_version(params.version), '2.2.0.0') >= 0:
+ Execute(format("hdp-select set sqoop-client {version}"))
+
def install(self, env):
self.install_packages(env)
self.configure(env)
http://git-wip-us.apache.org/repos/asf/ambari/blob/85f61a73/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
index 017493f..4cff683 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
@@ -138,6 +138,10 @@
<component>PIG</component>
</service>
+ <service name="SQOOP">
+ <component>SQOOP</component>
+ </service>
+
<service name="HIVE">
<component>HIVE_CLIENT</component>
<component>HCAT</component>
@@ -372,6 +376,14 @@
</component>
</service>
+ <service name="SQOOP">
+ <component name="SQOOP">
+ <upgrade>
+ <task xsi:type="restart" />
+ </upgrade>
+ </component>
+ </service>
+
<service name="HIVE">
<component name="HIVE_METASTORE">
<pre-upgrade>
@@ -428,6 +440,12 @@
<task xsi:type="restart" />
</upgrade>
</component>
+
+ <component name="HCAT">
+ <upgrade>
+ <task xsi:type="restart" />
+ </upgrade>
+ </component>
</service>
<service name="SLIDER">