From 7553ae8fc827d9bf84956f61750b87409d0f7bfe Mon Sep 17 00:00:00 2001 From: Shu Yingya Date: Mon, 29 Jan 2018 10:49:41 +0800 Subject: [PATCH] Remove step upload package to oozie/sharelib It is not robust to upload a special package in a common method. However, because of change from Hadoop(2.8.2 and later)side, we do need the dependency package "commons-httpclient" in oozie/sharelib to let oozie work. This patch removes the uploading step in sahara because there is a patch 2eedcec728b4f93e4cb226c5137159dcb3ddbfa3 which add "commons-httpclient" as a dependency to oozie/sharelib. So when we build the oozie binary package, "commons-httpclient" will be as a part of it. Change-Id: I4f20a356efc2dcc51aac2f10105be6aa351f87e8 --- ...zie-sharelib-step-in-vanilla-2.8.2-546b2026e2f5d557.yaml | 6 ++++++ sahara/plugins/vanilla/hadoop2/run_scripts.py | 2 -- .../tests/unit/plugins/vanilla/hadoop2/test_run_scripts.py | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/remove-upload-oozie-sharelib-step-in-vanilla-2.8.2-546b2026e2f5d557.yaml diff --git a/releasenotes/notes/remove-upload-oozie-sharelib-step-in-vanilla-2.8.2-546b2026e2f5d557.yaml b/releasenotes/notes/remove-upload-oozie-sharelib-step-in-vanilla-2.8.2-546b2026e2f5d557.yaml new file mode 100644 index 0000000000..55ea288e39 --- /dev/null +++ b/releasenotes/notes/remove-upload-oozie-sharelib-step-in-vanilla-2.8.2-546b2026e2f5d557.yaml @@ -0,0 +1,6 @@ +--- +issues: + - | + Remove the step "upload httpclient to oozie/sharelib" in sahara code. + User should use latest vanilla-2.8.2 image which is built on SIE + "Change-ID: I3a25ee8c282849911089adf6c3593b1bb50fd067". diff --git a/sahara/plugins/vanilla/hadoop2/run_scripts.py b/sahara/plugins/vanilla/hadoop2/run_scripts.py index 319850eab0..48e61c563b 100644 --- a/sahara/plugins/vanilla/hadoop2/run_scripts.py +++ b/sahara/plugins/vanilla/hadoop2/run_scripts.py @@ -192,8 +192,6 @@ def _oozie_share_lib(remote): 'hadoop fs -mkdir /user && ' 'hadoop fs -mkdir /user/hadoop && ' 'hadoop fs -put /tmp/oozielib/share /user/hadoop/ && ' - 'hadoop fs -put /opt/oozie/libtools/commons-httpclient-3.1.jar ' - '/user/hadoop/share/lib/oozie/ &&' 'rm -rf /tmp/oozielib" hadoop') LOG.debug("Creating sqlfile for Oozie") diff --git a/sahara/tests/unit/plugins/vanilla/hadoop2/test_run_scripts.py b/sahara/tests/unit/plugins/vanilla/hadoop2/test_run_scripts.py index 583c23fb5d..8ffb4be1a8 100644 --- a/sahara/tests/unit/plugins/vanilla/hadoop2/test_run_scripts.py +++ b/sahara/tests/unit/plugins/vanilla/hadoop2/test_run_scripts.py @@ -189,8 +189,6 @@ class RunScriptsTest(base.SaharaTestCase): 'hadoop fs -mkdir /user && ' \ 'hadoop fs -mkdir /user/hadoop && ' \ 'hadoop fs -put /tmp/oozielib/share /user/hadoop/ && ' \ - 'hadoop fs -put /opt/oozie/libtools/commons-httpclient-3.1.jar ' \ - '/user/hadoop/share/lib/oozie/ &&' \ 'rm -rf /tmp/oozielib" hadoop' cmd_2 = 'sudo su - -c "/opt/oozie/bin/ooziedb.sh ' \ 'create -sqlfile oozie.sql ' \