Merge branch 'master' into cgenie/graph-db-with-events

bootstrap/playbooks/celery.yml

@@ -13,7 +13,7 @@
     - shell: celery multi kill 2
              chdir={{ celery_dir }}
       tags: [stop]
-    - shell: celery multi start 2 -A solar.orchestration.runner -Q:1 scheduler,system_log -Q:2 celery,{{ hostname.stdout }}
+    - shell: celery multi start 2 -A solar.orchestration.runner -P:2 prefork -c:2 3 -Q:1 scheduler,system_log -Q:2 celery,{{ hostname.stdout }}
              chdir={{ celery_dir }}
       tags: [master]
     - shell: celery multi start 1 -A solar.orchestration.runner -Q:1  {{ hostname.stdout }}

solar/requirements.txt

@@ -2,7 +2,7 @@ six>=1.9.0
 ply
 click==4.0
 jinja2==2.7.3
-networkx==1.9.1
+networkx>=1.10
 PyYAML==3.11
 jsonschema==2.4.0
 requests==2.7.0
@@ -17,5 +17,5 @@ tabulate==0.7.5
 ansible
 celery
 mock
-py2neo==2.0.7
 multipledispatch==0.4.8
+mock

solar/solar/cli/orch.py

@@ -19,7 +19,7 @@ from solar.orchestration import graph
 from solar.orchestration import tasks
 from solar.orchestration import filters
 from solar.orchestration import utils
-from solar.cli.uids_history import SOLARUID
+from solar.cli.uids_history import SOLARUID, remember_uid
 
 
 @click.group(name='orch')
@@ -36,16 +36,18 @@ def orchestration():
 
 
 @orchestration.command()
-@click.argument('plan', type=click.File('rb'))
+@click.argument('plan')
 def create(plan):
-    click.echo(graph.create_plan(plan.read()).graph['uid'])
+    uid = graph.create_plan(plan).graph['uid']
+    remember_uid(uid)
+    click.echo(uid)
 
 
 @orchestration.command()
 @click.argument('uid', type=SOLARUID)
-@click.argument('plan', type=click.File('rb'))
+@click.argument('plan')
 def update(uid, plan):
-    graph.update_plan(uid, plan.read())
+    graph.update_plan(uid, plan)
 
 
 @orchestration.command()
@@ -58,12 +60,18 @@ def report(uid):
         'INPROGRESS': 'yellow',
         'SKIPPED': 'blue'}
 
+    total = 0.0
     report = graph.report_topo(uid)
     for item in report:
         msg = '{} -> {}'.format(item[0], item[1])
         if item[2]:
             msg += ' :: {}'.format(item[2])
+        if item[4] and item[3]:
+            delta = float(item[4])-float(item[3])
+            total += delta
+            msg += ' D: {}'.format(delta)
         click.echo(click.style(msg, fg=colors[item[1]]))
+    click.echo('Delta SUM: {}'.format(total))
 
 @orchestration.command()
 @click.argument('uid', type=SOLARUID)

solar/solar/core/transports/ssh_raw.py

@@ -0,0 +1,62 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    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 attached#
+#         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 then
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from fabric import api as fabric_api
+from solar.core.log import log
+from solar.core.transports.base import RunTransport
+
+
+class _RawSSHTransport(object):
+
+    def _ssh_props(self, resource):
+        return {
+            'ssh_key': resource.args['ssh_key'].value,
+            'ssh_user': resource.args['ssh_user'].value
+        }
+
+    def _ssh_command_host(self, resource):
+        return '{}@{}'.format(resource.args['ssh_user'].value,
+                              resource.args['ip'].value)
+
+    def _ssh_cmd(self, resource):
+        props = self._ssh_props(resource)
+        return ('ssh', '-i', props['ssh_key'])
+
+
+
+class RawSSHRunTransport(RunTransport, _RawSSHTransport):
+
+    def run(self, resource, *args, **kwargs):
+        log.debug("RAW SSH: %s", args)
+
+        cmds = []
+        cwd = kwargs.get('cwd')
+        if cwd:
+            cmds.append(('cd', cwd))
+
+        cmds.append(args)
+
+        if kwargs.get('use_sudo', False):
+            cmds = [('sudo', ) + cmd for cmd in cmds]
+
+        cmds = [' '.join(cmd) for cmd in cmds]
+
+        remote_cmd = '\"%s\"' % ' && '.join(cmds)
+
+        ssh_cmd = self._ssh_cmd(resource)
+        ssh_cmd += (self._ssh_command_host(resource), remote_cmd)
+
+        log.debug("SSH CMD: %r", ssh_cmd)
+
+        return fabric_api.local(' '.join(ssh_cmd))
+

