Repository: incubator-metron Updated Branches: refs/heads/master 7b8d90036 -> 3766b87bb
METRON-796 Mpack uses wrong group for owning HDFS directories (justinleet) closes apache/incubator-metron#488 Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/3766b87b Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/3766b87b Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/3766b87b Branch: refs/heads/master Commit: 3766b87bb4125d32867cd82cf9a3e96e0c61a8ed Parents: 7b8d900 Author: justinleet <justinjl...@gmail.com> Authored: Fri Mar 31 08:38:42 2017 -0400 Committer: leet <l...@apache.org> Committed: Fri Mar 31 08:38:42 2017 -0400 ---------------------------------------------------------------------- .../METRON/CURRENT/package/scripts/enrichment_commands.py | 2 +- .../METRON/CURRENT/package/scripts/indexing_commands.py | 2 +- .../METRON/CURRENT/package/scripts/params/params_linux.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/3766b87b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py index 5878dc6..a17145d 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py @@ -111,7 +111,7 @@ class EnrichmentCommands: type="directory", action="create_on_execute", owner=self.__params.metron_user, - group=self.__params.metron_group, + group=self.__params.hadoop_group, mode=0775, ) http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/3766b87b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py index 50af3b2..a24a510 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py @@ -101,7 +101,7 @@ class IndexingCommands: type="directory", action="create_on_execute", owner=self.__params.metron_user, - group=self.__params.metron_group, + group=self.__params.hadoop_group, mode=0775, ) Logger.info('Done creating HDFS indexing directory') http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/3766b87b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py index 87a1f39..a5e1e9d 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py @@ -39,7 +39,6 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() hostname = config['hostname'] -metron_group = config['configurations']['cluster-env']['metron_group'] metron_home = status_params.metron_home parsers = status_params.parsers geoip_url = config['configurations']['metron-env']['geoip_url'] @@ -76,6 +75,9 @@ else: # hadoop params stack_root = Script.get_stack_root() +# This is the cluster group named 'hadoop'. Its membership is the stack process user ids not individual users. +# The config name 'user_group' is out of our control and a bit misleading, so it is renamed to 'hadoop_group'. +hadoop_group = config['configurations']['cluster-env']['user_group'] hadoop_home_dir = stack_select.get_hadoop_dir("home") hadoop_bin_dir = stack_select.get_hadoop_dir("bin") hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
