You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/02/04 15:58:20 UTC
git commit: AMBARI-4519. Several failures on Suse install (aonishuk)
Updated Branches:
refs/heads/trunk 2d8117e01 -> 0e58a038e
AMBARI-4519. Several failures on Suse install (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e58a038
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e58a038
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e58a038
Branch: refs/heads/trunk
Commit: 0e58a038efa498afb0891fdf1c965f573dac080b
Parents: 2d8117e
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Tue Feb 4 06:56:51 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Tue Feb 4 06:58:02 2014 -0800
----------------------------------------------------------------------
.../src/main/python/resource_management/core/environment.py | 5 +++--
.../resource_management/core/providers/package/zypper.py | 4 ++--
.../python/resource_management/core/providers/system.py | 4 ++--
.../src/main/python/resource_management/core/shell.py | 2 +-
.../test/python/resource_management/TestExecuteResource.py | 9 ++++-----
5 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e58a038/ambari-agent/src/main/python/resource_management/core/environment.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/environment.py b/ambari-agent/src/main/python/resource_management/core/environment.py
index 07aef95..8f0ec27 100644
--- a/ambari-agent/src/main/python/resource_management/core/environment.py
+++ b/ambari-agent/src/main/python/resource_management/core/environment.py
@@ -150,8 +150,9 @@ class Environment(object):
else:
try:
self.run_action(resource, action)
- except Exception:
- pass
+ except Exception as ex:
+ Logger.info("Skipping failure of %s due to ignore_failures. Failure reason: %s" % (resource, str(ex)))
+ pass
# Run delayed actions
while self.delayed_actions:
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e58a038/ambari-agent/src/main/python/resource_management/core/providers/package/zypper.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/providers/package/zypper.py b/ambari-agent/src/main/python/resource_management/core/providers/package/zypper.py
index 8815261..d495f83 100644
--- a/ambari-agent/src/main/python/resource_management/core/providers/package/zypper.py
+++ b/ambari-agent/src/main/python/resource_management/core/providers/package/zypper.py
@@ -30,7 +30,7 @@ REMOVE_CMD = "/usr/bin/zypper --quiet remove --no-confirm %s"
class ZypperProvider(PackageProvider):
def install_package(self, name):
cmd = INSTALL_CMD % (name)
- Logger.info("Installing package %s ('%s')", name, cmd)
+ Logger.info("Installing package %s ('%s')" % (name, cmd))
shell.checked_call(cmd)
def upgrade_package(self, name):
@@ -38,5 +38,5 @@ class ZypperProvider(PackageProvider):
def remove_package(self, name):
cmd = REMOVE_CMD % (name)
- Logger.info("Removing package %s ('%s')", name, cmd)
+ Logger.info("Removing package %s ('%s')" % (name, cmd))
shell.checked_call(cmd)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e58a038/ambari-agent/src/main/python/resource_management/core/providers/system.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/providers/system.py b/ambari-agent/src/main/python/resource_management/core/providers/system.py
index 5191113..98c0112 100644
--- a/ambari-agent/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-agent/src/main/python/resource_management/core/providers/system.py
@@ -190,7 +190,7 @@ class LinkProvider(Provider):
os.link(self.resource.to, path)
else:
if not os.path.exists(self.resource.to):
- Logger.info("Warning: linking to nonexistent location %s", self.resource.to)
+ Logger.info("Warning: linking to nonexistent location %s" % self.resource.to)
Logger.info("Creating symbolic %s" % self.resource)
os.symlink(self.resource.to, path)
@@ -236,7 +236,7 @@ class ExecuteProvider(Provider):
if i == self.resource.tries-1: # last try
raise ex
else:
- Logger.info("Retrying after %d seconds. Reason: %s", self.resource.try_sleep, str(ex))
+ Logger.info("Retrying after %d seconds. Reason: %s" % (self.resource.try_sleep, str(ex)))
time.sleep(self.resource.try_sleep)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e58a038/ambari-agent/src/main/python/resource_management/core/shell.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/shell.py b/ambari-agent/src/main/python/resource_management/core/shell.py
index 7133791..5a8765e 100644
--- a/ambari-agent/src/main/python/resource_management/core/shell.py
+++ b/ambari-agent/src/main/python/resource_management/core/shell.py
@@ -61,7 +61,7 @@ def _call(command, logoutput=False, throw_on_failure=True,
cwd=cwd, env=env, shell=False,
preexec_fn=preexec_fn)
- out = proc.communicate()[0]
+ out = proc.communicate()[0].strip('\n')
code = proc.returncode
if logoutput and out and out!="":
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e58a038/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestExecuteResource.py b/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
index 10b3bb6..d2ade81 100644
--- a/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
@@ -80,9 +80,9 @@ class TestExecuteResource(TestCase):
)
self.assertEqual(execute_resource.environment["PATH"], '/test/one:test/two')
- @patch.object(logging.Logger, "info")
+ @patch('time.sleep')
@patch.object(subprocess, "Popen")
- def test_attribute_try_sleep_tries(self, popen_mock, info_mock):
+ def test_attribute_try_sleep_tries(self, popen_mock, time_mock):
expected_call = "call('Retrying after %d seconds. Reason: %s', 1, 'Fail')"
subproc_mock = MagicMock()
@@ -93,12 +93,11 @@ class TestExecuteResource(TestCase):
with Environment("/") as env:
Execute('echo "1"',
tries=2,
- try_sleep=1
+ try_sleep=10
)
pass
- self.assertEqual(info_mock.call_count, 2)
- self.assertTrue(expected_call in str(info_mock.call_args_list))
+ time_mock.assert_called_once_with(10)
@patch.object(pwd, "getpwnam")
def test_attribute_group(self, getpwnam_mock):