Send Linux-ha-cvs mailing list submissions to
[email protected]
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
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: tools by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 11 Apr 2006 01:27:21 -0600 (MDT)
From: [email protected]
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/testcases
Added Files:
master-7.dot master-7.exp master-7.xml master-8.dot
master-8.exp master-8.xml master-9.dot master-9.exp
master-9.xml
Log Message:
More regression tests for master/slave
Dont send "promote" if the resource couldn't be started either
------------------------------
Message: 2
Date: Tue, 11 Apr 2006 01:27:21 -0600 (MDT)
From: [email protected]
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:
native.c regression.sh
Log Message:
More regression tests for master/slave
Dont send "promote" if the resource couldn't be started either
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- native.c 10 Apr 2006 07:45:03 -0000 1.125
+++ native.c 11 Apr 2006 07:27:20 -0000 1.126
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.125 2006/04/10 07:45:03 andrew Exp $ */
+/* $Id: native.c,v 1.126 2006/04/11 07:27:20 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1980,9 +1980,24 @@
gboolean
PromoteRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set)
{
+ char *key = NULL;
+ GListPtr action_list = NULL;
crm_debug_2("Executing: %s", rsc->id);
CRM_CHECK(rsc->next_role == RSC_ROLE_MASTER, return FALSE);
+
+ key = start_key(rsc);
+ action_list = find_actions_exact(rsc->actions, key, next);
+ crm_free(key);
+
+ slist_iter(start, action_t, action_list, lpc,
+ if(start->runnable == FALSE) {
+ crm_debug("%s\tPromote %s (canceled)",
+ next->details->uname, rsc->id);
+ return TRUE;
+ }
+ );
+
crm_notice("%s\tPromote %s", next->details->uname, rsc->id);
promote_action(rsc, next, FALSE);
return TRUE;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- regression.sh 10 Apr 2006 07:23:27 -0000 1.77
+++ regression.sh 11 Apr 2006 07:27:20 -0000 1.78
@@ -62,6 +62,9 @@
do_test master-4 "Started -> Promote : master location"
do_test master-5 "Promoted -> Promoted"
do_test master-6 "Promoted -> Promoted (2)"
+do_test master-7 "Promoted -> Fenced"
+do_test master-8 "Promoted -> Fenced -> Moved"
+do_test master-9 "Stopped + Promotable + No quorum"
echo ""
do_test rsc_dep1 "Must not "
------------------------------
Message: 3
Date: Tue, 11 Apr 2006 01:36:49 -0600 (MDT)
From: [email protected]
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/crmd
Modified Files:
lrm.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -3 -r1.184 -r1.185
--- lrm.c 10 Apr 2006 13:01:21 -0000 1.184
+++ lrm.c 11 Apr 2006 07:36:49 -0000 1.185
@@ -540,8 +540,9 @@
slist_iter(
op, lrm_op_t, op_list, llpc,
- crm_debug_2("Processing op %s for %s (status=%d, rc=%d)",
- op->op_type, the_rsc->id, op->op_status, op->rc);
+ crm_debug_2("Processing op %s (%d) for %s (status=%d, rc=%d)",
+ op->op_type, op->call_id, the_rsc->id,
+ op->op_status, op->rc);
CRM_ASSERT(max_call_id <= op->call_id);
if(safe_str_eq(op->op_type, CRMD_ACTION_STOP)) {
------------------------------
Message: 4
Date: Tue, 11 Apr 2006 01:36:49 -0600 (MDT)
From: [email protected]
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/tengine
Modified Files:
events.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- events.c 10 Apr 2006 12:43:48 -0000 1.12
+++ events.c 11 Apr 2006 07:36:49 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.12 2006/04/10 12:43:48 andrew Exp $ */
+/* $Id: events.c,v 1.13 2006/04/11 07:36:49 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -331,7 +331,7 @@
case LRM_OP_NOTSUPPORTED:
action->failed = TRUE;
crm_log_maybe(log_level_fail,
- "Action %s on %s failed (rc: %d vs. %d): %s",
+ "Action %s on %s failed (target: %d vs. rc:
%d): %s",
update_event, this_uname, target_rc,
op_rc_i, op_status2text(op_status_i));
break;
------------------------------
Message: 5
Date: Tue, 11 Apr 2006 01:37:07 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
pingd.c
Log Message:
Allow -m to work
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/pingd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- pingd.c 10 Apr 2006 12:50:08 -0000 1.1
+++ pingd.c 11 Apr 2006 07:37:07 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: pingd.c,v 1.1 2006/04/10 12:50:08 andrew Exp $ */
+/* $Id: pingd.c,v 1.2 2006/04/11 07:37:07 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -49,7 +49,7 @@
/* GMainLoop *mainloop = NULL; */
const char *crm_system_name = "pingd";
-#define OPTARGS "V?p:a:d:s:S:h:D"
+#define OPTARGS "V?p:a:d:s:S:h:Dm:"
IPC_Channel *attrd = NULL;
GMainLoop* mainloop = NULL;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 72
********************************************
