Repository: incubator-slider Updated Branches: refs/heads/develop 27537b55b -> 1df52b805
SLIDER-773 Add co-processor support for app packages - additional fix for windows (Thomas Liu via gourksaha) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1df52b80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1df52b80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1df52b80 Branch: refs/heads/develop Commit: 1df52b8050450c6d21527e575fe4f5d62f4c7ad3 Parents: 27537b5 Author: Gour Saha <[email protected]> Authored: Thu May 14 14:38:42 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Thu May 14 14:38:42 2015 -0700 ---------------------------------------------------------------------- .../package/scripts/all.py | 19 +++++++++++++------ .../package/scripts/cl.py | 19 +++++++++++++------ .../package/scripts/COMMAND_LOGGER.py | 19 +++++++++++++------ .../ApplicationWithAddonPackagesIT.groovy | 2 +- 4 files changed, 40 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1df52b80/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py index ad5ff44..9361e10 100644 --- a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py +++ b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py @@ -21,16 +21,23 @@ limitations under the License. import sys import subprocess from resource_management import * - +import tempfile class ALL(Script): def install(self, env): self.install_packages(env) - tmp_file_path = "test_slider" - tmp_file = open(tmp_file_path, 'w') - tmp_file.write("testing...") - cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", tmp_file_path, "/tmp"], stdout=subprocess.PIPE) - cat.communicate() + f = tempfile.NamedTemporaryFile(mode='w+t') + TMP_LOCAL_FILE = f.name + try: + tmp_file = open(TMP_LOCAL_FILE, 'w') + tmp_file.write("testing...") + tmp_file.close() + print TMP_LOCAL_FILE + cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", TMP_LOCAL_FILE, + "/tmp/test_slider.txt"], stdout=subprocess.PIPE) + cat.communicate() + finally: + f.close() print "running install for all components in add on pkg" def configure(self, env): http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1df52b80/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py index 9a0f6e1..1316db0 100644 --- a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py +++ b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py @@ -21,16 +21,23 @@ limitations under the License. import sys import subprocess from resource_management import * - +import tempfile class CL(Script): def install(self, env): self.install_packages(env) - tmp_file_path = "test_slider" - tmp_file = open(tmp_file_path, 'w') - tmp_file.write("testing...") - cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", tmp_file_path, "/tmp"], stdout=subprocess.PIPE) - cat.communicate() + f = tempfile.NamedTemporaryFile(mode='w+t') + try: + TMP_LOCAL_FILE = f.name + tmp_file = open(TMP_LOCAL_FILE, 'w') + tmp_file.write("testing...") + tmp_file.close() + print TMP_LOCAL_FILE + cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", TMP_LOCAL_FILE, + "/tmp/test_slider.txt"], stdout=subprocess.PIPE) + cat.communicate() + finally: + f.close() print "running install for all components in add on pkg" def configure(self, env): http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1df52b80/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py index 61ffc2f..774e7be 100644 --- a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py +++ b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py @@ -21,16 +21,23 @@ limitations under the License. import sys import subprocess from resource_management import * - +import tempfile class COMMAND_LOGGER(Script): def install(self, env): self.install_packages(env) - tmp_file_path = "test_slider" - tmp_file = open(tmp_file_path, 'w') - tmp_file.write("testing...") - cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", tmp_file_path, "/tmp"], stdout=subprocess.PIPE) - cat.communicate() + f = tempfile.NamedTemporaryFile(mode='w+t') + try: + TMP_LOCAL_FILE = f.name + tmp_file = open(TMP_LOCAL_FILE, 'w') + tmp_file.write("testing...") + tmp_file.close() + print TMP_LOCAL_FILE + cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", TMP_LOCAL_FILE, + "/tmp/test_slider.txt"], stdout=subprocess.PIPE) + cat.communicate() + finally: + f.close() print "running install for command_logger components in add on pkg" def configure(self, env): http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1df52b80/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy index ddb0e54..5e821b9 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy @@ -66,7 +66,7 @@ public class ApplicationWithAddonPackagesIT extends AgentCommandTestBase{ static String ADD_ON_PACKAGE_MULTI_COMPONENT_PKG_FILE = "target/package-tmp/add-on-package-apply-on-multi-component.zip" static String ADD_ON_PACKAGE_NO_COMPONENT_PKG_NAME = "add-on-package-apply-on-no-component" static String ADD_ON_PACKAGE_NO_COMPONENT_PKG_FILE = "target/package-tmp/add-on-package-apply-on-no-component.zip" - static String TARGET_FILE = "/tmp/test_slider" + static String TARGET_FILE = "/tmp/test_slider.txt" protected String APP_RESOURCE = getAppResource() protected String APP_TEMPLATE = getAppTemplate()
