Send Linux-ha-cvs mailing list submissions to linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs or, via email, send a message with subject or body 'help' to [EMAIL PROTECTED] You can reach the person managing the list at [EMAIL PROTECTED] When replying, please edit your Subject line so it is more specific than "Re: Contents of Linux-ha-cvs digest..." Today's Topics: 1. Linux-HA CVS: crm by andrew from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: crm by andrew from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Tue, 18 Jul 2006 00:15:55 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : crm Dir : linux-ha/crm/pengine Modified Files: ptest.c Log Message: Extra functionality for ptest Support reading of compressed XML files By default, do not include optional actions and dependancies in ptest output --- crm/admin/cibadmin.c | 2 crm/admin/crm_mon.c | 7 + crm/admin/crm_resource.c | 7 + crm/admin/crm_verify.c | 2 crm/admin/xml_diff.c | 4 crm/cib/io.c | 2 crm/pengine/ptest.c | 33 +++-- crm/pengine/testcases/1360.dot | 20 --- crm/pengine/testcases/594.dot | 31 ----- crm/pengine/testcases/662.dot | 59 --------- crm/pengine/testcases/696.dot | 26 ---- crm/pengine/testcases/726.dot | 15 -- crm/pengine/testcases/735.dot | 19 --- crm/pengine/testcases/764.dot | 43 ------- crm/pengine/testcases/797.dot | 25 ---- crm/pengine/testcases/829.dot | 58 --------- crm/pengine/testcases/994.dot | 26 ---- crm/pengine/testcases/group1.dot | 5 crm/pengine/testcases/group10.dot | 70 ----------- crm/pengine/testcases/group11.dot | 7 - crm/pengine/testcases/group13.dot | 16 -- crm/pengine/testcases/group2.dot | 5 crm/pengine/testcases/group3.dot | 11 - crm/pengine/testcases/group4.dot | 38 ------ crm/pengine/testcases/group7.dot | 11 - crm/pengine/testcases/group8.dot | 14 -- crm/pengine/testcases/group9.dot | 15 -- crm/pengine/testcases/inc0.dot | 5 crm/pengine/testcases/inc1.dot | 5 crm/pengine/testcases/inc10.dot | 107 ----------------- crm/pengine/testcases/inc2.dot | 16 -- crm/pengine/testcases/inc3.dot | 35 ----- crm/pengine/testcases/inc5.dot | 128 --------------------- crm/pengine/testcases/inc6.dot | 111 ------------------ crm/pengine/testcases/inc7.dot | 11 - crm/pengine/testcases/inc8.dot | 14 -- crm/pengine/testcases/inc9.dot | 34 ----- crm/pengine/testcases/interleave-0.dot | 106 ----------------- crm/pengine/testcases/interleave-1.dot | 106 ----------------- crm/pengine/testcases/interleave-2.dot | 106 ----------------- crm/pengine/testcases/interleave-3.dot | 106 ----------------- crm/pengine/testcases/managed-0.dot | 135 ---------------------- crm/pengine/testcases/managed-1.dot | 99 ---------------- crm/pengine/testcases/managed-2.dot | 19 --- crm/pengine/testcases/master-0.dot | 15 -- crm/pengine/testcases/master-1.dot | 11 - crm/pengine/testcases/master-10.dot | 30 ----- crm/pengine/testcases/master-2.dot | 30 ----- crm/pengine/testcases/master-3.dot | 11 - crm/pengine/testcases/master-4.dot | 188 ------------------------------- crm/pengine/testcases/master-5.dot | 190 ------------------------------- crm/pengine/testcases/master-6.dot | 197 --------------------------------- crm/pengine/testcases/master-7.dot | 118 ------------------- crm/pengine/testcases/master-8.dot | 102 ----------------- crm/pengine/testcases/master-9.dot | 73 ------------ crm/pengine/testcases/multi1.dot | 3 crm/pengine/testcases/notify-0.dot | 18 --- crm/pengine/testcases/notify-1.dot | 44 ------- crm/pengine/testcases/notify-2.dot | 44 ------- crm/pengine/testcases/notify-3.dot | 23 --- crm/pengine/testcases/order5.dot | 24 ---- crm/pengine/testcases/order6.dot | 18 --- crm/pengine/testcases/order7.dot | 5 crm/pengine/testcases/orphan-0.dot | 24 ---- crm/pengine/testcases/orphan-1.dot | 26 ---- crm/pengine/testcases/params-0.dot | 30 ----- crm/pengine/testcases/params-1.dot | 24 ---- crm/pengine/testcases/probe-0.dot | 105 ----------------- crm/pengine/testcases/probe-1.dot | 2 crm/pengine/testcases/quorum-1.dot | 4 crm/pengine/testcases/quorum-2.dot | 6 - crm/pengine/testcases/quorum-3.dot | 5 crm/pengine/testcases/quorum-5.dot | 5 crm/pengine/testcases/quorum-6.dot | 5 crm/pengine/testcases/rec-node-11.dot | 8 - crm/pengine/testcases/rec-node-12.dot | 5 crm/pengine/testcases/rec-node-13.dot | 177 ----------------------------- crm/pengine/testcases/rec-node-2.dot | 10 - crm/pengine/testcases/rec-node-8.dot | 2 crm/pengine/testcases/rec-node-9.dot | 4 crm/pengine/testcases/rec-rsc-0.dot | 3 crm/pengine/testcases/rec-rsc-2.dot | 1 crm/pengine/testcases/rec-rsc-4.dot | 2 crm/pengine/testcases/rec-rsc-6.dot | 3 crm/pengine/testcases/rec-rsc-7.dot | 3 crm/pengine/testcases/rec-rsc-8.dot | 3 crm/pengine/testcases/rsc_dep2.dot | 8 - crm/pengine/testcases/rsc_dep4.dot | 4 crm/pengine/testcases/rsc_dep8.dot | 8 - crm/pengine/testcases/simple3.dot | 2 crm/pengine/testcases/simple4.dot | 2 crm/pengine/testcases/simple7.dot | 2 crm/pengine/testcases/simple8.dot | 40 ------ crm/pengine/testcases/standby.dot | 46 ------- crm/pengine/testcases/target-0.dot | 30 ----- crm/pengine/testcases/target-1.dot | 24 ---- crm/pengine/testcases/unrunnable-1.dot | 54 --------- crm/tengine/callbacks.c | 2 crm/tengine/ttest.c | 2 include/crm/common/xml.h | 2 lib/crm/common/xml.c | 89 +++++++++++--- 101 files changed, 109 insertions(+), 3521 deletions(-) =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/ptest.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- ptest.c 12 Jul 2006 15:42:35 -0000 1.79 +++ ptest.c 18 Jul 2006 06:15:54 -0000 1.80 @@ -1,4 +1,4 @@ -/* $Id: ptest.c,v 1.79 2006/07/12 15:42:35 andrew Exp $ */ +/* $Id: ptest.c,v 1.80 2006/07/18 06:15:54 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -36,7 +36,7 @@ #include <crm/cib.h> -#define OPTARGS "V?X:D:G:I:Lwxd:" +#define OPTARGS "V?X:D:G:I:Lwxd:a" #ifdef HAVE_GETOPT_H # include <getopt.h> @@ -48,6 +48,7 @@ gboolean use_stdin = FALSE; gboolean inhibit_exit = FALSE; +gboolean all_actions = FALSE; extern crm_data_t * do_calculations( pe_working_set_t *data_set, crm_data_t *xml_input, ha_time_t *now); extern void cleanup_calculations(pe_working_set_t *data_set); @@ -195,7 +196,9 @@ break; #endif - + case 'a': + all_actions = TRUE; + break; case 'w': inhibit_exit = TRUE; break; @@ -275,8 +278,12 @@ } else if(xml_file != NULL) { FILE *xml_strm = fopen(xml_file, "r"); - cib_object = file2xml(xml_strm); - + if(strstr(xml_file, ".bz2") != NULL) { + cib_object = file2xml(xml_strm, TRUE); + } else { + cib_object = file2xml(xml_strm, FALSE); + } + } else if(use_stdin) { cib_object = stdin2xml(); @@ -347,10 +354,12 @@ action_name, "purple"); } else if(action->optional) { - dot_write("\"%s\" [ style=\"dashed\" color=\"%s\" fontcolor=\"%s\" ]", - action_name, "blue", - action->pseudo?"orange":"black"); - + if(all_actions) { + dot_write("\"%s\" [ style=\"dashed\" color=\"%s\" fontcolor=\"%s\" ]", + action_name, "blue", + action->pseudo?"orange":"black"); + } + } else { dot_write("\"%s\" [ font_color=purple style=filled fillcolor=%s ]", action_name, "red"); @@ -384,9 +393,11 @@ } before_name = create_action_name(before->action); after_name = create_action_name(action); - dot_write("\"%s\" -> \"%s\" [ style = %s]", - before_name, after_name, - optional?"dashed":"bold"); + if(all_actions || optional == FALSE) { + dot_write("\"%s\" -> \"%s\" [ style = %s]", + before_name, after_name, + optional?"dashed":"bold"); + } crm_free(before_name); crm_free(after_name); ); ------------------------------ Message: 2 Date: Tue, 18 Jul 2006 00:15:55 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : crm Dir : linux-ha/crm/admin Modified Files: cibadmin.c crm_mon.c crm_resource.c crm_verify.c xml_diff.c Log Message: Extra functionality for ptest Support reading of compressed XML files By default, do not include optional actions and dependancies in ptest output --- crm/admin/cibadmin.c | 2 crm/admin/crm_mon.c | 7 + crm/admin/crm_resource.c | 7 + crm/admin/crm_verify.c | 2 crm/admin/xml_diff.c | 4 crm/cib/io.c | 2 crm/pengine/ptest.c | 33 +++-- crm/pengine/testcases/1360.dot | 20 --- crm/pengine/testcases/594.dot | 31 ----- crm/pengine/testcases/662.dot | 59 --------- crm/pengine/testcases/696.dot | 26 ---- crm/pengine/testcases/726.dot | 15 -- crm/pengine/testcases/735.dot | 19 --- crm/pengine/testcases/764.dot | 43 ------- crm/pengine/testcases/797.dot | 25 ---- crm/pengine/testcases/829.dot | 58 --------- crm/pengine/testcases/994.dot | 26 ---- crm/pengine/testcases/group1.dot | 5 crm/pengine/testcases/group10.dot | 70 ----------- crm/pengine/testcases/group11.dot | 7 - crm/pengine/testcases/group13.dot | 16 -- crm/pengine/testcases/group2.dot | 5 crm/pengine/testcases/group3.dot | 11 - crm/pengine/testcases/group4.dot | 38 ------ crm/pengine/testcases/group7.dot | 11 - crm/pengine/testcases/group8.dot | 14 -- crm/pengine/testcases/group9.dot | 15 -- crm/pengine/testcases/inc0.dot | 5 crm/pengine/testcases/inc1.dot | 5 crm/pengine/testcases/inc10.dot | 107 ----------------- crm/pengine/testcases/inc2.dot | 16 -- crm/pengine/testcases/inc3.dot | 35 ----- crm/pengine/testcases/inc5.dot | 128 --------------------- crm/pengine/testcases/inc6.dot | 111 ------------------ crm/pengine/testcases/inc7.dot | 11 - crm/pengine/testcases/inc8.dot | 14 -- crm/pengine/testcases/inc9.dot | 34 ----- crm/pengine/testcases/interleave-0.dot | 106 ----------------- crm/pengine/testcases/interleave-1.dot | 106 ----------------- crm/pengine/testcases/interleave-2.dot | 106 ----------------- crm/pengine/testcases/interleave-3.dot | 106 ----------------- crm/pengine/testcases/managed-0.dot | 135 ---------------------- crm/pengine/testcases/managed-1.dot | 99 ---------------- crm/pengine/testcases/managed-2.dot | 19 --- crm/pengine/testcases/master-0.dot | 15 -- crm/pengine/testcases/master-1.dot | 11 - crm/pengine/testcases/master-10.dot | 30 ----- crm/pengine/testcases/master-2.dot | 30 ----- crm/pengine/testcases/master-3.dot | 11 - crm/pengine/testcases/master-4.dot | 188 ------------------------------- crm/pengine/testcases/master-5.dot | 190 ------------------------------- crm/pengine/testcases/master-6.dot | 197 --------------------------------- crm/pengine/testcases/master-7.dot | 118 ------------------- crm/pengine/testcases/master-8.dot | 102 ----------------- crm/pengine/testcases/master-9.dot | 73 ------------ crm/pengine/testcases/multi1.dot | 3 crm/pengine/testcases/notify-0.dot | 18 --- crm/pengine/testcases/notify-1.dot | 44 ------- crm/pengine/testcases/notify-2.dot | 44 ------- crm/pengine/testcases/notify-3.dot | 23 --- crm/pengine/testcases/order5.dot | 24 ---- crm/pengine/testcases/order6.dot | 18 --- crm/pengine/testcases/order7.dot | 5 crm/pengine/testcases/orphan-0.dot | 24 ---- crm/pengine/testcases/orphan-1.dot | 26 ---- crm/pengine/testcases/params-0.dot | 30 ----- crm/pengine/testcases/params-1.dot | 24 ---- crm/pengine/testcases/probe-0.dot | 105 ----------------- crm/pengine/testcases/probe-1.dot | 2 crm/pengine/testcases/quorum-1.dot | 4 crm/pengine/testcases/quorum-2.dot | 6 - crm/pengine/testcases/quorum-3.dot | 5 crm/pengine/testcases/quorum-5.dot | 5 crm/pengine/testcases/quorum-6.dot | 5 crm/pengine/testcases/rec-node-11.dot | 8 - crm/pengine/testcases/rec-node-12.dot | 5 crm/pengine/testcases/rec-node-13.dot | 177 ----------------------------- crm/pengine/testcases/rec-node-2.dot | 10 - crm/pengine/testcases/rec-node-8.dot | 2 crm/pengine/testcases/rec-node-9.dot | 4 crm/pengine/testcases/rec-rsc-0.dot | 3 crm/pengine/testcases/rec-rsc-2.dot | 1 crm/pengine/testcases/rec-rsc-4.dot | 2 crm/pengine/testcases/rec-rsc-6.dot | 3 crm/pengine/testcases/rec-rsc-7.dot | 3 crm/pengine/testcases/rec-rsc-8.dot | 3 crm/pengine/testcases/rsc_dep2.dot | 8 - crm/pengine/testcases/rsc_dep4.dot | 4 crm/pengine/testcases/rsc_dep8.dot | 8 - crm/pengine/testcases/simple3.dot | 2 crm/pengine/testcases/simple4.dot | 2 crm/pengine/testcases/simple7.dot | 2 crm/pengine/testcases/simple8.dot | 40 ------ crm/pengine/testcases/standby.dot | 46 ------- crm/pengine/testcases/target-0.dot | 30 ----- crm/pengine/testcases/target-1.dot | 24 ---- crm/pengine/testcases/unrunnable-1.dot | 54 --------- crm/tengine/callbacks.c | 2 crm/tengine/ttest.c | 2 include/crm/common/xml.h | 2 lib/crm/common/xml.c | 89 +++++++++++--- 101 files changed, 109 insertions(+), 3521 deletions(-) =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/cibadmin.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -3 -r1.55 -r1.56 --- cibadmin.c 3 Jul 2006 15:15:30 -0000 1.55 +++ cibadmin.c 18 Jul 2006 06:15:54 -0000 1.56 @@ -1,4 +1,4 @@ -/* $Id: cibadmin.c,v 1.55 2006/07/03 15:15:30 andrew Exp $ */ +/* $Id: cibadmin.c,v 1.56 2006/07/18 06:15:54 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -296,7 +296,7 @@ if(admin_input_file != NULL) { FILE *xml_strm = fopen(admin_input_file, "r"); - input = file2xml(xml_strm); + input = file2xml(xml_strm, FALSE); if(input == NULL) { fprintf(stderr, "Couldn't parse input file: %s\n", admin_input_file); return 1; =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_mon.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- crm_mon.c 19 Jun 2006 10:56:50 -0000 1.28 +++ crm_mon.c 18 Jul 2006 06:15:54 -0000 1.29 @@ -1,4 +1,4 @@ -/* $Id: crm_mon.c,v 1.28 2006/06/19 10:56:50 andrew Exp $ */ +/* $Id: crm_mon.c,v 1.29 2006/07/18 06:15:54 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -227,7 +227,12 @@ interval, mon_timer_popped, NULL); } else if(xml_file != NULL) { FILE *xml_strm = fopen(xml_file, "r"); - crm_data_t *cib_object = file2xml(xml_strm); + crm_data_t *cib_object = NULL; + if(strstr(xml_file, ".bz2") != NULL) { + cib_object = file2xml(xml_strm, TRUE); + } else { + cib_object = file2xml(xml_strm, FALSE); + } one_shot = TRUE; mon_update(NULL, 0, cib_ok, cib_object, NULL); } =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- crm_resource.c 6 Jul 2006 09:30:27 -0000 1.43 +++ crm_resource.c 18 Jul 2006 06:15:54 -0000 1.44 @@ -1,4 +1,4 @@ -/* $Id: crm_resource.c,v 1.43 2006/07/06 09:30:27 andrew Exp $ */ +/* $Id: crm_resource.c,v 1.44 2006/07/18 06:15:54 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -755,7 +755,12 @@ resource_t *rsc = NULL; if(xml_file != NULL) { FILE *xml_strm = fopen(xml_file, "r"); - cib_xml_copy = file2xml(xml_strm); + if(strstr(xml_file, ".bz2") != NULL) { + cib_xml_copy = file2xml(xml_strm, TRUE); + } else { + cib_xml_copy = file2xml(xml_strm, FALSE); + } + } else { cib_conn = cib_new(); rc = cib_conn->cmds->signon( =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- crm_verify.c 12 Jul 2006 15:42:35 -0000 1.17 +++ crm_verify.c 18 Jul 2006 06:15:54 -0000 1.18 @@ -1,4 +1,4 @@ -/* $Id: crm_verify.c,v 1.17 2006/07/12 15:42:35 andrew Exp $ */ +/* $Id: crm_verify.c,v 1.18 2006/07/18 06:15:54 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -195,7 +195,7 @@ } else if(xml_file != NULL) { FILE *xml_strm = fopen(xml_file, "r"); crm_info("Reading XML from: %s", xml_file); - cib_object = file2xml(xml_strm); + cib_object = file2xml(xml_strm, FALSE); } else { fprintf(stderr, "Reading XML from: stdin\n"); cib_object = stdin2xml(); =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/xml_diff.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- xml_diff.c 6 Jul 2006 16:48:38 -0000 1.10 +++ xml_diff.c 18 Jul 2006 06:15:54 -0000 1.11 @@ -1,4 +1,4 @@ -/* $Id: xml_diff.c,v 1.10 2006/07/06 16:48:38 andrew Exp $ */ +/* $Id: xml_diff.c,v 1.11 2006/07/18 06:15:54 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -179,7 +179,7 @@ FILE *xml_strm = fopen(xml_file_1, "r"); if(xml_strm != NULL) { crm_debug("Reading: %s", xml_file_1); - object_1 = file2xml(xml_strm); + object_1 = file2xml(xml_strm, FALSE); } else { cl_perror("File not found: %s", xml_file_1); } @@ -196,7 +196,7 @@ FILE *xml_strm = fopen(xml_file_2, "r"); if(xml_strm != NULL) { crm_debug("Reading: %s", xml_file_2); - object_2 = file2xml(xml_strm); + object_2 = file2xml(xml_strm, FALSE); } else { cl_perror("File not found: %s", xml_file_2); } ------------------------------ _______________________________________________ Linux-ha-cvs mailing list Linux-ha-cvs@lists.linux-ha.org http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs End of Linux-ha-cvs Digest, Vol 32, Issue 51 ********************************************