diff --git a/pengine/test10/bug-lf-2153.scores b/pengine/test10/bug-lf-2153.scores index 165f26d28b..6e3c387161 100644 --- a/pengine/test10/bug-lf-2153.scores +++ b/pengine/test10/bug-lf-2153.scores @@ -1,55 +1,55 @@ Allocation scores: clone_color: ms_drbd_iscsivg01 allocation score on alice: 1500 clone_color: ms_drbd_iscsivg01 allocation score on bob: -INFINITY clone_color: res_drbd_iscsivg01:0 allocation score on alice: 0 clone_color: res_drbd_iscsivg01:0 allocation score on bob: 1 clone_color: res_drbd_iscsivg01:1 allocation score on alice: 101 clone_color: res_drbd_iscsivg01:1 allocation score on bob: 0 native_color: res_drbd_iscsivg01:1 allocation score on alice: 101 native_color: res_drbd_iscsivg01:1 allocation score on bob: -INFINITY native_color: res_drbd_iscsivg01:0 allocation score on alice: -INFINITY native_color: res_drbd_iscsivg01:0 allocation score on bob: -INFINITY -res_drbd_iscsivg01:1 promotion score on alice: 3100 +res_drbd_iscsivg01:1 promotion score on alice: 1700 res_drbd_iscsivg01:0 promotion score on none: 0 clone_color: cl_tgtd allocation score on alice: 1500 clone_color: cl_tgtd allocation score on bob: -INFINITY clone_color: res_tgtd:0 allocation score on alice: 0 clone_color: res_tgtd:0 allocation score on bob: 1 clone_color: res_tgtd:1 allocation score on alice: 1 clone_color: res_tgtd:1 allocation score on bob: 0 native_color: res_tgtd:1 allocation score on alice: 1 native_color: res_tgtd:1 allocation score on bob: -INFINITY native_color: res_tgtd:0 allocation score on alice: -INFINITY native_color: res_tgtd:0 allocation score on bob: -INFINITY group_color: rg_iscsivg01 allocation score on alice: 100 group_color: rg_iscsivg01 allocation score on bob: 0 group_color: res_portblock_iscsivg01_block allocation score on alice: 300 group_color: res_portblock_iscsivg01_block allocation score on bob: 0 group_color: res_lvm_iscsivg01 allocation score on alice: 200 group_color: res_lvm_iscsivg01 allocation score on bob: 0 group_color: res_target_iscsivg01 allocation score on alice: 200 group_color: res_target_iscsivg01 allocation score on bob: 0 group_color: res_lu_iscsivg01_lun1 allocation score on alice: 200 group_color: res_lu_iscsivg01_lun1 allocation score on bob: 0 group_color: res_lu_iscsivg01_lun2 allocation score on alice: 200 group_color: res_lu_iscsivg01_lun2 allocation score on bob: 0 group_color: res_ip_alicebob01 allocation score on alice: 200 group_color: res_ip_alicebob01 allocation score on bob: 0 group_color: res_portblock_iscsivg01_unblock allocation score on alice: 200 group_color: res_portblock_iscsivg01_unblock allocation score on bob: 0 res_drbd_iscsivg01:1 promotion score on alice: INFINITY res_drbd_iscsivg01:0 promotion score on none: 0 native_color: res_portblock_iscsivg01_block allocation score on alice: 1601 native_color: res_portblock_iscsivg01_block allocation score on bob: -INFINITY native_color: res_lvm_iscsivg01 allocation score on alice: 1200 native_color: res_lvm_iscsivg01 allocation score on bob: -INFINITY native_color: res_target_iscsivg01 allocation score on alice: 1000 native_color: res_target_iscsivg01 allocation score on bob: -INFINITY native_color: res_lu_iscsivg01_lun1 allocation score on alice: 800 native_color: res_lu_iscsivg01_lun1 allocation score on bob: -INFINITY native_color: res_lu_iscsivg01_lun2 allocation score on alice: 600 native_color: res_lu_iscsivg01_lun2 allocation score on bob: -INFINITY native_color: res_ip_alicebob01 allocation score on alice: 400 native_color: res_ip_alicebob01 allocation score on bob: -INFINITY native_color: res_portblock_iscsivg01_unblock allocation score on alice: 200 native_color: res_portblock_iscsivg01_unblock allocation score on bob: -INFINITY diff --git a/pengine/test10/bug-lf-2422.dot b/pengine/test10/bug-lf-2422.dot index c4a9f41537..4496eae3a7 100644 --- a/pengine/test10/bug-lf-2422.dot +++ b/pengine/test10/bug-lf-2422.dot @@ -1,93 +1,98 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "c-o2stage_stop_0" -> "c-o2stage_stopped_0" [ style = bold] "c-o2stage_stop_0" -> "o2stage:0_stop_0" [ style = bold] "c-o2stage_stop_0" -> "o2stage:1_stop_0" [ style = bold] "c-o2stage_stop_0" -> "o2stage:2_stop_0" [ style = bold] "c-o2stage_stop_0" -> "o2stage:3_stop_0" [ style = bold] "c-o2stage_stop_0" [ style=bold color="green" fontcolor="orange" ] "c-o2stage_stopped_0" [ style=bold color="green" fontcolor="orange" ] "c-ocfs_stop_0" -> "c-ocfs_stopped_0" [ style = bold] "c-ocfs_stop_0" -> "ocfs:0_stop_0 qa-suse-4" [ style = bold] "c-ocfs_stop_0" -> "ocfs:1_stop_0 qa-suse-1" [ style = bold] "c-ocfs_stop_0" -> "ocfs:2_stop_0 qa-suse-3" [ style = bold] "c-ocfs_stop_0" -> "ocfs:3_stop_0 qa-suse-2" [ style = bold] "c-ocfs_stop_0" [ style=bold color="green" fontcolor="orange" ] "c-ocfs_stopped_0" -> "c-o2stage_stop_0" [ style = bold] "c-ocfs_stopped_0" [ style=bold color="green" fontcolor="orange" ] "cmirror:0_stop_0 qa-suse-4" -> "all_stopped" [ style = bold] "cmirror:0_stop_0 qa-suse-4" -> "o2cb:0_stop_0 qa-suse-4" [ style = bold] "cmirror:0_stop_0 qa-suse-4" -> "o2stage:0_stopped_0" [ style = bold] "cmirror:0_stop_0 qa-suse-4" [ style=bold color="green" fontcolor="black" ] "cmirror:1_stop_0 qa-suse-1" -> "all_stopped" [ style = bold] "cmirror:1_stop_0 qa-suse-1" -> "o2cb:1_stop_0 qa-suse-1" [ style = bold] "cmirror:1_stop_0 qa-suse-1" -> "o2stage:1_stopped_0" [ style = bold] "cmirror:1_stop_0 qa-suse-1" [ style=bold color="green" fontcolor="black" ] "cmirror:2_stop_0 qa-suse-3" -> "all_stopped" [ style = bold] "cmirror:2_stop_0 qa-suse-3" -> "o2cb:2_stop_0 qa-suse-3" [ style = bold] "cmirror:2_stop_0 qa-suse-3" -> "o2stage:2_stopped_0" [ style = bold] "cmirror:2_stop_0 qa-suse-3" [ style=bold color="green" fontcolor="black" ] "cmirror:3_stop_0 qa-suse-2" -> "all_stopped" [ style = bold] "cmirror:3_stop_0 qa-suse-2" -> "o2cb:3_stop_0 qa-suse-2" [ style = bold] "cmirror:3_stop_0 qa-suse-2" -> "o2stage:3_stopped_0" [ style = bold] "cmirror:3_stop_0 qa-suse-2" [ style=bold color="green" fontcolor="black" ] "o2cb:0_stop_0 qa-suse-4" -> "all_stopped" [ style = bold] "o2cb:0_stop_0 qa-suse-4" -> "o2stage:0_stopped_0" [ style = bold] "o2cb:0_stop_0 qa-suse-4" [ style=bold color="green" fontcolor="black" ] "o2cb:1_stop_0 qa-suse-1" -> "all_stopped" [ style = bold] "o2cb:1_stop_0 qa-suse-1" -> "o2stage:1_stopped_0" [ style = bold] "o2cb:1_stop_0 qa-suse-1" [ style=bold color="green" fontcolor="black" ] "o2cb:2_stop_0 qa-suse-3" -> "all_stopped" [ style = bold] "o2cb:2_stop_0 qa-suse-3" -> "o2stage:2_stopped_0" [ style = bold] "o2cb:2_stop_0 qa-suse-3" [ style=bold color="green" fontcolor="black" ] "o2cb:3_stop_0 qa-suse-2" -> "all_stopped" [ style = bold] "o2cb:3_stop_0 qa-suse-2" -> "o2stage:3_stopped_0" [ style = bold] "o2cb:3_stop_0 qa-suse-2" [ style=bold color="green" fontcolor="black" ] "o2stage:0_stop_0" -> "cmirror:0_stop_0 qa-suse-4" [ style = bold] "o2stage:0_stop_0" -> "o2cb:0_stop_0 qa-suse-4" [ style = bold] "o2stage:0_stop_0" -> "o2stage:0_stopped_0" [ style = bold] "o2stage:0_stop_0" [ style=bold color="green" fontcolor="orange" ] "o2stage:0_stopped_0" -> "c-o2stage_stopped_0" [ style = bold] "o2stage:0_stopped_0" [ style=bold color="green" fontcolor="orange" ] "o2stage:1_stop_0" -> "cmirror:1_stop_0 qa-suse-1" [ style = bold] "o2stage:1_stop_0" -> "o2cb:1_stop_0 qa-suse-1" [ style = bold] "o2stage:1_stop_0" -> "o2stage:1_stopped_0" [ style = bold] "o2stage:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "o2stage:1_stopped_0" -> "c-o2stage_stopped_0" [ style = bold] "o2stage:1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "o2stage:2_stop_0" -> "cmirror:2_stop_0 qa-suse-3" [ style = bold] "o2stage:2_stop_0" -> "o2cb:2_stop_0 qa-suse-3" [ style = bold] "o2stage:2_stop_0" -> "o2stage:2_stopped_0" [ style = bold] "o2stage:2_stop_0" [ style=bold color="green" fontcolor="orange" ] "o2stage:2_stopped_0" -> "c-o2stage_stopped_0" [ style = bold] "o2stage:2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "o2stage:3_stop_0" -> "cmirror:3_stop_0 qa-suse-2" [ style = bold] "o2stage:3_stop_0" -> "o2cb:3_stop_0 qa-suse-2" [ style = bold] "o2stage:3_stop_0" -> "o2stage:3_stopped_0" [ style = bold] "o2stage:3_stop_0" [ style=bold color="green" fontcolor="orange" ] "o2stage:3_stopped_0" -> "c-o2stage_stopped_0" [ style = bold] "o2stage:3_stopped_0" [ style=bold color="green" fontcolor="orange" ] +"ocfs:0_monitor_20000 qa-suse-4" [ style=dashed color="red" fontcolor="black" ] "ocfs:0_stop_0 qa-suse-4" -> "all_stopped" [ style = bold] "ocfs:0_stop_0 qa-suse-4" -> "c-ocfs_stopped_0" [ style = bold] "ocfs:0_stop_0 qa-suse-4" -> "cmirror:0_stop_0 qa-suse-4" [ style = bold] "ocfs:0_stop_0 qa-suse-4" -> "o2stage:0_stop_0" [ style = bold] "ocfs:0_stop_0 qa-suse-4" [ style=bold color="green" fontcolor="black" ] +"ocfs:1_monitor_20000 qa-suse-1" [ style=dashed color="red" fontcolor="black" ] "ocfs:1_stop_0 qa-suse-1" -> "all_stopped" [ style = bold] "ocfs:1_stop_0 qa-suse-1" -> "c-ocfs_stopped_0" [ style = bold] "ocfs:1_stop_0 qa-suse-1" -> "cmirror:1_stop_0 qa-suse-1" [ style = bold] "ocfs:1_stop_0 qa-suse-1" -> "o2stage:1_stop_0" [ style = bold] "ocfs:1_stop_0 qa-suse-1" -> "ocfs:0_stop_0 qa-suse-4" [ style = bold] "ocfs:1_stop_0 qa-suse-1" [ style=bold color="green" fontcolor="black" ] +"ocfs:2_monitor_20000 qa-suse-3" [ style=dashed color="red" fontcolor="black" ] "ocfs:2_stop_0 qa-suse-3" -> "all_stopped" [ style = bold] "ocfs:2_stop_0 qa-suse-3" -> "c-ocfs_stopped_0" [ style = bold] "ocfs:2_stop_0 qa-suse-3" -> "cmirror:2_stop_0 qa-suse-3" [ style = bold] "ocfs:2_stop_0 qa-suse-3" -> "o2stage:2_stop_0" [ style = bold] "ocfs:2_stop_0 qa-suse-3" -> "ocfs:1_stop_0 qa-suse-1" [ style = bold] "ocfs:2_stop_0 qa-suse-3" [ style=bold color="green" fontcolor="black" ] +"ocfs:3_monitor_20000 qa-suse-2" [ style=dashed color="red" fontcolor="black" ] "ocfs:3_stop_0 qa-suse-2" -> "all_stopped" [ style = bold] "ocfs:3_stop_0 qa-suse-2" -> "c-ocfs_stopped_0" [ style = bold] "ocfs:3_stop_0 qa-suse-2" -> "cmirror:3_stop_0 qa-suse-2" [ style = bold] "ocfs:3_stop_0 qa-suse-2" -> "o2stage:3_stop_0" [ style = bold] "ocfs:3_stop_0 qa-suse-2" -> "ocfs:2_stop_0 qa-suse-3" [ style = bold] "ocfs:3_stop_0 qa-suse-2" [ style=bold color="green" fontcolor="black" ] +"sbd_stonith_monitor_15000 qa-suse-2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/bug-lf-2422.exp b/pengine/test10/bug-lf-2422.exp index 6971610b0a..441450e941 100644 --- a/pengine/test10/bug-lf-2422.exp +++ b/pengine/test10/bug-lf-2422.exp @@ -1,437 +1,446 @@ + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +