You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by am...@apache.org on 2018/09/17 11:58:49 UTC
[ambari] branch branch-2.7 updated: AMBARI-24641. Stackadvisor error while trying to add atlas service. E… (#2323) (#2333)
This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new b18e295 AMBARI-24641. Stackadvisor error while trying to add atlas service. E… (#2323) (#2333)
b18e295 is described below
commit b18e2954b4f58e8725c2bef93862da9a4f80b84d
Author: Attila Magyar <m....@gmail.com>
AuthorDate: Mon Sep 17 13:58:44 2018 +0200
AMBARI-24641. Stackadvisor error while trying to add atlas service. E… (#2323) (#2333)
* AMBARI-24641. Stackadvisor error while trying to add atlas service. Error - "if mountPoints[mountPoint] < reqiuredDiskSpace: KeyError: None" (amagyar)
* AMBARI-24641. Stackadvisor error while trying to add atlas service. Error - "if mountPoints[mountPoint] < reqiuredDiskSpace: KeyError: None" (amagyar)
---
ambari-agent/src/main/python/ambari_agent/Hardware.py | 6 +++---
ambari-agent/src/test/python/ambari_agent/TestHardware.py | 4 ++--
ambari-server/src/main/resources/stacks/stack_advisor.py | 3 +++
.../src/main/resources/stacks/HDF/2.0/services/stack_advisor.py | 3 +++
.../src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py | 3 +++
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ambari-agent/src/main/python/ambari_agent/Hardware.py b/ambari-agent/src/main/python/ambari_agent/Hardware.py
index 0742d70..b5adb6c 100644
--- a/ambari-agent/src/main/python/ambari_agent/Hardware.py
+++ b/ambari-agent/src/main/python/ambari_agent/Hardware.py
@@ -103,11 +103,11 @@ class Hardware:
def _check_remote_mounts(self):
"""Verify if remote mount allowed to be processed or not"""
if self.config and self.config.has_option(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_KEY) and \
- self.config.get(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_KEY).lower() == "false":
+ self.config.get(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_KEY).lower() == "true":
- return False
+ return True
- return True
+ return False
def _is_mount_blacklisted(self, blacklist, mount_point):
"""
diff --git a/ambari-agent/src/test/python/ambari_agent/TestHardware.py b/ambari-agent/src/test/python/ambari_agent/TestHardware.py
index 8de2c02..f015ea3 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHardware.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHardware.py
@@ -154,11 +154,11 @@ class TestHardware(TestCase):
get_os_version_mock.return_value = "11"
Hardware(cache_info=False).osdisks()
timeout = 10
- shell_call_mock.assert_called_with(['timeout', str(timeout), "df", "-kPT"], stdout = subprocess32.PIPE, stderr = subprocess32.PIPE, timeout = timeout, quiet = True)
+ shell_call_mock.assert_called_with(['timeout', str(timeout), "df", "-kPT", "-l"], stdout = subprocess32.PIPE, stderr = subprocess32.PIPE, timeout = timeout, quiet = True)
config = AmbariConfig()
Hardware(config=config, cache_info=False).osdisks()
- shell_call_mock.assert_called_with(['timeout', str(timeout), "df", "-kPT"], stdout = subprocess32.PIPE, stderr = subprocess32.PIPE, timeout = timeout, quiet = True)
+ shell_call_mock.assert_called_with(['timeout', str(timeout), "df", "-kPT", "-l"], stdout = subprocess32.PIPE, stderr = subprocess32.PIPE, timeout = timeout, quiet = True)
config.add_section(AmbariConfig.AMBARI_PROPERTIES_CATEGORY)
config.set(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_KEY, "true")
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py b/ambari-server/src/main/resources/stacks/stack_advisor.py
index eaac73a..850c21c 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -2999,6 +2999,9 @@ class DefaultStackAdvisor(StackAdvisor):
if not mountPoints:
return self.getErrorItem("No disk info found on host %s" % hostInfo["host_name"])
+ if mountPoint is None:
+ return self.getErrorItem("No mount point in directory %s. Mount points: %s" % (dir, ', '.join(mountPoints.keys())))
+
if mountPoints[mountPoint] < reqiuredDiskSpace:
msg = "Ambari Metrics disk space requirements not met. \n" \
"Recommended disk space for partition {0} is {1}G"
diff --git a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/services/stack_advisor.py b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/services/stack_advisor.py
index e21a149..70862cd 100644
--- a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/services/stack_advisor.py
+++ b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/services/stack_advisor.py
@@ -1511,6 +1511,9 @@ class HDF20StackAdvisor(DefaultStackAdvisor):
if not mountPoints:
return self.getErrorItem("No disk info found on host %s" % hostInfo["host_name"])
+ if mountPoint is None:
+ return self.getErrorItem("No mount point in directory %s. Mount points: %s" % (dir, ', '.join(mountPoints.keys())))
+
if mountPoints[mountPoint] < reqiuredDiskSpace:
msg = "Ambari Metrics disk space requirements not met. \n" \
"Recommended disk space for partition {0} is {1}G"
diff --git a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
index bbf6e37..a7ed418 100755
--- a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
+++ b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
@@ -1313,6 +1313,9 @@ class ODPi20StackAdvisor(DefaultStackAdvisor):
if not mountPoints:
return self.getErrorItem("No disk info found on host %s" % hostInfo["host_name"])
+ if mountPoint is None:
+ return self.getErrorItem("No mount point in directory %s. Mount points: %s" % (dir, ', '.join(mountPoints.keys())))
+
if mountPoints[mountPoint] < reqiuredDiskSpace:
msg = "Ambari Metrics disk space requirements not met. \n" \
"Recommended disk space for partition {0} is {1}G"