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: lib by sunjd from ([email protected])
2. Linux-HA CVS: fencing by sunjd from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 30 May 2006 04:14:46 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/lrm
Modified Files:
raexecstonith.c
Log Message:
bug1275: add signing off
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexecstonith.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- raexecstonith.c 16 May 2006 05:42:40 -0000 1.20
+++ raexecstonith.c 30 May 2006 10:14:46 -0000 1.21
@@ -267,7 +267,7 @@
static int
get_resource_list(GList ** rsc_info)
{
- cl_log(LOG_ERR, "get_resource_list: begin.");
+ int rc;
if ( rsc_info == NULL ) {
cl_log(LOG_ERR, "Parameter error: get_resource_list");
@@ -285,7 +285,10 @@
return -1;
}
- return stonithd_list_stonith_types(rsc_info);
+ rc = stonithd_list_stonith_types(rsc_info);
+ stonithd_signoff();
+
+ return rc;
}
static int
------------------------------
Message: 2
Date: Tue, 30 May 2006 04:15:56 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : fencing
Dir : linux-ha/fencing/stonithd
Modified Files:
stonithd.c
Log Message:
add two level 2 logs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- stonithd.c 14 Apr 2006 08:07:26 -0000 1.89
+++ stonithd.c 30 May 2006 10:15:56 -0000 1.90
@@ -1,4 +1,4 @@
-/* $Id: stonithd.c,v 1.89 2006/04/14 08:07:26 sunjd Exp $ */
+/* $Id: stonithd.c,v 1.90 2006/05/30 10:15:56 sunjd Exp $ */
/* File: stonithd.c
* Description: STONITH daemon for node fencing
@@ -1427,7 +1427,7 @@
}
stonithd_log2(LOG_DEBUG, "begin to dealing with a api msg %s from "
- "a client.", api_type);
+ "a client PID:%d.", api_type, ch->farside_pid);
for (i=0; i<DIMOF(api_msg_to_handlers); i++) {
if ( strncmp(api_type, api_msg_to_handlers[i].msg_type, MAXCMP)
== 0 ) {
@@ -1664,6 +1664,15 @@
/* Check if have signoned */
if ((client = get_exist_client_by_chan(client_list, ch)) == NULL ) {
stonithd_log(LOG_ERR, "stonithd_node_fence: not signoned yet.");
+ if ( NULL != (st_op = new_stonith_ops_t(request) )) {
+ stonithd_log2(LOG_DEBUG, "client [pid: %d] want a
STONITH "
+ "operation %s to node %s."
+ , ch->farside_pid
+ , stonith_op_strname[st_op->optype]
+ , st_op->node_name);
+ free_stonith_ops_t(st_op);
+ st_op = NULL;
+ }
return ST_FAIL;
}
@@ -2429,6 +2438,15 @@
if ((client = get_exist_client_by_chan(client_list, ch)) == NULL ) {
stonithd_log(LOG_ERR, "on_stonithd_virtual_stonithRA_ops: "
"not signoned yet.");
+ if ( NULL!= (ra_op = new_stonithRA_ops_t(request)) ) {
+ stonithd_log2(LOG_DEBUG, "client [pid: %d] want a "
+ "resource operation %s on stonith RA %s "
+ "[resource id: %s]"
+ , ch->farside_pid, ra_op->op_type
+ , ra_op->ra_name, ra_op->rsc_id);
+ free_stonithRA_ops_t(ra_op);
+ ra_op = NULL;
+ }
return ST_FAIL;
}
@@ -3420,6 +3438,9 @@
/*
* $Log: stonithd.c,v $
+ * Revision 1.90 2006/05/30 10:15:56 sunjd
+ * add two level 2 logs
+ *
* Revision 1.89 2006/04/14 08:07:26 sunjd
* typo found by Dave
*
------------------------------
Message: 3
Date: Tue, 30 May 2006 06:15:48 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
* Actually return the result of the dtd validation, not TRUE *
Increase the buffer size when reading from stdin.
Provide a useful message when the buffer is exceeded.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- xml.c 29 May 2006 14:50:40 -0000 1.86
+++ xml.c 30 May 2006 12:15:48 -0000 1.87
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.86 2006/05/29 14:50:40 andrew Exp $ */
+/* $Id: xml.c,v 1.87 2006/05/30 12:15:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -473,7 +473,7 @@
stdin2xml(void)
{
int lpc = 0;
- int MAX_XML_BUFFER = 20000;
+ int MAX_XML_BUFFER = 1000000;
int ch = 0;
gboolean more = TRUE;
@@ -515,7 +515,11 @@
break;
}
}
-
+
+ if(lpc >= MAX_XML_BUFFER) {
+ crm_err("Buffer limit exceeded... please annoy the developers
to increase this value.");
+ crm_err("Please try reading from a file instead.");
+ }
xml_buffer[MAX_XML_BUFFER] = 0;
xml_obj = string2xml(xml_buffer);
crm_free(xml_buffer);
@@ -2509,6 +2513,5 @@
crm_free(buffer);
#endif
- return TRUE;
-/* return valid; */
+ return valid;
}
------------------------------
Message: 4
Date: Tue, 30 May 2006 06:21:40 -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/admin
Modified Files:
crmadmin.c
Log Message:
Fix for crmadmin -S
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crmadmin.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- crmadmin.c 29 May 2006 13:18:03 -0000 1.71
+++ crmadmin.c 30 May 2006 12:21:40 -0000 1.72
@@ -1,4 +1,4 @@
-/* $Id: crmadmin.c,v 1.71 2006/05/29 13:18:03 andrew Exp $ */
+/* $Id: crmadmin.c,v 1.72 2006/05/30 12:21:40 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -282,7 +282,7 @@
*/
mainloop = g_main_new(FALSE);
expected_responses++;
- crm_debug_2("Waiting for reply from the local CRM");
+ crm_debug_2("Waiting for %d replies from the local
CRM", expected_responses);
message_timer_id = Gmain_timeout_add(
message_timeout_ms, admin_message_timeout,
NULL);
@@ -327,7 +327,7 @@
crmd_operation = CRM_OP_PING;
if (BE_VERBOSE) {
- expected_responses = -1;/* wait until timeout
instead */
+ expected_responses = 1;
}
crm_xml_add(msg_options, XML_ATTR_TIMEOUT, "0");
@@ -427,10 +427,11 @@
}
if(sys_to == NULL) {
- if (dest_node != NULL)
+ if (dest_node != NULL) {
sys_to = CRM_SYSTEM_CRMD;
- else
+ } else {
sys_to = CRM_SYSTEM_DC;
+ }
}
{
@@ -445,7 +446,6 @@
}
return ret;
-
}
void
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 104
*********************************************
