Upgrade Storm plugin to version 1.0.1
This is the last part of upgrading Strom to version 1.0.1. Change-Id: I74660f5734100c04066e1a96f46cddf3f9de0f10 Partially-implements: blueprint upgrade-storm-1-0-1
This commit is contained in:
parent
6681d0aa11
commit
3f43a76227
@ -42,10 +42,17 @@ def get_plugin_configs():
|
|||||||
return {}
|
return {}
|
||||||
|
|
||||||
|
|
||||||
def generate_storm_config(master_hostname, zk_hostnames):
|
def generate_storm_config(master_hostname, zk_hostnames, version):
|
||||||
|
|
||||||
|
if version == '1.0.1':
|
||||||
|
host_cfg = 'nimbus.seeds'
|
||||||
|
master_value = [master_hostname.encode('ascii', 'ignore')]
|
||||||
|
else:
|
||||||
|
host_cfg = 'nimbus.host'
|
||||||
|
master_value = master_hostname.encode('ascii', 'ignore')
|
||||||
|
|
||||||
cfg = {
|
cfg = {
|
||||||
"nimbus.host": master_hostname.encode('ascii', 'ignore'),
|
host_cfg: master_value,
|
||||||
"worker.childopts": "-Xmx768m -Djava.net.preferIPv4Stack=true",
|
"worker.childopts": "-Xmx768m -Djava.net.preferIPv4Stack=true",
|
||||||
"nimbus.childopts": "-Xmx1024m -Djava.net.preferIPv4Stack=true",
|
"nimbus.childopts": "-Xmx1024m -Djava.net.preferIPv4Stack=true",
|
||||||
"supervisor.childopts": "-Djava.net.preferIPv4Stack=true",
|
"supervisor.childopts": "-Djava.net.preferIPv4Stack=true",
|
||||||
|
@ -53,7 +53,7 @@ class StormProvider(p.ProvisioningPluginBase):
|
|||||||
"cluster without any management consoles."))
|
"cluster without any management consoles."))
|
||||||
|
|
||||||
def get_versions(self):
|
def get_versions(self):
|
||||||
return ['0.9.2']
|
return ['0.9.2', '1.0.1']
|
||||||
|
|
||||||
def get_configs(self, storm_version):
|
def get_configs(self, storm_version):
|
||||||
return c_helper.get_plugin_configs()
|
return c_helper.get_plugin_configs()
|
||||||
@ -148,7 +148,8 @@ class StormProvider(p.ProvisioningPluginBase):
|
|||||||
|
|
||||||
config_instances = c_helper.generate_storm_config(
|
config_instances = c_helper.generate_storm_config(
|
||||||
st_master.hostname(),
|
st_master.hostname(),
|
||||||
zknames)
|
zknames,
|
||||||
|
cluster.hadoop_version)
|
||||||
|
|
||||||
config = self._convert_dict_to_yaml(config_instances)
|
config = self._convert_dict_to_yaml(config_instances)
|
||||||
supervisor_conf = c_helper.generate_slave_supervisor_conf()
|
supervisor_conf = c_helper.generate_slave_supervisor_conf()
|
||||||
|
@ -20,7 +20,9 @@ from sahara import context
|
|||||||
from sahara.plugins import base as pb
|
from sahara.plugins import base as pb
|
||||||
from sahara.plugins import exceptions as ex
|
from sahara.plugins import exceptions as ex
|
||||||
from sahara.plugins.storm import plugin as pl
|
from sahara.plugins.storm import plugin as pl
|
||||||
|
from sahara.service.edp.storm import engine
|
||||||
from sahara.tests.unit import base
|
from sahara.tests.unit import base
|
||||||
|
from sahara.utils import edp
|
||||||
|
|
||||||
|
|
||||||
conductor = cond.API
|
conductor = cond.API
|
||||||
@ -43,120 +45,149 @@ class StormPluginTest(base.SaharaWithDbTestCase):
|
|||||||
master.id = self.master_inst
|
master.id = self.master_inst
|
||||||
return master
|
return master
|
||||||
|
|
||||||
|
def _get_cluster(self, name, version):
|
||||||
|
cluster_dict = {
|
||||||
|
'name': name,
|
||||||
|
'plugin_name': 'storm',
|
||||||
|
'hadoop_version': version,
|
||||||
|
'node_groups': []}
|
||||||
|
return cluster_dict
|
||||||
|
|
||||||
def test_validate_existing_ng_scaling(self):
|
def test_validate_existing_ng_scaling(self):
|
||||||
data = {'name': "cluster",
|
data = [
|
||||||
'plugin_name': "storm",
|
{'name': 'master',
|
||||||
'hadoop_version': "0.9.2",
|
'flavor_id': '42',
|
||||||
'node_groups': [
|
'count': 1,
|
||||||
{'name': 'master',
|
'node_processes': ['nimbus']},
|
||||||
'flavor_id': '42',
|
{'name': 'slave',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['nimbus']},
|
'count': 1,
|
||||||
{'name': 'slave',
|
'node_processes': ['supervisor']},
|
||||||
'flavor_id': '42',
|
{'name': 'zookeeper',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['supervisor']},
|
'count': 1,
|
||||||
{'name': 'zookeeper',
|
'node_processes': ['zookeeper']}
|
||||||
'flavor_id': '42',
|
]
|
||||||
'count': 1,
|
|
||||||
'node_processes': ['zookeeper']}
|
cluster_data_092 = self._get_cluster('cluster_0.9.2', '0.9.2')
|
||||||
]
|
cluster_data_101 = self._get_cluster('cluster_1.0.1', '1.0.1')
|
||||||
}
|
cluster_data_092['node_groups'] = data
|
||||||
cluster = conductor.cluster_create(context.ctx(), data)
|
cluster_data_101['node_groups'] = data
|
||||||
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
|
||||||
supervisor_id = [node.id for node in cluster.node_groups
|
clusters = [cluster_data_092, cluster_data_101]
|
||||||
if node.name == 'supervisor']
|
|
||||||
self.assertIsNone(plugin._validate_existing_ng_scaling(cluster,
|
for cluster_data in clusters:
|
||||||
supervisor_id))
|
cluster = conductor.cluster_create(context.ctx(), cluster_data)
|
||||||
|
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
||||||
|
supervisor_id = [node.id for node in cluster.node_groups
|
||||||
|
if node.name == 'supervisor']
|
||||||
|
self.assertIsNone(
|
||||||
|
plugin._validate_existing_ng_scaling(cluster,
|
||||||
|
supervisor_id))
|
||||||
|
|
||||||
def test_validate_additional_ng_scaling(self):
|
def test_validate_additional_ng_scaling(self):
|
||||||
data = {'name': "cluster",
|
data = [
|
||||||
'plugin_name': "storm",
|
{'name': 'master',
|
||||||
'hadoop_version': "0.9.2",
|
'flavor_id': '42',
|
||||||
'node_groups': [
|
'count': 1,
|
||||||
{'name': 'master',
|
'node_processes': ['nimbus']},
|
||||||
'flavor_id': '42',
|
{'name': 'slave',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['nimbus']},
|
'count': 1,
|
||||||
{'name': 'slave',
|
'node_processes': ['supervisor']},
|
||||||
'flavor_id': '42',
|
{'name': 'zookeeper',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['supervisor']},
|
'count': 1,
|
||||||
{'name': 'zookeeper',
|
'node_processes': ['zookeeper']},
|
||||||
'flavor_id': '42',
|
{'name': 'slave2',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['zookeeper']},
|
'count': 0,
|
||||||
{'name': 'slave2',
|
'node_processes': ['supervisor']}
|
||||||
'flavor_id': '42',
|
]
|
||||||
'count': 0,
|
|
||||||
'node_processes': ['supervisor']}
|
cluster_data_092 = self._get_cluster('cluster_0.9.2', '0.9.2')
|
||||||
]
|
cluster_data_101 = self._get_cluster('cluster_1.0.1', '1.0.1')
|
||||||
}
|
cluster_data_092['node_groups'] = data
|
||||||
cluster = conductor.cluster_create(context.ctx(), data)
|
cluster_data_101['node_groups'] = data
|
||||||
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
|
||||||
supervisor_id = [node.id for node in cluster.node_groups
|
clusters = [cluster_data_092, cluster_data_101]
|
||||||
if node.name == 'supervisor']
|
|
||||||
self.assertIsNone(plugin._validate_additional_ng_scaling(cluster,
|
for cluster_data in clusters:
|
||||||
supervisor_id)
|
cluster = conductor.cluster_create(context.ctx(), cluster_data)
|
||||||
)
|
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
||||||
|
supervisor_id = [node.id for node in cluster.node_groups
|
||||||
|
if node.name == 'supervisor']
|
||||||
|
self.assertIsNone(
|
||||||
|
plugin._validate_additional_ng_scaling(cluster,
|
||||||
|
supervisor_id))
|
||||||
|
|
||||||
def test_validate_existing_ng_scaling_raises(self):
|
def test_validate_existing_ng_scaling_raises(self):
|
||||||
data = {'name': "cluster",
|
data = [
|
||||||
'plugin_name': "storm",
|
{'name': 'master',
|
||||||
'hadoop_version': "0.9.2",
|
'flavor_id': '42',
|
||||||
'node_groups': [
|
'count': 1,
|
||||||
{'name': 'master',
|
'node_processes': ['nimbus']},
|
||||||
'flavor_id': '42',
|
{'name': 'slave',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['nimbus']},
|
'count': 1,
|
||||||
{'name': 'slave',
|
'node_processes': ['supervisor']},
|
||||||
'flavor_id': '42',
|
{'name': 'zookeeper',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['supervisor']},
|
'count': 1,
|
||||||
{'name': 'zookeeper',
|
'node_processes': ['zookeeper']}
|
||||||
'flavor_id': '42',
|
]
|
||||||
'count': 1,
|
|
||||||
'node_processes': ['zookeeper']}
|
cluster_data_092 = self._get_cluster('cluster_0.9.2', '0.9.2')
|
||||||
]
|
cluster_data_101 = self._get_cluster('cluster_1.0.1', '1.0.1')
|
||||||
}
|
cluster_data_092['node_groups'] = data
|
||||||
cluster = conductor.cluster_create(context.ctx(), data)
|
cluster_data_101['node_groups'] = data
|
||||||
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
|
||||||
master_id = [node.id for node in cluster.node_groups
|
clusters = [cluster_data_092, cluster_data_101]
|
||||||
if node.name == 'master']
|
|
||||||
self.assertRaises(ex.NodeGroupCannotBeScaled,
|
for cluster_data in clusters:
|
||||||
plugin._validate_existing_ng_scaling,
|
cluster = conductor.cluster_create(context.ctx(), cluster_data)
|
||||||
cluster, master_id)
|
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
||||||
|
master_id = [node.id for node in cluster.node_groups
|
||||||
|
if node.name == 'master']
|
||||||
|
self.assertRaises(ex.NodeGroupCannotBeScaled,
|
||||||
|
plugin._validate_existing_ng_scaling,
|
||||||
|
cluster, master_id)
|
||||||
|
|
||||||
def test_validate_additional_ng_scaling_raises(self):
|
def test_validate_additional_ng_scaling_raises(self):
|
||||||
data = {'name': "cluster",
|
data = [
|
||||||
'plugin_name': "storm",
|
{'name': 'master',
|
||||||
'hadoop_version': "0.9.2",
|
'flavor_id': '42',
|
||||||
'node_groups': [
|
'count': 1,
|
||||||
{'name': 'master',
|
'node_processes': ['nimbus']},
|
||||||
'flavor_id': '42',
|
{'name': 'slave',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['nimbus']},
|
'count': 1,
|
||||||
{'name': 'slave',
|
'node_processes': ['supervisor']},
|
||||||
'flavor_id': '42',
|
{'name': 'zookeeper',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['supervisor']},
|
'count': 1,
|
||||||
{'name': 'zookeeper',
|
'node_processes': ['zookeeper']},
|
||||||
'flavor_id': '42',
|
{'name': 'master2',
|
||||||
'count': 1,
|
'flavor_id': '42',
|
||||||
'node_processes': ['zookeeper']},
|
'count': 0,
|
||||||
{'name': 'master2',
|
'node_processes': ['nimbus']}
|
||||||
'flavor_id': '42',
|
]
|
||||||
'count': 0,
|
|
||||||
'node_processes': ['nimbus']}
|
cluster_data_092 = self._get_cluster('cluster_0.9.2', '0.9.2')
|
||||||
]
|
cluster_data_101 = self._get_cluster('cluster_1.0.1', '1.0.1')
|
||||||
}
|
cluster_data_092['node_groups'] = data
|
||||||
cluster = conductor.cluster_create(context.ctx(), data)
|
cluster_data_101['node_groups'] = data
|
||||||
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
|
||||||
master_id = [node.id for node in cluster.node_groups
|
clusters = [cluster_data_092, cluster_data_101]
|
||||||
if node.name == 'master2']
|
|
||||||
self.assertRaises(ex.NodeGroupCannotBeScaled,
|
for cluster_data in clusters:
|
||||||
plugin._validate_existing_ng_scaling,
|
cluster = conductor.cluster_create(context.ctx(), cluster_data)
|
||||||
cluster, master_id)
|
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
||||||
|
master_id = [node.id for node in cluster.node_groups
|
||||||
|
if node.name == 'master2']
|
||||||
|
self.assertRaises(ex.NodeGroupCannotBeScaled,
|
||||||
|
plugin._validate_existing_ng_scaling,
|
||||||
|
cluster, master_id)
|
||||||
|
|
||||||
def test_get_open_port(self):
|
def test_get_open_port(self):
|
||||||
plugin_storm = pl.StormProvider()
|
plugin_storm = pl.StormProvider()
|
||||||
@ -167,3 +198,18 @@ class StormPluginTest(base.SaharaWithDbTestCase):
|
|||||||
ng.cluster = cluster
|
ng.cluster = cluster
|
||||||
ports = plugin_storm.get_open_ports(ng)
|
ports = plugin_storm.get_open_ports(ng)
|
||||||
self.assertEqual([8080], ports)
|
self.assertEqual([8080], ports)
|
||||||
|
|
||||||
|
def _test_engine(self, version, job_type, eng):
|
||||||
|
cluster_dict = self._get_cluster('demo', version)
|
||||||
|
|
||||||
|
cluster = conductor.cluster_create(context.ctx(), cluster_dict)
|
||||||
|
plugin = pb.PLUGINS.get_plugin(cluster.plugin_name)
|
||||||
|
self.assertIsInstance(plugin.get_edp_engine(cluster, job_type), eng)
|
||||||
|
|
||||||
|
def test_plugin092_edp_engine(self):
|
||||||
|
self._test_engine('0.9.2', edp.JOB_TYPE_STORM,
|
||||||
|
engine.StormJobEngine)
|
||||||
|
|
||||||
|
def test_plugin101_edp_engine(self):
|
||||||
|
self._test_engine('1.0.1', edp.JOB_TYPE_STORM,
|
||||||
|
engine.StormJobEngine)
|
||||||
|
Loading…
Reference in New Issue
Block a user