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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: include by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 25 Jan 2006 20:07:24 -0700 (MST)
From: [email protected]
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
Log Message:
add more debug info
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- mgmt_crm.c 23 Jan 2006 07:34:22 -0000 1.9
+++ mgmt_crm.c 26 Jan 2006 03:07:23 -0000 1.10
@@ -145,7 +145,8 @@
if(cib_object == NULL) {
return -1;
}
- mgmt_log(LOG_INFO, "xml:%s",xml);
+
+ mgmt_log(LOG_DEBUG, "(delete)xml:%s",xml);
rc = cib_conn->cmds->delete(
cib_conn, type, cib_object, &output, 0);
@@ -321,6 +322,8 @@
fragment = create_cib_fragment(cib_object, "crm_config");
+ mgmt_log(LOG_DEBUG, "(update)xml:%s",xml);
+
rc = cib_conn->cmds->update(
cib_conn, "crm_config", fragment, &output, 0);
@@ -485,6 +488,7 @@
return cl_strdup(MSG_FAIL);
}
+ mgmt_log(LOG_DEBUG, "(delete resources)xml:%s",xml);
rc = cib_conn->cmds->delete(
cib_conn, "resources", cib_object, &output, 0);
------------------------------
Message: 2
Date: Thu, 26 Jan 2006 03:05:16 -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/cib
Modified Files:
messages.c
Log Message:
cib_process_change() was broken for everything except the nodes section
(thus so was cibadmin -U)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- messages.c 13 Jan 2006 10:31:14 -0000 1.61
+++ messages.c 26 Jan 2006 10:05:15 -0000 1.62
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.61 2006/01/13 10:31:14 andrew Exp $ */
+/* $Id: messages.c,v 1.62 2006/01/26 10:05:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -664,32 +664,36 @@
/* make changes to a temp copy then activate */
if(section == NULL) {
crm_data_t *sub_input = NULL;
+ const char *type = NULL;
copy_in_properties(*result_cib, input);
/* order is no longer important here */
if(result == cib_ok) {
- sub_input = get_object_root(XML_CIB_TAG_NODES, input);
+ type = XML_CIB_TAG_NODES;
+ sub_input = get_object_root(type, input);
result = updateList(
*result_cib, sub_input, failed, cib_update_op,
- XML_CIB_TAG_NODES);
+ type);
}
-
if(result == cib_ok) {
- sub_input = get_object_root(XML_CIB_TAG_NODES, input);
+ type = XML_CIB_TAG_RESOURCES;
+ sub_input = get_object_root(type, input);
result = updateList(
*result_cib, sub_input, failed, cib_update_op,
- XML_CIB_TAG_RESOURCES);
+ type);
}
if(result == cib_ok) {
- sub_input = get_object_root(XML_CIB_TAG_NODES, input);
+ type = XML_CIB_TAG_CONSTRAINTS;
+ sub_input = get_object_root(type, input);
result = updateList(
*result_cib, sub_input, failed, cib_update_op,
- XML_CIB_TAG_CONSTRAINTS);
+ type);
}
if(result == cib_ok) {
- sub_input = get_object_root(XML_CIB_TAG_NODES, input);
+ type = XML_CIB_TAG_STATUS;
+ sub_input = get_object_root(type, input);
result = updateList(
*result_cib, sub_input, failed, cib_update_op,
- XML_CIB_TAG_STATUS);
+ type);
}
} else {
------------------------------
Message: 3
Date: Thu, 26 Jan 2006 03:16:09 -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/admin
Modified Files:
cibadmin.c
Log Message:
The id check was broken
Fix the logging source
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/cibadmin.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- cibadmin.c 10 Jan 2006 13:24:04 -0000 1.47
+++ cibadmin.c 26 Jan 2006 10:16:09 -0000 1.48
@@ -1,4 +1,4 @@
-/* $Id: cibadmin.c,v 1.47 2006/01/10 13:24:04 andrew Exp $ */
+/* $Id: cibadmin.c,v 1.48 2006/01/26 10:16:09 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -144,7 +144,7 @@
};
#endif
- cl_log_set_entity("ptest");
+ cl_log_set_entity("cibadmin");
cl_log_set_facility(LOG_USER);
set_crm_log_level(LOG_CRIT-1);
@@ -377,17 +377,16 @@
crm_data_t*
handleCibMod(crm_data_t *cib_object)
{
- const char *attr_value = NULL;
crm_data_t *fragment = NULL;
CRM_DEV_ASSERT(cib_object != NULL);
if(cib_object == NULL) {
return NULL;
}
+
- attr_value = ID(cib_object);
- if(attr_value == NULL || strlen(attr_value) == 0) {
- crm_err("No value for \"id\" specified.");
+ if(do_id_check(cib_object, NULL)) {
+ crm_err("ID Check failed.");
return NULL;
}
------------------------------
Message: 4
Date: Thu, 26 Jan 2006 03:24:06 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
cib.h
Log Message:
Most transient clients connect, make a blocking call and exit.
Optimize this sequence of events to speed up the CIB a little.
Periodically dump some stats about what the CIB has been doing.
Number of queries, local vs. forwarded, updates vs. queries, passed vs. failed
Fix for a segfault - bug 1051 (a recent bad cleanup introduced it)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/cib.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- cib.h 18 Oct 2005 11:35:12 -0000 1.36
+++ cib.h 26 Jan 2006 10:24:06 -0000 1.37
@@ -1,4 +1,4 @@
-/* $Id: cib.h,v 1.36 2005/10/18 11:35:12 andrew Exp $ */
+/* $Id: cib.h,v 1.37 2006/01/26 10:24:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -44,6 +44,8 @@
enum cib_conn_type {
cib_command,
cib_query,
+ cib_query_synchronous,
+ cib_command_synchronous,
cib_no_connection
};
@@ -107,7 +109,8 @@
cib_no_quorum = -42,
cib_diff_failed = -43,
cib_diff_resync = -44,
- cib_old_data = -45
+ cib_old_data = -45,
+ cib_id_check = -46
};
enum cib_update_op {
@@ -182,6 +185,8 @@
#define cib_channel_ro "cib_ro"
#define cib_channel_rw "cib_rw"
#define cib_channel_callback "cib_callback"
+#define cib_channel_ro_synchronous "cib_ro_syncronous"
+#define cib_channel_rw_synchronous "cib_rw_syncronous"
typedef struct cib_s cib_t;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 56
********************************************
