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: cim by panjiam from
([email protected])
2. Linux-HA CVS: cim by panjiam from
([email protected])
3. Linux-HA CVS: cim by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 13 Apr 2006 02:31: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:
mgmt_client.c mgmt_client.h
Log Message:
make client parameters
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/mgmt_client.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mgmt_client.c 10 Apr 2006 10:28:30 -0000 1.2
+++ mgmt_client.c 13 Apr 2006 08:31:54 -0000 1.3
@@ -21,9 +21,10 @@
*/
+#include <pthread.h>
#include "mgmt_client.h"
-#define LIB_INIT_ALL (ENABLE_HB|ENABLE_LRM|ENABLE_CRM)
+#define LIB_INIT_ALL (ENABLE_LRM|ENABLE_CRM)
#undef DEBUG_ENTER
@@ -33,9 +34,8 @@
#define DEBUG_LEAVE()
const char * module_name = "cim";
-static int mgmt_lib_initialize(void);
-static void mgmt_lib_finalize(void);
+pthread_mutex_t client_mutex = PTHREAD_MUTEX_INITIALIZER;
int
mgmt_lib_initialize(void)
@@ -44,7 +44,7 @@
return HA_OK;
}
-static void
+void
mgmt_lib_finalize(void)
{
final_mgmt_lib();
@@ -159,8 +159,13 @@
int n, rc;
char ** args = NULL;
- if ( ( result = process_msg(client->cmnd) ) == NULL ) {
- cl_log(LOG_ERR, "do_process_cmnd: failed to process: %s",
+
+ pthread_mutex_lock(&client_mutex);
+ result = process_msg(client->cmnd);
+ pthread_mutex_unlock(&client_mutex);
+
+ if ( result == NULL ) {
+ cl_log(LOG_ERR, "mclient_process: failed to process: %s",
client->cmnd);
rc = MC_ERROR;
goto exit2;
@@ -169,7 +174,8 @@
__FUNCTION__, client->cmnd, result);
if ( ! mgmt_result_ok(result) ) {
- cl_log(LOG_WARNING, "do_process_cmnd: client return
\'failed\'.");
+ cl_log(LOG_ERR, "mclient_process: client return \'failed\'.");
+ cl_log(LOG_ERR, "mclient_process: %s", result);
rc = MC_FAIL;
goto exit1;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/mgmt_client.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mgmt_client.h 10 Apr 2006 10:28:30 -0000 1.2
+++ mgmt_client.h 13 Apr 2006 08:31:54 -0000 1.3
@@ -46,6 +46,14 @@
#define Arg5(a,b,c,d,e) a, b, c, d, e, NULL
#define Arg6(a,b,c,d,e,f) a, b, c, d, e, f, NULL
+#define mclient_makeup_param(a,b) \
+ ({ char param[MAXLEN] = ""; \
+ strncat(param, a, MAXLEN); \
+ strncat(param, "\n", MAXLEN); \
+ strncat(param, b, MAXLEN); \
+ param; \
+ })
+
#define mclient_new_and_process(cmnd, arg...) \
({ MClient * client = mclient_new_with_cmnd(cmnd, ##arg); \
if ( client ){ \
@@ -79,4 +87,7 @@
char * mclient_nth_value(MClient * client, uint32_t index);
char * mclient_nth_key(MClient * client, uint32_t index);
void mclient_free(void * client);
+
+int mgmt_lib_initialize(void);
+void mgmt_lib_finalize(void);
#endif
------------------------------
Message: 2
Date: Thu, 13 Apr 2006 02:33:25 -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:
Makefile.am
Log Message:
InstanceAttributes provider is back
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am 10 Apr 2006 10:28:30 -0000 1.18
+++ Makefile.am 13 Apr 2006 08:33:25 -0000 1.19
@@ -68,7 +68,10 @@
libHA_ColocationConstraintProvider.la \
libHA_OrderConstraintProvider.la \
libHA_IndicationProvider.la \
- libHA_ClusteringServiceProvider.la
+ libHA_ClusteringServiceProvider.la \
+ libHA_InstanceAttributesProvider.la \
+ libHA_AttributesOfResourceProvider.la
+
#--------------------------------------------------------------
libHAClusterInfo_la_SOURCES = mgmt_client.c utils.c \
@@ -105,11 +108,11 @@
libHA_InstalledSoftwareIdentityProvider_la_SOURCES =
installed_software_provider.c
libHA_InstalledSoftwareIdentityProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-#libHA_ResourceInstanceProvider_la_SOURCES = resource_instance_provider.c
-#libHA_ResourceInstanceProvider_la_LIBADD = libHAClusterInfo.la
+libHA_AttributesOfResourceProvider_la_SOURCES = attrs_of_resource_provider.c
+libHA_AttributesOfResourceProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-#libHA_InstanceAttributesProvider_la_SOURCES = instance_attributes_provider.c
-#libHA_InstanceAttributesProvider_la_LIBADD = libHAClusterInfo.la
+libHA_InstanceAttributesProvider_la_SOURCES = instance_attrs_provider.c
+libHA_InstanceAttributesProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
libHA_SubResourceProvider_la_SOURCES = subresource_provider.c
libHA_SubResourceProvider_la_LIBADD = libHAClusterInfo.la
------------------------------
Message: 3
Date: Thu, 13 Apr 2006 02:34:59 -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/tests
Modified Files:
runtest.sh
Log Message:
add InstanceAttributes and remove Operation temporarily
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/tests/runtest.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- runtest.sh 10 Apr 2006 10:20:21 -0000 1.8
+++ runtest.sh 13 Apr 2006 08:34:59 -0000 1.9
@@ -47,13 +47,14 @@
HA_MasterSlaveResource
HA_OrderConstraint
HA_LocationConstraint
- HA_ColocationConstraint"
+ HA_ColocationConstraint
+ HA_InstanceAttributes"
ASSOC_CLASSES="HA_ParticipatingNode
HA_InstalledSoftwareIdentity
HA_SubResource
- HA_OperationOnResource
- HA_HostedResource"
+ HA_HostedResource
+ HA_AttributesOfResource"
ALL_CLASSES="$INST_CLASSES $ASSOC_CLASSES"
@@ -66,10 +67,9 @@
echo "HA_ParticipatingNode HA_HostedResource";;
HA_PrimitiveResource)
echo "HA_SubResource HA_HostedResource
- HA_OperationOnResource";;
+ HA_AttributesOfResource";;
HA_MasterSlaveResource|HA_ResourceClone|HA_ResourceGroup)
- echo "HA_SubResource
- HA_OperationOnResource";;
+ echo "HA_SubResource";;
HA_SoftwareIdentity)
echo "HA_InstalledSoftwareIdentity";;
*) echo ""
------------------------------
_______________________________________________
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 82
********************************************
