Skip to content

Commit

Permalink
Merge pull request #1094 from benfitzpatrick/1008.fix-start-up-graph
Browse files Browse the repository at this point in the history
#1008: fix start-up graphing in simplest case
  • Loading branch information
hjoliver committed Aug 18, 2014
2 parents 2a3fadd + 1382e94 commit 36f872f
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 2 deletions.
10 changes: 8 additions & 2 deletions lib/cylc/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1254,8 +1254,14 @@ def process_graph_line( self, line, section, ttype, seq, offset_seq_map,

if not self.validation and not graphing_disabled:
# edges not needed for validation
self.generate_edges( lexpression, pruned_left_nodes,
right_name, ttype,
left_edge_nodes = pruned_left_nodes
right_edge_node = right_name
if not left_edge_nodes and left_nodes:
# All the left nodes have been pruned.
left_edge_nodes = [right_name]
right_edge_node = None
self.generate_edges( lexpression, left_edge_nodes,
right_edge_node, ttype,
seq, suicide )
self.generate_taskdefs( orig_line, pruned_left_nodes,
right_name, ttype,
Expand Down
1 change: 1 addition & 0 deletions tests/cyclers/29-back_comp_start_up_simple.t
7 changes: 7 additions & 0 deletions tests/cyclers/back_comp_start_up_simple/graph.plain.ref
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
edge "cold_foo.2014090100" "foo.2014090100" solid black
graph
node "cold_foo.2014090100" "cold_foo\n2014090100" unfilled box black lightgrey
node "foo.2014090100" "foo\n2014090100" unfilled box black lightgrey
node "foo.2014090106" "foo\n2014090106" unfilled box black lightgrey
node "foo.2014090112" "foo\n2014090112" unfilled box black lightgrey
stop
29 changes: 29 additions & 0 deletions tests/cyclers/back_comp_start_up_simple/reference.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
2014-08-18T12:19:43+01 INFO - port:7766
2014-08-18T12:19:43+01 INFO - Suite starting at 2014-08-18T12:19:43+01
2014-08-18T12:19:43+01 INFO - Log event clock: real time
2014-08-18T12:19:43+01 INFO - Run mode: live
2014-08-18T12:19:43+01 INFO - Initial point: 2014090100
2014-08-18T12:19:43+01 INFO - Final point: 2014090112
2014-08-18T12:19:43+01 INFO - Cold Start 2014090100
2014-08-18T12:19:43+01 INFO - [cold_foo.2014090100] -triggered off []
2014-08-18T12:19:44+01 INFO - [cold_foo.2014090100] -submit_method_id=7693
2014-08-18T12:19:44+01 INFO - [cold_foo.2014090100] -submission succeeded
2014-08-18T12:19:44+01 INFO - [cold_foo.2014090100] -(current:submitted)> cold_foo.2014090100 started at 2014-08-18T12:19:43+01
2014-08-18T12:19:51+01 INFO - [cold_foo.2014090100] -(current:running)> cold_foo.2014090100 succeeded at 2014-08-18T12:19:50+01
2014-08-18T12:19:52+01 INFO - [foo.2014090100] -triggered off ['cold_foo.2014090100']
2014-08-18T12:19:53+01 INFO - [foo.2014090100] -submit_method_id=7808
2014-08-18T12:19:53+01 INFO - [foo.2014090100] -submission succeeded
2014-08-18T12:19:53+01 INFO - [foo.2014090100] -(current:submitted)> foo.2014090100 started at 2014-08-18T12:19:52+01
2014-08-18T12:19:54+01 INFO - [foo.2014090106] -triggered off []
2014-08-18T12:19:55+01 INFO - [foo.2014090106] -submit_method_id=7910
2014-08-18T12:19:55+01 INFO - [foo.2014090106] -submission succeeded
2014-08-18T12:19:55+01 INFO - [foo.2014090106] -(current:submitted)> foo.2014090106 started at 2014-08-18T12:19:55+01
2014-08-18T12:19:56+01 INFO - [foo.2014090112] -triggered off []
2014-08-18T12:19:57+01 INFO - [foo.2014090112] -submit_method_id=8015
2014-08-18T12:19:57+01 INFO - [foo.2014090112] -submission succeeded
2014-08-18T12:19:57+01 INFO - [foo.2014090118] -holding (beyond suite stop point) 2014090112
2014-08-18T12:19:57+01 INFO - [foo.2014090112] -(current:submitted)> foo.2014090112 started at 2014-08-18T12:19:57+01
2014-08-18T12:19:58+01 INFO - [foo.2014090100] -(current:running)> foo.2014090100 succeeded at 2014-08-18T12:19:57+01
2014-08-18T12:20:04+01 INFO - [foo.2014090112] -(current:running)> foo.2014090112 succeeded at 2014-08-18T12:20:03+01
2014-08-18T12:20:09+01 INFO - [foo.2014090106] -(current:running)> foo.2014090106 succeeded at 2014-08-18T12:20:09+01
2014-08-18T12:20:10+01 INFO - Suite shutting down at 2014-08-18T12:20:10+01
11 changes: 11 additions & 0 deletions tests/cyclers/back_comp_start_up_simple/suite.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[scheduling]
initial cycle time = 2014090100
final cycle time = 2014090112
[[special tasks]]
start-up = cold_foo
[[dependencies]]
[[[0,6,12,18]]]
graph = cold_foo => foo
[visualization]
initial cycle time = 2014090100
final cycle time = 2014090112

0 comments on commit 36f872f

Please sign in to comment.