Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: lrm by zhenh from (linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: mgmt by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 10 Aug 2006 18:12:00 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
downgrade some general log
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -3 -r1.234 -r1.235
--- lrmd.c 7 Aug 2006 15:07:29 -0000 1.234
+++ lrmd.c 11 Aug 2006 00:11:59 -0000 1.235
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.234 2006/08/07 15:07:29 alan Exp $ */
+/* $Id: lrmd.c,v 1.235 2006/08/11 00:11:59 zhenh Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -1918,7 +1918,7 @@
CHECK_ALLOCATED(client, "client", HA_FAIL);
CHECK_ALLOCATED(msg, "message", HA_FAIL);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "on_msg_get_rsc_classes:client [%d] wants to get rsc classes"
, client->pid);
@@ -1957,7 +1957,7 @@
return HA_FAIL;
}
- lrmd_debug(LOG_DEBUG, "on_msg_get_rsc_types: the client [pid:%d] "
+ lrmd_debug2(LOG_DEBUG, "on_msg_get_rsc_types: the client [pid:%d] "
"wants to get resource types of resource class %s"
, client->pid, rclass);
@@ -2006,7 +2006,7 @@
rclass = ha_msg_value(msg, F_LRM_RCLASS);
rtype = ha_msg_value(msg, F_LRM_RTYPE);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "%s: the client [%d] wants to get rsc privider of %s::%s"
, __FUNCTION__
, client->pid
@@ -2060,7 +2060,7 @@
rclass = ha_msg_value(msg, F_LRM_RCLASS);
provider = ha_msg_value(msg, F_LRM_RPROVIDER);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "%s: the client [pid:%d] want to get rsc metadata of %s::%s."
, __FUNCTION__
, client->pid
@@ -2112,7 +2112,7 @@
CHECK_ALLOCATED(client, "client", HA_FAIL);
CHECK_ALLOCATED(msg, "message", HA_FAIL);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "on_msg_get_all:client [%d] want to get all rsc information."
, client->pid);
@@ -2140,14 +2140,14 @@
id = ha_msg_value(msg, F_LRM_RID);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "on_msg_get_rsc: the client [pid:%d] wants to get "
"the information of the resource [rsc_id: %s]"
, client->pid, lrmd_nullcheck(id));
rsc = lookup_rsc_by_msg(msg);
if (NULL == rsc) {
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "on_msg_get_rsc: no rsc with id %s."
, lrmd_nullcheck(id));
ret = create_lrm_ret(HA_FAIL, 1);
@@ -2204,7 +2204,7 @@
rid = ha_msg_value(msg, F_LRM_RID);
op_type = ha_msg_value(msg, F_LRM_OP);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "on_msg_get_last_op:client %s[%d] want to get the information "
"regarding last %s op on %s"
, client->app_name, client->pid
@@ -2271,7 +2271,7 @@
id = ha_msg_value(msg, F_LRM_RID);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "on_msg_del_rsc: client [%d] want to delete rsc %s"
, client->pid, lrmd_nullcheck(id));
@@ -2411,9 +2411,9 @@
type = ha_msg_value(msg, F_LRM_TYPE);
/* when a flush request arrived, flush all pending ops */
if (0 == STRNCMP_CONST(type, FLUSHOPS)) {
- lrmd_debug(LOG_DEBUG
- , "on_msg_perform_op:client [%d] flush operations"
- , client->pid);
+ lrmd_debug2(LOG_DEBUG
+ , "on_msg_perform_op:client [%d] flush operations"
+ , client->pid);
node = g_list_first(rsc->op_list);
while (NULL != node ) {
@@ -2436,7 +2436,7 @@
int cancel_op_id;
ha_msg_value_int(msg, F_LRM_CALLID, &cancel_op_id);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "%s:client [pid:%d] cancel the operation [callid:%d]"
, __FUNCTION__
, client->pid
@@ -2603,7 +2603,7 @@
CHECK_ALLOCATED(msg, "message", HA_FAIL);
id = ha_msg_value(msg,F_LRM_RID);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "%s: client [%d] want to get the state of resource %s"
, __FUNCTION__, client->pid, lrmd_nullcheck(id));
@@ -2970,7 +2970,7 @@
/* remove the op from op_list and copy to last_op */
rsc->op_list = g_list_remove(rsc->op_list,op);
- lrmd_debug(LOG_DEBUG
+ lrmd_debug2(LOG_DEBUG
, "on_op_done:%s is removed from op list"
, op_info(op));
@@ -3089,7 +3089,7 @@
}
if (child_number >= MAX_CHILD_NUMBER) {
- lrmd_log(LOG_NOTICE
+ lrmd_debug2(LOG_NOTICE
, "Because the child number reachs the maximum"
" %d, the operations are postponed to execute"
" behind and including this: %s "
@@ -3371,21 +3371,21 @@
, op->first_line_ra_stdout);
if (rc != EXECRA_OK || debug_level > 0) {
if (signo != 0) {
- lrmd_log(rc == EXECRA_OK ? LOG_DEBUG : LOG_WARNING
+ lrmd_debug(rc == EXECRA_OK ? LOG_DEBUG : LOG_WARNING
, "Resource Agent (%s): pid [%d] killed by"
" signal %d", op_info(op), p->pid, signo);
}else if (rc == exitcode) {
- lrmd_log(rc == EXECRA_OK ? LOG_DEBUG : LOG_INFO
+ lrmd_debug2(rc == EXECRA_OK ? LOG_DEBUG : LOG_INFO
, "Resource Agent (%s): pid [%d] exited with"
" return code %d", op_info(op), p->pid, rc);
}else{
- lrmd_log(rc == EXECRA_OK ? LOG_DEBUG : LOG_INFO
+ lrmd_debug2(rc == EXECRA_OK ? LOG_DEBUG : LOG_INFO
, "Resource Agent (%s): pid [%d] exited with"
" return code %d (mapped from %d)"
, op_info(op), p->pid, rc, exitcode);
}
if (rc != EXECRA_OK || debug_level > 1) {
- lrmd_log(LOG_INFO, "Resource Agent output: [%s]"
+ lrmd_debug2(LOG_INFO, "Resource Agent output: [%s]"
, op->first_line_ra_stdout);
}
}
@@ -3569,7 +3569,7 @@
if ( (0==STRNCMP_CONST(rapop->op_type, "meta-data"))
||(0==STRNCMP_CONST(rapop->op_type, "monitor"))
||(0==STRNCMP_CONST(rapop->op_type, "status")) ) {
- lrmd_debug(LOG_DEBUG, "RA output: (%s:%s:stdout) %s"
+ lrmd_debug2(LOG_DEBUG, "RA output: (%s:%s:stdout) %s"
, rapop->rsc_id, rapop->op_type, data);
} else {
lrmd_log(LOG_INFO, "RA output: (%s:%s:stdout) %s"
@@ -3886,6 +3886,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.235 2006/08/11 00:11:59 zhenh
+ * downgrade some general log
+ *
* Revision 1.234 2006/08/07 15:07:29 alan
* Lowered limit on maximum number of simultaneous child processes in the lrmd.
*
------------------------------
Message: 2
Date: Fri, 11 Aug 2006 01:07:23 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c mgmt_internal.h
Log Message:
fix a grammar error
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- mgmt_crm.c 20 Jul 2006 07:49:11 -0000 1.63
+++ mgmt_crm.c 11 Aug 2006 07:07:22 -0000 1.64
@@ -594,7 +594,7 @@
crm_data_t* attrs;
const char* id = NULL;
pe_working_set_t* data_set;
- const char* path[] =
{"configuration","crm_config","cluster_property_set", "attributes"}
+ const char* path[] =
{"configuration","crm_config","cluster_property_set", "attributes"};
ARGC_CHECK(3);
data_set = get_data_set();
@@ -1853,7 +1853,7 @@
GList* cur;
crm_data_t* cos = NULL;
pe_working_set_t* data_set;
- const char* path[] = {"configuration","constraints"}
+ const char* path[] = {"configuration","constraints"};
ARGC_CHECK(2);
@@ -1888,8 +1888,8 @@
GList* expr_list, *expr_cur;
crm_data_t* cos = NULL;
pe_working_set_t* data_set;
- const char* path[] = {"configuration","constraints"}
- ARGC_CHECK(3);
+ const char* path[] = {"configuration","constraints"};
+ ARGC_CHECK(3);
data_set = get_data_set();
cos = find_xml_node_nested(data_set->input, path, 2);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_internal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- mgmt_internal.h 17 Mar 2006 09:10:21 -0000 1.4
+++ mgmt_internal.h 11 Aug 2006 07:07:22 -0000 1.5
@@ -29,15 +29,15 @@
#define KEY_LOGDAEMON "use_logd"
#define HADEBUGVAL "HA_DEBUG"
-#define mgmt_log(priority, fmt...); \
+#define mgmt_log(priority, fmt...) \
cl_log(priority, fmt); \
-#define mgmt_debug(priority, fmt...); \
+#define mgmt_debug(priority, fmt...) \
if ( debug_level > 0 ) { \
cl_log(priority, fmt); \
}
-#define ARGC_CHECK(n); \
+#define ARGC_CHECK(n) \
if (argc != (n)) { \
mgmt_log(LOG_DEBUG, "%s msg should have %d params, but %d
given",argv[0],n,argc); \
return cl_strdup(MSG_FAIL"\nwrong parameter number");
\
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 11
********************************************
