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: debian by horms from
([email protected])
2. Linux-HA CVS: lrm by sunjd from ([email protected])
3. Linux-HA CVS: fencing by sunjd from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 14 Mar 2006 16:44:18 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
Tag: STABLE_1_2
changelog control
Log Message:
Debian Packaging Update
* Removed duplicate depenancy on adduser
(closes: #356887)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.17.2.37
retrieving revision 1.17.2.38
diff -u -3 -r1.17.2.37 -r1.17.2.38
--- changelog 8 Mar 2006 03:29:43 -0000 1.17.2.37
+++ changelog 14 Mar 2006 23:44:17 -0000 1.17.2.38
@@ -1,3 +1,10 @@
+heartbeat (1.2.4-7) UNRELEASED; urgency=low
+
+ * Removed duplicate depenancy on adduser
+ (closes: #356887)
+
+ -- Simon Horman <[EMAIL PROTECTED]> Wed, 15 Mar 2006 08:43:16 +0900
+
heartbeat (1.2.4-5) unstable; urgency=low
* Don't try and stop heartbeat in preinst on the first install
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.17.2.26
retrieving revision 1.17.2.27
diff -u -3 -r1.17.2.26 -r1.17.2.27
--- control 14 Feb 2006 10:05:10 -0000 1.17.2.26
+++ control 14 Mar 2006 23:44:17 -0000 1.17.2.27
@@ -83,7 +83,7 @@
Section: admin
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, python, iproute, adduser, netkit-ping |
iputils-ping, adduser
+Depends: ${shlibs:Depends}, python, iproute, adduser, netkit-ping |
iputils-ping
Recommends: sysklogd | syslog-ng | system-log-daemon, logrotate
Description: Subsystem for High-Availability Linux
heartbeat is a basic heartbeat subsystem for Linux-HA.
------------------------------
Message: 2
Date: Tue, 14 Mar 2006 19:54:28 -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:
log output level tweak
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -3 -r1.217 -r1.218
--- lrmd.c 13 Mar 2006 08:35:13 -0000 1.217
+++ lrmd.c 15 Mar 2006 02:54:28 -0000 1.218
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.217 2006/03/13 08:35:13 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.218 2006/03/15 02:54:28 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -556,7 +556,7 @@
}
op->first_line_ra_stdout[0] = EOS;
- lrmd_debug2(LOG_DEBUG, "lrmd_op_destroy: free the op whose address is
%p"
+ lrmd_debug3(LOG_DEBUG, "lrmd_op_destroy: free the op whose address is
%p"
, op);
cl_free(op);
}
@@ -2480,7 +2480,7 @@
op->msg = ha_msg_copy(msg);
op->t_recv = time_longclock();
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "%s: client [%d] want to add an operation %s on resource %s."
, __FUNCTION__
, client->pid
@@ -2813,22 +2813,22 @@
if (LRM_OP_DONE != op_status) {
need_notify = 1;
} else if (HA_OK != ha_msg_value_int(op->msg,F_LRM_RC,&op_rc)){
- lrmd_debug(LOG_DEBUG, "on_op_done: will callback due to not "
+ lrmd_debug2(LOG_DEBUG, "on_op_done: will callback due to not "
"finding F_LRM_RC field in the message op->msg.");
need_notify = 1;
} else if (EVERYTIME == target_rc) {
- lrmd_debug(LOG_DEBUG, "on_op_done: will callback for being "
+ lrmd_debug2(LOG_DEBUG, "on_op_done: will callback for being "
"asked to callback everytime.");
need_notify = 1;
} else if (CHANGED == target_rc) {
if (HA_OK != ha_msg_value_int(op->msg,F_LRM_LASTRC,
&last_rc)){
- lrmd_debug(LOG_DEBUG ,"on_op_done: will callback
because "
+ lrmd_debug2(LOG_DEBUG ,"on_op_done: will callback
because "
"this is first execution [rc: %d].", op_rc);
need_notify = 1;
} else {
if (last_rc != op_rc) {
- lrmd_debug(LOG_DEBUG, "on_op_done: will
callback "
+ lrmd_debug2(LOG_DEBUG, "on_op_done: will
callback "
" for this rc %d != last rc %d"
, op_rc, last_rc);
need_notify = 1;
@@ -3448,7 +3448,7 @@
CHECK_ALLOCATED(rapop, "ra_pipe_op", FALSE);
if (rapop->lrmd_op == NULL) {
- lrmd_debug(LOG_DEBUG, "%s:%d: Unallocated lrmd_op 0x%lx!!"
+ lrmd_debug2(LOG_DEBUG, "%s:%d: Unallocated lrmd_op 0x%lx!!"
, __FUNCTION__, __LINE__
, (unsigned long)rapop->lrmd_op);
} else {
@@ -3774,6 +3774,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.218 2006/03/15 02:54:28 sunjd
+ * log output level tweak
+ *
* Revision 1.217 2006/03/13 08:35:13 sunjd
* Reworkcl with new implementation for
* bug756: All output from resource agents should be logged
------------------------------
Message: 3
Date: Tue, 14 Mar 2006 20:12:11 -0700 (MST)
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:
log output tweak
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- stonithd.c 13 Mar 2006 08:47:55 -0000 1.83
+++ stonithd.c 15 Mar 2006 03:12:10 -0000 1.84
@@ -1,4 +1,4 @@
-/* $Id: stonithd.c,v 1.83 2006/03/13 08:47:55 sunjd Exp $ */
+/* $Id: stonithd.c,v 1.84 2006/03/15 03:12:10 sunjd Exp $ */
/* File: stonithd.c
* Description: STONITH daemon for node fencing
@@ -647,8 +647,8 @@
stonithd_child_count--;
stonithd_log2(LOG_DEBUG, "there still are %d child process running"
, stonithd_child_count);
- stonithd_log(LOG_DEBUG, "child process %s[%d] exited, its exit code: %d"
- " when signo=%d.", pname, p->pid, exitcode, signo);
+ stonithd_log(LOG_DEBUG, "Child process %s [%d] exited, its exit code:"
+ " %d when signo=%d.", pname, p->pid, exitcode, signo);
rc = g_hash_table_lookup_extended(executing_queue, &(p->pid)
, (gpointer *)&orignal_key, (gpointer *)&op);
@@ -732,7 +732,7 @@
stonithdProcessRegistered(ProcTrack* p)
{
stonithd_child_count++;
- stonithd_log(LOG_DEBUG, "Child process [%s] started [ pid: %d ]."
+ stonithd_log2(LOG_DEBUG, "Child process [%s] started [ pid: %d ]."
, p->ops->proctype(p), p->pid);
stonithd_log2(LOG_DEBUG, "there are %d child process running"
, stonithd_child_count);
@@ -1556,7 +1556,7 @@
if ( (client = get_exist_client_by_chan(client_list, ch)) != NULL ) {
if (client->pid == tmpint) {
- stonithd_log(LOG_DEBUG, "have the client %s (pid=%d) "
+ stonithd_log2(LOG_DEBUG, "Have the client %s (pid=%d) "
"sign off.", client->name, client->pid);
delete_client_by_chan(&client_list, ch);
client = NULL;
@@ -2443,7 +2443,7 @@
return ST_FAIL;
}
- stonithd_log(LOG_DEBUG, "on_stonithd_virtual_stonithRA_ops: "
+ stonithd_log2(LOG_DEBUG, "on_stonithd_virtual_stonithRA_ops: "
"sent back a synchonrous result.");
ZAPMSG(reply);
return ST_OK;
@@ -2462,8 +2462,9 @@
return ST_FAIL;
}
- stonithd_log(LOG_DEBUG, "RA %s's op %s finished.",
- ra_op->ra_name, ra_op->op_type);
+ stonithd_log(LOG_DEBUG
+ , "RA %s's op %s finished. op_result=%d"
+ , ra_op->ra_name, ra_op->op_type, ra_op->op_result);
if ( NULL == get_exist_client_by_chan(client_list, ch) ) {
/* Here the ch are already destroyed */
@@ -2478,8 +2479,8 @@
return ST_FAIL;
}
- stonithd_log(LOG_DEBUG, "ra_op->op_type=%s, ra_op->ra_name=%s",
- ra_op->op_type, ra_op->ra_name); /* can be deleted*/
+ stonithd_log2(LOG_DEBUG, "ra_op->op_type=%s, ra_op->ra_name=%s",
+ ra_op->op_type, ra_op->ra_name);
if ( (ha_msg_add(reply, F_STONITHD_TYPE, ST_APIRPL) != HA_OK )
||(ha_msg_add(reply, F_STONITHD_APIRPL, ST_RAOPRET) != HA_OK )
||(ha_msg_add(reply, F_STONITHD_RAOPTYPE, ra_op->op_type) != HA_OK)
@@ -2504,7 +2505,7 @@
ZAPMSG(reply);
return ST_FAIL;
} else {
- stonithd_log(LOG_DEBUG, "send_stonithRAop_final_result: "
+ stonithd_log2(LOG_DEBUG, "send_stonithRAop_final_result: "
"succeed in sending back final result message.");
}
@@ -2640,7 +2641,7 @@
}
/* Don't find in local_started_stonith_rsc, not on start status */
- stonithd_log(LOG_DEBUG, "stonithRA_start: op->params' address=%p"
+ stonithd_log2(LOG_DEBUG, "stonithRA_start: op->params' address=%p"
, op->params);
if (debug_level > 0) {
print_str_hashtable(op->params);
@@ -3361,6 +3362,9 @@
/*
* $Log: stonithd.c,v $
+ * Revision 1.84 2006/03/15 03:12:10 sunjd
+ * log output tweak
+ *
* Revision 1.83 2006/03/13 08:47:55 sunjd
* stonithd.c
*
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 29
********************************************
