ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [2/2] ambari git commit: AMBARI-13101. RU multiple component restart failures during rolling upgrade on Debian7 (aonishuk)
Date Tue, 15 Sep 2015 13:00:06 GMT
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/e395d0da
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e395d0da
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e395d0da

Branch: refs/heads/branch-2.1
Commit: e395d0da4d471f2bf17a85be6fe75fdb5d4814be
Parents: ee20c24
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Sep 15 15:59:57 2015 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Sep 15 15:59:57 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/e395d0da/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/e395d0da/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 bfcef1a..d2f760d 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


Mime
View raw message