Repository: metron Updated Branches: refs/heads/master 57d2764c3 -> a8bcbf0b4
METRON-1029 Topology worker opts are not being set when Kerberos is enabled (merrimanr) closes apache/metron#645 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/a8bcbf0b Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/a8bcbf0b Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/a8bcbf0b Branch: refs/heads/master Commit: a8bcbf0b4e30cb5803d5bb99a30dd988d8375b32 Parents: 57d2764 Author: merrimanr <[email protected]> Authored: Tue Jul 18 07:53:47 2017 -0500 Committer: merrimanr <[email protected]> Committed: Tue Jul 18 07:53:47 2017 -0500 ---------------------------------------------------------------------- .../CURRENT/package/scripts/params/params_linux.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/a8bcbf0b/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 d8d8add..ee9542c 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 @@ -195,7 +195,8 @@ hbase_user = config['configurations']['hbase-env']['hbase_user'] security_enabled = status_params.security_enabled client_jaas_path = metron_home + '/client_jaas.conf' client_jaas_arg = '-Djava.security.auth.login.config=' + metron_home + '/client_jaas.conf' -topology_worker_childopts = client_jaas_arg if security_enabled else '' +enrichment_topology_worker_childopts = client_jaas_arg if security_enabled else '' +indexing_topology_worker_childopts = client_jaas_arg if security_enabled else '' topology_auto_credentials = config['configurations']['storm-site'].get('nimbus.credential.renewers.classes', []) # Needed for storm.config, because it needs Java String topology_auto_credentials_double_quotes = str(topology_auto_credentials).replace("'", '"') @@ -229,7 +230,9 @@ threatintel_error_topic = config['configurations']['metron-enrichment-env']['thr metron_enrichment_topology = status_params.metron_enrichment_topology enrichment_workers = config['configurations']['metron-enrichment-env']['enrichment_workers'] enrichment_acker_executors = config['configurations']['metron-enrichment-env']['enrichment_acker_executors'] -enrichment_topology_worker_childopts = config['configurations']['metron-enrichment-env']['enrichment_topology_worker_childopts'] +if not len(enrichment_topology_worker_childopts) == 0: + enrichment_topology_worker_childopts += ' ' +enrichment_topology_worker_childopts += config['configurations']['metron-enrichment-env']['enrichment_topology_worker_childopts'] enrichment_topology_max_spout_pending = config['configurations']['metron-enrichment-env']['enrichment_topology_max_spout_pending'] enrichment_join_cache_size = config['configurations']['metron-enrichment-env']['enrichment_join_cache_size'] threatintel_join_cache_size = config['configurations']['metron-enrichment-env']['threatintel_join_cache_size'] @@ -250,7 +253,9 @@ metron_indexing_topology = status_params.metron_indexing_topology indexing_writer_class_name = config['configurations']['metron-indexing-env']['indexing_writer_class_name'] indexing_workers = config['configurations']['metron-indexing-env']['indexing_workers'] indexing_acker_executors = config['configurations']['metron-indexing-env']['indexing_acker_executors'] -indexing_topology_worker_childopts = config['configurations']['metron-indexing-env']['indexing_topology_worker_childopts'] +if not len(indexing_topology_worker_childopts) == 0: + indexing_topology_worker_childopts += ' ' +indexing_topology_worker_childopts += config['configurations']['metron-indexing-env']['indexing_topology_worker_childopts'] indexing_topology_max_spout_pending = config['configurations']['metron-indexing-env']['indexing_topology_max_spout_pending'] indexing_kafka_spout_parallelism = config['configurations']['metron-indexing-env']['indexing_kafka_spout_parallelism'] indexing_writer_parallelism = config['configurations']['metron-indexing-env']['indexing_writer_parallelism']