solar/solar/orchestration/executor.py

@@ -12,6 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import time
+
 from solar.orchestration.runner import app
 from celery import group
 
@@ -28,6 +30,7 @@ def celery_executor(dg, tasks, control_tasks=()):
 
         if all_success(dg, dg.predecessors(task_name)) or task_name in control_tasks:
             dg.node[task_name]['status'] = 'INPROGRESS'
+            dg.node[task_name]['start_time'] = time.time()
             for t in generate_task(task, dg.node[task_name], task_id):
                 to_execute.append(t)
     return group(to_execute)
@@ -40,8 +43,10 @@ def generate_task(task, data, task_id):
         time_limit=data.get('time_limit', None),
         soft_time_limit=data.get('soft_time_limit', None))
 
-    if data.get('target', None):
-        subtask.set(queue=data['target'])
+    # NOTE(dshulyak) it seems that we agreed that celery wont be installed
+    # on every slave and transport will be chosen in handler
+    # if data.get('target', None):
+    #     subtask.set(queue=data['target'])
 
     yield subtask
 

solar/solar/orchestration/graph.py

@@ -40,24 +40,23 @@ def save_graph(name, graph):
         db.create_relation_str(u, v, properties, type_=type_)
 
 
-def get_graph(uid):
-    dg = nx.MultiDiGraph()
-    collection = db.COLLECTIONS.plan_node.name + ':' + uid
-    type_= db.RELATION_TYPES.plan_edge.name + ':' + uid
-    dg.graph = db.get(uid, collection=db.COLLECTIONS.plan_graph).properties
-    dg.add_nodes_from([(n.uid, n.properties) for n in db.all(collection=collection)])
-    dg.add_edges_from([(i['source'], i['dest'], i['properties']) for
-                       i in db.all_relations(type_=type_, db_convert=False)])
+def get_graph(name):
+    dg = nx.OrderedMultiDiGraph()
+    nodes = json.loads(r.get('{}:nodes'.format(name)))
+    edges = json.loads(r.get('{}:edges'.format(name)))
+    dg.graph = json.loads(r.get('{}:attributes'.format(name)))
+    dg.add_nodes_from(nodes)
+    dg.add_edges_from(edges)
     return dg
 
 
 get_plan = get_graph
 
 
-def parse_plan(plan_data):
+def parse_plan(plan_path):
     """ parses yaml definition and returns graph
     """
-    plan = utils.yaml_load(plan_data)
+    plan = utils.yaml_load(plan_path)
     dg = nx.MultiDiGraph()
     dg.graph['name'] = plan['name']
     for task in plan['tasks']:
@@ -100,17 +99,17 @@ def show(uid):
     return utils.yaml_dump(result)
 
 
-def create_plan(plan_data, save=True):
+def create_plan(plan_path, save=True):
     """
     """
-    dg = parse_plan(plan_data)
+    dg = parse_plan(plan_path)
     return create_plan_from_graph(dg, save=save)
 
 
-def update_plan(uid, plan_data):
+def update_plan(uid, plan_path):
     """update preserves old status of tasks if they werent removed
     """
-    dg = parse_plan(plan_data)
+    dg = parse_plan(plan_path)
     old_dg = get_graph(uid)
     dg.graph = old_dg.graph
     for n in dg:
@@ -139,6 +138,12 @@ def report_topo(uid):
     report = []
 
     for task in nx.topological_sort(dg):
