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: lrm by alan from ([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 9 Feb 2006 23:04:21 -0700 (MST)
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:
actions.c
Log Message:
TE Updates should always be sent to the local CIB and *never* forwarded.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- actions.c 11 Jan 2006 13:06:11 -0000 1.5
+++ actions.c 10 Feb 2006 06:04:21 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.5 2006/01/11 13:06:11 andrew Exp $ */
+/* $Id: actions.c,v 1.6 2006/02/10 06:04:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -76,7 +76,7 @@
rc = te_cib_conn->cmds->update(
te_cib_conn, XML_CIB_TAG_STATUS, update, NULL,
- cib_quorum_override);
+ cib_quorum_override|cib_scope_local);
if(rc < cib_ok) {
const char *fail_text = "Couldnt update CIB after stonith";
@@ -317,7 +317,7 @@
const char *target_uuid =
crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
- int call_options = cib_quorum_override;
+ int call_options = cib_quorum_override|cib_scope_local;
if(status == LRM_OP_TIMEOUT) {
if(crm_element_value(action->xml, XML_LRM_ATTR_RSCID) != NULL) {
------------------------------
Message: 2
Date: Thu, 9 Feb 2006 23:12:03 -0700 (MST)
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:
main.c
Log Message:
Dont add a signal handler for SIGTERM in the PE... just let it exit
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- main.c 16 Jan 2006 09:16:32 -0000 1.19
+++ main.c 10 Feb 2006 06:12:03 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.19 2006/01/16 09:16:32 andrew Exp $ */
+/* $Id: main.c,v 1.20 2006/02/10 06:12:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -62,8 +62,8 @@
const char *param_name = NULL;
crm_log_init(crm_system_name);
- G_main_add_SignalHandler(
- G_PRIORITY_HIGH, SIGTERM, pengine_shutdown, NULL, NULL);
+/* G_main_add_SignalHandler( */
+/* G_PRIORITY_HIGH, SIGTERM, pengine_shutdown, NULL, NULL); */
while ((flag = getopt(argc, argv, OPTARGS)) != EOF) {
switch(flag) {
------------------------------
Message: 3
Date: Thu, 9 Feb 2006 23:31:46 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Put in an is_allocated() check in the code for the destructor...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -3 -r1.214 -r1.215
--- lrmd.c 10 Feb 2006 05:55:14 -0000 1.214
+++ lrmd.c 10 Feb 2006 06:31:46 -0000 1.215
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.214 2006/02/10 05:55:14 alan Exp $ */
+/* $Id: lrmd.c,v 1.215 2006/02/10 06:31:46 alan Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -3357,6 +3357,12 @@
{
lrmd_op_t* op = (lrmd_op_t *)user_data;
+ if (!cl_is_allocated(op)) {
+ lrmd_log(LOG_CRIT, "%s:%d: Unallocated op 0x%lx!!"
+ , __FUNCTION__, __LINE__
+ , (unsigned long)op);
+ return;
+ }
if (op->ra_stdout_fd > STDERR_FILENO) {
close(op->ra_stdout_fd);
op->ra_stdout_fd = -1;
@@ -3372,6 +3378,12 @@
{
lrmd_op_t* op = (lrmd_op_t *)user_data;
+ if (!cl_is_allocated(op)) {
+ lrmd_log(LOG_CRIT, "%s:%d: Unallocated op 0x%lx!!"
+ , __FUNCTION__, __LINE__
+ , (unsigned long)op);
+ return;
+ }
if (op->ra_stderr_fd > STDERR_FILENO) {
close(op->ra_stderr_fd);
op->ra_stderr_fd = -1;
@@ -3681,6 +3693,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.215 2006/02/10 06:31:46 alan
+ * Put in an is_allocated() check in the code for the destructor...
+ *
* Revision 1.214 2006/02/10 05:55:14 alan
* Put more code in to catch the invalid file descriptor earlier on.
*
------------------------------
Message: 4
Date: Thu, 9 Feb 2006 23:45:55 -0700 (MST)
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:
election.c fsa.c
Log Message:
Put a node's CIB into slave mode *only* when we loose an election or
reach S_PENDING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/election.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- election.c 20 Jan 2006 13:26:45 -0000 1.102
+++ election.c 10 Feb 2006 06:45:55 -0000 1.103
@@ -309,6 +309,8 @@
vote_sent = send_request(novote, NULL);
CRM_DEV_ASSERT(vote_sent);
+
+ fsa_cib_conn->cmds->set_slave(fsa_cib_conn, cib_scope_local);
} else {
if(cur_state == S_PENDING) {
@@ -389,8 +391,8 @@
} else {
crm_debug_3("DC Heartbeat timer already active");
}
-
-/* fsa_cib_conn->cmds->set_slave_all(fsa_cib_conn, cib_none); */
+
+ fsa_cib_conn->cmds->set_slave_all(fsa_cib_conn, cib_none);
fsa_cib_conn->cmds->set_master(fsa_cib_conn, cib_none);
cib = createEmptyCib();
@@ -426,7 +428,6 @@
if(action & A_DC_RELEASE) {
crm_debug("Releasing the role of DC");
clear_bit_inplace(fsa_input_register, R_THE_DC);
- fsa_cib_conn->cmds->set_slave(fsa_cib_conn, cib_scope_local);
} else if (action & A_DC_RELEASED) {
crm_info("DC role released");
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- fsa.c 2 Feb 2006 08:55:31 -0000 1.135
+++ fsa.c 10 Feb 2006 06:45:55 -0000 1.136
@@ -729,7 +729,6 @@
/* possibly redundant */
crm_timer_stop(shutdown_timer);
set_bit_inplace(fsa_input_register, R_SHUTDOWN);
- fsa_cib_conn->cmds->set_slave(fsa_cib_conn,
cib_scope_local);
break;
case S_IDLE:
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 46
********************************************
