openstack
/
sahara
Code Issues Proposed changes

Fix Storm 1.1.0 EDP configs 

There's some special configs evidently needed for EDP on Storm version
1.x or greater. This adds those configs to Storm 1.1.0, and ensures
that future versions will never miss these.

Change-Id: I4921c43c5a2d797e3099fc9d87fa652cf5be707b
Closes-Bug: #1717059
This commit is contained in:
Jeremy Freudberg 2017-10-09 17:58:28 +00:00
parent ce53a6adf4
commit f5b4cbf209
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sahara/plugins/storm/config_helper.py
View File

@ -42,7 +42,7 @@ def get_plugin_configs():
def generate_storm_config(master_hostname, zk_hostnames, version):
if version == '1.0.1':
if version in ['1.0.1', '1.1.0']:
host_cfg = 'nimbus.seeds'
master_value = [master_hostname.encode('ascii', 'ignore')]
@ -64,7 +64,7 @@ def generate_storm_config(master_hostname, zk_hostnames, version):
# Since pyleus is built using previous versions os Storm we need this
# option to allow the cluster to be compatible with pyleus topologies as
# well as with topologies built using older versions of Storm
if version == '1.0.1':
if version in ['1.0.1', '1.1.0']:
cfg['client.jartransformer.class'] = (
"org.apache.storm.hack.StormShadeTransformer")

52
sahara/tests/unit/plugins/storm/test_config_helper.py Normal file
View File

@ -0,0 +1,52 @@
# Copyright 2017 Massachusetts Open Cloud
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from testtools import testcase
from sahara.plugins.storm import config_helper as s_config
from sahara.plugins.storm import plugin as s_plugin
class TestStormConfigHelper(testcase.TestCase):
def test_generate_storm_config(self):
STORM_092 = '0.9.2'
STORM_101 = '1.0.1'
STORM_110 = '1.1.0'
tested_versions = []
master_hostname = "s-master"
zk_hostnames = ["s-zoo"]
configs_092 = s_config.generate_storm_config(
master_hostname, zk_hostnames, STORM_092)
self.assertTrue('nimbus.host' in configs_092.keys())
self.assertFalse('nimbus.seeds' in configs_092.keys())
tested_versions.append(STORM_092)
configs_101 = s_config.generate_storm_config(
master_hostname, zk_hostnames, STORM_101)
self.assertFalse('nimbus.host' in configs_101.keys())
self.assertTrue('nimbus.seeds' in configs_101.keys())
self.assertTrue('client.jartransformer.class' in configs_101.keys())
self.assertEqual(configs_101['client.jartransformer.class'],
'org.apache.storm.hack.StormShadeTransformer')
tested_versions.append(STORM_101)
configs_110 = s_config.generate_storm_config(
master_hostname, zk_hostnames, STORM_110)
self.assertFalse('nimbus.host' in configs_110.keys())
self.assertTrue('nimbus.seeds' in configs_110.keys())
self.assertTrue('client.jartransformer.class' in configs_110.keys())
self.assertEqual(configs_110['client.jartransformer.class'],
'org.apache.storm.hack.StormShadeTransformer')
tested_versions.append(STORM_110)
storm = s_plugin.StormProvider()
self.assertEqual(storm.get_versions(), tested_versions)