Repository: ambari Updated Branches: refs/heads/branch-2.1 ee20c2442 -> e395d0da4 refs/heads/trunk afdfd2b09 -> 02668bfdc
AMBARI-13101. RU multiple component restart failures during rolling upgrade on Debian7 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/02668bfd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/02668bfd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/02668bfd Branch: refs/heads/trunk Commit: 02668bfdc83bd8aeb39f28342307cf74d8996cee Parents: afdfd2b Author: Andrew Onishuk <[email protected]> Authored: Tue Sep 15 15:59:54 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Tue Sep 15 15:59:54 2015 +0300 ---------------------------------------------------------------------- .../python/resource_management/libraries/functions/conf_select.py | 2 +- .../src/main/resources/custom_actions/scripts/install_packages.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/02668bfd/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py index e039a77..a820bc3 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py @@ -326,5 +326,5 @@ def create_config_links(stack_id, stack_version): select(args[0], k, stack_version) except Exception, err: # don't ruin someone's day - Logger.logger.exception("'conf-select set' failed to link '{k}'. Error: {0}".format(k, str(err))) + Logger.logger.exception("'conf-select set' failed to link '{0}'. Error: {1}".format(k, str(err))) http://git-wip-us.apache.org/repos/asf/ambari/blob/02668bfd/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py index 9d68b72..a5fd9f6 100644 --- a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py +++ b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py @@ -155,6 +155,7 @@ class InstallPackages(Script): else: num_errors += 1 except Exception, err: + num_errors += 1 Logger.logger.exception("Could not install packages. Error: {0}".format(str(err))) # Provide correct exit code
