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: membership by zhenh from
([email protected])
2. Linux-HA CVS: cim by panjiam from
([email protected])
3. Linux-HA CVS: cim by panjiam from
([email protected])
4. Linux-HA CVS: cim by panjiam from
([email protected])
5. Linux-HA CVS: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 13 Apr 2006 20:41:31 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccmlib_memapi.c
Log Message:
only updating node name list in the handler of llm_msg, fix bug 1198
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccmlib_memapi.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ccmlib_memapi.c 13 Apr 2006 09:08:37 -0000 1.43
+++ ccmlib_memapi.c 14 Apr 2006 02:41:30 -0000 1.44
@@ -1,4 +1,4 @@
-/* $Id: ccmlib_memapi.c,v 1.43 2006/04/13 09:08:37 zhenh Exp $ */
+/* $Id: ccmlib_memapi.c,v 1.44 2006/04/14 02:41:30 zhenh Exp $ */
/*
* ccmlib_memapi.c: Consensus Cluster Membership API
*
@@ -121,20 +121,12 @@
on_llm_msg(mbr_private_t *mem, struct IPC_MESSAGE *msg)
{
unsigned long len = msg->msg_len;
- int numnodes;
if (mem->llm != NULL) {
g_free(mem->llm);
}
mem->llm = (ccm_llm_t *)g_malloc(len);
memcpy(mem->llm, msg->msg_body, len);
-
- mem->bornon = g_hash_table_new(g_direct_hash,
- g_direct_equal);
-
- numnodes = CLLM_GET_NODECOUNT(mem->llm);
-
- mem->cookie = NULL;
return;
}
@@ -185,6 +177,11 @@
break;
}
on_llm_msg(private, msg);
+
+ private->bornon = g_hash_table_new(g_direct_hash,
+ g_direct_equal);
+ private->cookie = NULL;
+
private->client_report = TRUE;
msg->msg_done(msg);
return 0;
------------------------------
Message: 2
Date: Thu, 13 Apr 2006 21:35:04 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
resource_common.c
Log Message:
group resource id missing
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/resource_common.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- resource_common.c 13 Apr 2006 07:35:03 -0000 1.5
+++ resource_common.c 14 Apr 2006 03:35:02 -0000 1.6
@@ -610,6 +610,7 @@
rsctype = "master";
break;
case TID_RES_GROUP:
+ ha_msg_add(resource, "id", rscid);
rsctype = "group";
break;
}
------------------------------
Message: 3
Date: Thu, 13 Apr 2006 21:39:54 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
cluster_info.c
Log Message:
1. the parameter did not match in the macro.
2. clean up resource group disk image immediately after submmitted.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/cluster_info.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- cluster_info.c 13 Apr 2006 07:58:35 -0000 1.6
+++ cluster_info.c 14 Apr 2006 03:39:53 -0000 1.7
@@ -1314,10 +1314,10 @@
return 1;
}
-#define CLEAN_RESOURCE_RECORD(resid) do { \
- cim_update_disabled_rsc_list(0, rscid); \
- cim_erase_rscattrs(rscid); \
- cim_remove_rsctype(rscid); \
+#define CLEAN_RESOURCE_RECORD(resid) do { \
+ cim_update_disabled_rsc_list(0, resid); \
+ cim_erase_rscattrs(resid); \
+ cim_remove_rsctype(resid); \
}while(0)
/****************************************************************
@@ -1821,6 +1821,8 @@
return HA_FAIL;
}
+ CLEAN_RESOURCE_RECORD(rscid);
+
/* then add sub primitive resources into group */
count = cim_list_length(sublist);
for (i = 0; i < count; i++) {
@@ -1837,7 +1839,6 @@
CLEAN_RESOURCE_RECORD(cl_get_string(primitive, "id"));
}
- CLEAN_RESOURCE_RECORD(rscid);
ha_msg_del(sublist);
} else if ( type == TID_RES_CLONE || type == TID_RES_MASTER) {
struct ha_msg *primitive;
------------------------------
Message: 4
Date: Thu, 13 Apr 2006 21:44:10 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
clustering_service_provider.c
Log Message:
the CIM method should return HA_OK if succeed in adding resource.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/clustering_service_provider.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- clustering_service_provider.c 10 Apr 2006 10:14:00 -0000 1.1
+++ clustering_service_provider.c 14 Apr 2006 03:44:10 -0000 1.2
@@ -219,7 +219,7 @@
strcasecmp(METHOD_ADD_RESOURCE, method_name) == 0 ){
char * rscid;
rscid = CMGetKeyString(rscop, "Id", &rc);
- if ( cim_cib_addrsc(rscid) == HA_FAIL ) {
+ if ( ( ret = cim_cib_addrsc(rscid)) == HA_FAIL ) {
cl_log(LOG_ERR, "%s: failed to add resource %s.",
__FUNCTION__, rscid);
rc.rc = CMPI_RC_ERR_FAILED;
------------------------------
Message: 5
Date: Thu, 13 Apr 2006 22:25:02 -0600 (MDT)
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 the type check of operations
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- mgmt_crm.c 12 Apr 2006 09:14:34 -0000 1.27
+++ mgmt_crm.c 14 Apr 2006 04:25:02 -0000 1.28
@@ -1104,6 +1104,9 @@
}
for (i = 0; i < ops->nfields; i++) {
if (STRNCMP_CONST(ops->names[i], "op") == 0) {
+ if (ops->types[i] != FT_STRUCT) {
+ continue;
+ }
op = (struct ha_msg*)ops->values[i];
ret = mgmt_msg_append(ret, ha_msg_value(op, "id"));
ret = mgmt_msg_append(ret, ha_msg_value(op, "name"));
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 85
********************************************
