Adding service-per-service support
New config section introduced:
services:
keystone-db:
service_def: mariadb
keystone:
service_def: keystone
mapping:
database: keystone-db
Defined services can be used in topology definition.
In this example keystone-db service will be created from mariadb
definition and keystone will use it instead of mariadb.
Change-Id: I274826648390b844d240b7ae545c40264f662452
This commit is contained in:
Andrey Pavlov
@@ -12,147 +12,48 @@ Example:
|
||||
ccp --config-file=~/ccp.conf show-dep nova-api nova-compute
|
||||
"""
|
||||
|
||||
import itertools
|
||||
import logging
|
||||
import re
|
||||
import sys
|
||||
|
||||
from fuel_ccp.common import utils
|
||||
from fuel_ccp.validation import base as base_validation
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
YAML_FILE_RE = re.compile(r'\.yaml$')
|
||||
|
||||
def get_service_deps(graph, service):
|
||||
visited, stack = set(), [service]
|
||||
while stack:
|
||||
vertex = stack.pop()
|
||||
if vertex not in visited:
|
||||
visited.add(vertex)
|
||||
stack.extend(graph[vertex] - visited)
|
||||
return visited
|
||||
|
||||
|
||||
class Node(object):
|
||||
"""Reperesents dependency. Service or job."""
|
||||
|
||||
def __init__(self, name, sort, dependencies=None, job_parent=None):
|
||||
self.name = name
|
||||
self.sort = sort
|
||||
if sort not in ['service', 'job']:
|
||||
msg = "'sort' attribute must be 'service' or 'job' not \
|
||||
'{sort}'".format(sort=sort)
|
||||
raise ValueError(msg)
|
||||
|
||||
self.dependencies = dependencies or []
|
||||
self.job_parent = job_parent
|
||||
|
||||
if self.sort == 'job' and self.job_parent is None:
|
||||
msg = "'job_parent' attribute for 'job' mustn't be None"
|
||||
raise ValueError(msg)
|
||||
|
||||
def is_service(self):
|
||||
return self.sort == 'service'
|
||||
|
||||
|
||||
def get_deps_map(components_map=None):
|
||||
def get_deps_graph(components_map=None):
|
||||
"""Returns dependencies map."""
|
||||
components_map = components_map or utils.get_deploy_components_info()
|
||||
|
||||
deps_map = {}
|
||||
for service_name, service_map in components_map.items():
|
||||
deps_map[service_name] = Node(
|
||||
service_name, 'service', _parse_service_deps(
|
||||
service_map['service_content']))
|
||||
deps_map.update(_parse_pre_and_post_deps(
|
||||
service_map['service_content']))
|
||||
|
||||
return deps_map
|
||||
deps_graph = {}
|
||||
for service_name, service in components_map.items():
|
||||
deps_graph[service_name] = set()
|
||||
containers = service['service_content']['service']['containers']
|
||||
for cont in containers:
|
||||
for cmd in itertools.chain(
|
||||
cont.get('pre', []), [cont.get('daemon', [])],
|
||||
cont.get('post', [])):
|
||||
for dep in cmd.get('dependencies', ()):
|
||||
deps_graph[service_name].add(dep.partition("/")[0])
|
||||
return deps_graph
|
||||
|
||||
|
||||
def _prepare_deps(deps):
|
||||
return [dep.partition(":")[0] for dep in deps]
|
||||
|
||||
|
||||
def _parse_service_deps(service_map):
|
||||
"""Parses service map and finds dependencies of daemons."""
|
||||
def get_deps(components, components_map):
|
||||
deps_graph = get_deps_graph(components_map)
|
||||
dependencies = set()
|
||||
for container in service_map['service']['containers']:
|
||||
cont_deps = container['daemon'].get('dependencies', [])
|
||||
dependencies.update(_prepare_deps(cont_deps))
|
||||
for pre in container.get('pre', []):
|
||||
if pre.get('type') == 'single':
|
||||
dependencies.update([pre['name']])
|
||||
else:
|
||||
deps = _prepare_deps(pre.get('dependencies', []))
|
||||
dependencies.update(deps)
|
||||
for post in container.get('post', []):
|
||||
if post.get('type') != 'single':
|
||||
deps = _prepare_deps(post.get('dependencies', []))
|
||||
dependencies.update(deps)
|
||||
return list(dependencies)
|
||||
|
||||
|
||||
def _parse_pre_and_post_deps(service_map):
|
||||
"""Parses service map and finds pres and their dependencies."""
|
||||
deps = {}
|
||||
for container in service_map['service']['containers']:
|
||||
for pre in container.get('pre', []):
|
||||
pre_deps = _prepare_deps(pre.get('dependencies', []))
|
||||
deps[pre['name']] = Node(pre['name'],
|
||||
'job',
|
||||
pre_deps,
|
||||
service_map['service']['name'])
|
||||
|
||||
for post in container.get('post', []):
|
||||
if post.get('type') == 'single':
|
||||
post_deps = _prepare_deps(post.get('dependencies', []))
|
||||
post_deps.append(service_map['service']['name'])
|
||||
deps[post['name']] = Node(post['name'],
|
||||
'job',
|
||||
post_deps,
|
||||
service_map['service']['name'])
|
||||
return deps
|
||||
|
||||
|
||||
def _calculate_service_deps(service_name, deps_map):
|
||||
if service_name not in deps_map:
|
||||
msg = "Wrong component name '{}'".format(service_name)
|
||||
LOG.error(msg)
|
||||
sys.exit(1)
|
||||
deps = set()
|
||||
job_parents = set()
|
||||
current_iteration_set = {deps_map[service_name]}
|
||||
|
||||
while current_iteration_set:
|
||||
next_iteration_set = set()
|
||||
for dep in current_iteration_set:
|
||||
if deps_map[dep.name].is_service():
|
||||
deps.update([deps_map[dep.name]])
|
||||
else:
|
||||
job_parents.update([dep.job_parent])
|
||||
|
||||
for dep in current_iteration_set:
|
||||
for dependency in deps_map[dep.name].dependencies:
|
||||
next_iteration_set.update([deps_map[dependency]])
|
||||
current_iteration_set = next_iteration_set
|
||||
|
||||
deps = {dep.name for dep in deps}
|
||||
return deps, job_parents
|
||||
|
||||
|
||||
def get_deps(components, components_map=None):
|
||||
deps_map = get_deps_map(components_map)
|
||||
result_deps = set()
|
||||
for service_name in components:
|
||||
deps, job_parents = _calculate_service_deps(service_name, deps_map)
|
||||
checked = {service_name}
|
||||
|
||||
while True:
|
||||
deps.update(job_parents)
|
||||
if not job_parents - checked:
|
||||
break
|
||||
for parent in job_parents - checked:
|
||||
parent_deps, parent_parents = _calculate_service_deps(
|
||||
parent, deps_map)
|
||||
deps.update(parent_deps)
|
||||
checked.update(job_parents - checked)
|
||||
job_parents.update(parent_parents)
|
||||
result_deps.update(deps)
|
||||
result_deps.add('etcd')
|
||||
|
||||
return result_deps - set(components)
|
||||
for component in components:
|
||||
dependencies.update(get_service_deps(deps_graph, component))
|
||||
dependencies.add("etcd")
|
||||
return dependencies - set(components)
|
||||
|
||||
|
||||
def show_dep(components):
|
||||
|
||||
Reference in New Issue
Block a user