-        report.append([task, dg.node[task]['status'], dg.node[task]['errmsg']])
+        data = dg.node[task]
+        report.append([
+            task,
+            data['status'],
+            data['errmsg'],
+            data.get('start_time'),
+            data.get('end_time')])
 
     return report

solar/solar/orchestration/tasks.py

@@ -41,7 +41,9 @@ __all__ = ['solar_resource', 'cmd', 'sleep',
 class ReportTask(task.Task):
 
     def on_success(self, retval, task_id, args, kwargs):
-        schedule_next.apply_async(args=[task_id, 'SUCCESS'], queue='scheduler')
+        schedule_next.apply_async(
+            args=[task_id, 'SUCCESS'],
+            queue='scheduler')
         commit_logitem.apply_async(args=[task_id], queue='system_log')
 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
@@ -154,5 +156,6 @@ def schedule_next(task_id, status, errmsg=None):
     dg = graph.get_graph(plan_uid)
     dg.node[task_name]['status'] = status
     dg.node[task_name]['errmsg'] = errmsg
+    dg.node[task_name]['end_time'] = time.time()
 
     schedule(plan_uid, dg)

solar/solar/system_log/change.py

@@ -97,6 +97,8 @@ def send_to_orchestration():
     return graph.create_plan_from_graph(dg)
 
 
-def parameters(res, action):
+def parameters(res, action, data):
     return {'args': [res, action],
-            'type': 'solar_resource'}
+            'type': 'solar_resource',
+            # unique identifier for a node should be passed
+            'target': data.get('ip')}

solar/solar/test/orch_fixtures/for_stop.yaml

@@ -1,11 +0,0 @@
-name: for_stop
-tasks:
-    - uid: sleep_some_time
-      parameters:
-          type: sleep
-          args: [20]
-      before: [sleep_again]
-    - uid: sleep_again
-      parameters:
-        type: sleep
-        args: [20]

solar/solar/test/orch_fixtures/sequential.yml

@@ -0,0 +1,18 @@
+name: seq
+tasks:
+    - uid: s1
+      parameters:
+        type: sleep
+        args: [2]
+        target: 1
+    - uid: s2
+
+      parameters:
+        type: sleep
+        args: [2]
+        target: 1
+    - uid: s3
+      parameters:
+        type: sleep
+        args: [2]
+        target: 1

solar/solar/test/orch_fixtures/sleeping_beauty.yaml

@@ -0,0 +1,31 @@
+name: sleeping_beauty
+tasks:
+    - uid: fairy1
+      parameters:
+        type: sleep
+        args: [10]
+      before: [princess]
+    - uid: fairy2
+      parameters:
+        type: sleep
+        args: [10]
+      before: [princess]
+    - uid: fairy3
+      parameters:
+        type: sleep
+        args: [10]
+      before: [princess]
+    - uid: fairy4
+      parameters:
+        type: sleep
+        args: [10]
+      before: [princess]
+    - uid: fairy5
+      parameters:
+        type: sleep
+        args: [10]
+      before: [princess]
+    - uid: princess
+      parameters:
+        type: sleep
+        args: [10]

solar/solar/test/test_limits.py

@@ -12,10 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import os
+
 from pytest import fixture
 import networkx as nx
 
 from solar.orchestration import limits
+from solar.orchestration import graph
 
 
 @fixture
@@ -60,3 +63,21 @@ def test_filtering_chain(target_dg):
 
     chain = limits.get_default_chain(target_dg, [], ['t1', 't2'])
     assert list(chain) == ['t1']
+
+
+@fixture
+def seq_plan():
+    seq_path = os.path.join(
+        os.path.dirname(os.path.realpath(__file__)),
+        'orch_fixtures',
+        'sequential.yml')
+    return graph.create_plan(seq_path, save=False)
+
+
+def test_limits_sequential(seq_plan):
+    stack_to_execute = seq_plan.nodes()
+    while stack_to_execute:
+        left = stack_to_execute[0]
+        assert list(limits.get_default_chain(
+            seq_plan, [], stack_to_execute)) == [left]
+        stack_to_execute.pop(0)