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: lrm by sunjd from ([email protected])
3. Linux-HA CVS: lib by sunjd from ([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 8 Feb 2006 15:18:59 -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:
lrm.c
Log Message:
Log these messages *less* verbosly than the error, not more.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- lrm.c 13 Jan 2006 10:31:14 -0000 1.162
+++ lrm.c 8 Feb 2006 22:18:59 -0000 1.163
@@ -391,11 +391,11 @@
crm_log_maybe(log_level,
"Duplicate %s operations in get_cur_state()",
op_id);
- crm_log_maybe(log_level-2,
+ crm_log_maybe(log_level+2,
"New entry: %s %s (call=%d, status=%s)",
op_id, op->user_data, op->call_id,
op_status2text(op->op_status));
- crm_log_xml(log_level-2, "Existing entry", xml_op);
+ crm_log_xml(log_level+2, "Existing entry", xml_op);
crm_free(op_id);
return FALSE;
------------------------------
Message: 2
Date: Thu, 9 Feb 2006 01:46:58 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Fix bug 1008 ( LRMd consumes too much CPU )
But, donnot know the root casue yet. :-(
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -3 -r1.208 -r1.209
--- lrmd.c 8 Feb 2006 10:22:32 -0000 1.208
+++ lrmd.c 9 Feb 2006 08:46:57 -0000 1.209
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.208 2006/02/08 10:22:32 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.209 2006/02/09 08:46:57 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -407,14 +407,7 @@
cl_free(op->rsc_id);
op->rsc_id = NULL;
op->exec_pid = 0;
- if (op->ra_stdout_fd != -1) {
- close(op->ra_stdout_fd);
- op->ra_stdout_fd = -1;
- }
- if (op->ra_stderr_fd != -1) {
- close(op->ra_stderr_fd);
- op->ra_stderr_fd = -1;
- }
+
if ( NULL != op->ra_stdout_gsource) {
G_main_del_fd(op->ra_stdout_gsource);
op->ra_stdout_gsource = NULL;
@@ -423,6 +416,16 @@
G_main_del_fd(op->ra_stderr_gsource);
op->ra_stderr_gsource = NULL;
}
+
+ if (op->ra_stdout_fd != -1) {
+ close(op->ra_stdout_fd);
+ op->ra_stdout_fd = -1;
+ }
+ if (op->ra_stderr_fd != -1) {
+ close(op->ra_stderr_fd);
+ op->ra_stderr_fd = -1;
+ }
+
memset(op->first_line_ra_stdout, 0, sizeof(op->first_line_ra_stdout));
lrmd_debug2(LOG_DEBUG, "lrmd_op_destroy: free the op whose address is
%p"
@@ -3311,7 +3314,8 @@
char * data = NULL;
if (op == NULL) {
- lrmd_log(LOG_DEBUG, "%s:%d: op==NULL.", __FUNCTION__, __LINE__);
+ lrmd_log(LOG_ERR, "%s:%d: op==NULL.", __FUNCTION__, __LINE__);
+ return FALSE;
}
if (fd == -1) {
@@ -3319,8 +3323,17 @@
}
if (0 != read_pipe(fd, &data, op)) {
+ if ( NULL != op->ra_stdout_gsource) {
+ G_main_del_fd(op->ra_stdout_gsource);
+ op->ra_stdout_gsource = NULL;
+ }
+ if (op->ra_stdout_fd != -1) {
+ close(op->ra_stdout_fd);
+ op->ra_stdout_fd = -1;
+ }
rc = FALSE;
}
+
if (data!=NULL) {
op_type = ha_msg_value(op->msg, F_LRM_OP);
if ( (0==STRNCMP_CONST(op_type, "meta-data"))
@@ -3356,8 +3369,17 @@
char * data = NULL;
if (0 != read_pipe(fd, &data, op)) {
+ if ( NULL != op->ra_stderr_gsource) {
+ G_main_del_fd(op->ra_stderr_gsource);
+ op->ra_stderr_gsource = NULL;
+ }
+ if (op->ra_stderr_fd != -1) {
+ close(op->ra_stderr_fd);
+ op->ra_stderr_fd = -1;
+ }
rc = FALSE;
}
+
if (data!=NULL) {
op_type = ha_msg_value(op->msg, F_LRM_OP);
lrmd_log(LOG_INFO, "RA output: (%s:%s:stderr) %s", op->rsc_id
@@ -3385,7 +3407,6 @@
*data = NULL;
gstr_tmp = g_string_new("");
- /* the log is only for analysing bug 475, or should remove it. */
do {
errno = 0;
readlen = read(fd, buffer, BUFFLEN - 1);
@@ -3398,6 +3419,12 @@
if (errno == EINTR) {
errno = 0;
}
+
+ /* Reach the EOF */
+ if (readlen == 0) {
+ rc = -1;
+ }
+
if ((readlen < 0) && (errno !=0)) {
rc = -1;
if (errno != EAGAIN) {
@@ -3420,7 +3447,6 @@
, (op->ra_stdout_fd==fd)?"stdout":"stderr");
}
}
- /* the log is only for analysing bug 475, or should remove it. */
if ( gstr_tmp->len == 0 ) {
g_string_free(gstr_tmp, TRUE);
@@ -3524,6 +3550,10 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.209 2006/02/09 08:46:57 sunjd
+ * Fix bug 1008 ( LRMd consumes too much CPU )
+ * But, donnot know the root casue yet. :-(
+ *
* Revision 1.208 2006/02/08 10:22:32 sunjd
* remove the redundant code
*
------------------------------
Message: 3
Date: Thu, 9 Feb 2006 02:50:55 -0700 (MST)
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/stonith
Modified Files:
apcmastersnmp.c
Log Message:
Bug 1076: warning message 'module not tested'
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/apcmastersnmp.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- apcmastersnmp.c 20 May 2005 17:50:32 -0000 1.24
+++ apcmastersnmp.c 9 Feb 2006 09:50:55 -0000 1.25
@@ -1,4 +1,4 @@
-/* $Id: apcmastersnmp.c,v 1.24 2005/05/20 17:50:32 msoffen Exp $ */
+/* $Id: apcmastersnmp.c,v 1.25 2006/02/09 09:50:55 sunjd Exp $ */
/*
* Stonith module for APC Masterswitch (SNMP)
* Copyright (c) 2001 Andreas Piesk <[EMAIL PROTECTED]>
@@ -161,7 +161,7 @@
};
/* for checking hardware (issue a warning if mismatch) */
-static const char* APC_tested_ident[] =
{"AP9606","AP7920","AP_other_well_tested"};
+static const char* APC_tested_ident[] =
{"AP9606","AP7920","AP7921","AP_other_well_tested"};
/* constant strings */
static const char *pluginid = "APCMS-SNMP-Stonith";
------------------------------
Message: 4
Date: Thu, 9 Feb 2006 06:16:52 -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:
subsystems.c
Log Message:
Dont negate the signal passed to kill()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/subsystems.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- subsystems.c 3 Feb 2006 15:01:39 -0000 1.90
+++ subsystems.c 9 Feb 2006 13:16:52 -0000 1.91
@@ -109,7 +109,7 @@
crm_warn("Stopping %s before it had connected",
the_subsystem->name);
- CL_KILL(the_subsystem->pid, -SIGKILL);
+ CL_KILL(the_subsystem->pid, SIGKILL);
the_subsystem->pid = -1;
} else if(client_channel == NULL
@@ -118,7 +118,7 @@
crm_debug("Client %s has already quit", the_subsystem->name);
} else if(force_quit) {
- CL_KILL(the_subsystem->pid, -SIGKILL);
+ CL_KILL(the_subsystem->pid, SIGKILL);
the_subsystem->pid = -1;
} else {
------------------------------
_______________________________________________
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 38
********************************************
