Repository: ambari Updated Branches: refs/heads/branch-1.7.0 ee70e1743 -> de41d70a9 refs/heads/trunk 7711dadb2 -> 3d1787b33
AMBARI-7858. When datanode install fails due to timeout, user is shown a strange warning (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f9fe992f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f9fe992f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f9fe992f Branch: refs/heads/trunk Commit: f9fe992f1d5c185c9f39dd498f5345c9fc0931f5 Parents: 7711dad Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Mon Oct 20 20:56:01 2014 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Mon Oct 20 20:56:01 2014 +0300 ---------------------------------------------------------------------- .../python/resource_management/libraries/functions/file_system.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f9fe992f/ambari-common/src/main/python/resource_management/libraries/functions/file_system.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/file_system.py b/ambari-common/src/main/python/resource_management/libraries/functions/file_system.py index ced4cd3..f395143 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/file_system.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/file_system.py @@ -34,10 +34,11 @@ def get_and_cache_mount_points(refresh=False): :return: Returns the "mounts" variable. Calculates and caches it the first time if it is None or the "refresh" param is set to True. """ + global mounts + if mounts is not None and not refresh: return mounts else: - global mounts mounts = mount.get_mounted() for m in mounts: if m["mount_point"] is not None:
