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: debian by horms from
([email protected])
4. Linux-HA CVS: cim by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 13 Apr 2006 02:28:13 -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:
mof_map.h
Log Message:
define the class names
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/mof_map.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mof_map.h 10 Apr 2006 10:15:21 -0000 1.2
+++ mof_map.h 13 Apr 2006 08:28:12 -0000 1.3
@@ -48,8 +48,37 @@
#define HA_COLOCATION_CONSTRAINT 8
#define HA_LOCATION_CONSTRAINT 9
#define HA_RESOURCE_GROUP 10
+#define HA_INSTANCE_ATTRIBUTES 11
+
#define METHOD_ADD_RESOURCE "AddResource"
#define METHOD_ADD_PRIMITIVE_RESOURCE "AddPrimitiveResource"
+
+#define CLASS_HA_CLUSTER "HA_Cluster"
+#define CLASS_HA_CLUSTER_NODE "HA_ClusterNode"
+#define CLASS_HA_CLUSTER_RESOURCE "HA_ClusterResource"
+
+#define CLASS_HA_SOFTWARE_IDENTITY "HA_SoftwareIdentity"
+#define CLASS_HA_INSTALLED_SOFTWARE_IDENTITY "HA_InstalledSoftwareIdentity"
+#define CLASS_HA_PRIMITIVE_RESOURCE "HA_PrimitiveResource"
+#define CLASS_HA_RESOURCE_GROUP "HA_ResourceGroup"
+#define CLASS_HA_RESOURCE_CLONE "HA_ResourceClone"
+#define CLASS_HA_MSTERSLAVE_RESOURCE "HA_MasterSlaveResource"
+#define CLASS_HA_INSTANCE_ATTRIBUTES "HA_InstanceAttributes"
+#define CLASS_HA_ATTRIBUTES_OF_RESOURCE "HA_AttributesOfResource"
+#define CLASS_HA_OPERATION "HA_Operation"
+#define CLASS_HA_OPERATION_ON_RESOURCE "HA_OperationOnResource"
+#define CLASS_HA_RESOURCE_CONSTRAINT "HA_ResourceConstraint"
+#define CLASS_HA_ORDER_CONSTRAINT "HA_OrderConstraint"
+#define CLASS_HA_COLOCATION_CONSTRAINT "HA_ColocationConstraint"
+#define CLASS_HA_LOCATION_CONSTRAINT "HA_LocationConstraint"
+
+#define CLASS_HA_SUBRESOURCE "HA_SubResource"
+#define CLASS_HA_PARTICIPATING_NODE "HA_ParticipatingNode"
+#define CLASS_HA_HOSTED_RESOURCE "HA_HostedResource"
+#define CLASS_HA_INDICATION "HA_Indication"
+#define CLASS_HA_CLUSTERING_SERVICE "HA_ClusteringService"
+
+
#endif
------------------------------
Message: 2
Date: Thu, 13 Apr 2006 02:29:26 -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:
cmpi_utils.c
Log Message:
disabled result_class checking
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/cmpi_utils.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- cmpi_utils.c 10 Apr 2006 10:21:50 -0000 1.7
+++ cmpi_utils.c 13 Apr 2006 08:29:26 -0000 1.8
@@ -103,8 +103,7 @@
int
-cmpi_inst2msg(CMPIInstance *inst, int mapid,
- struct ha_msg *msg, CMPIStatus *rc)
+cmpi_inst2msg(CMPIInstance *inst, int mapid, struct ha_msg *msg, CMPIStatus
*rc)
{
int i = 0;
const struct map_t *map = cim_query_map(mapid);
@@ -414,6 +413,7 @@
int i, array_size;
DEBUG_ENTER();
namespace = CMGetCharPtr(CMGetNameSpace(cop, rc));
+#if 0
if ( result_class ) {
CMPIObjectPath * op = NULL;
op = CMNewObjectPath(broker, namespace, classname, rc);
@@ -423,6 +423,7 @@
return HA_OK;
}
}
+#endif
RETURN_FAIL_IFNULL_OBJ( CBGetInstance( broker, ctx, cop, NULL, rc),
"Instance of cop");
/* get source class */
------------------------------
Message: 3
Date: Thu, 13 Apr 2006 02:29:38 -0600 (MDT)
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
Log Message:
Debian packaging update.
Release 1.2.4-7
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.17.2.38
retrieving revision 1.17.2.39
diff -u -3 -r1.17.2.38 -r1.17.2.39
--- changelog 14 Mar 2006 23:44:17 -0000 1.17.2.38
+++ changelog 13 Apr 2006 08:29:38 -0000 1.17.2.39
@@ -1,9 +1,15 @@
-heartbeat (1.2.4-7) UNRELEASED; urgency=low
+heartbeat (1.2.4-7) unstable; urgency=low
* Removed duplicate depenancy on adduser
(closes: #356887)
+ * The chanlog entry in 1.2.4-2 refering to vanessa libraries and
+ ~/.magic is incorrect. While the description of the .magic problem
+ is accurate, the affected dependancies are libstonith0,
+ libpils0, and possibly others, but not vanessa, as linux-ha
+ does not use thos libraries. This is a cut and paste error
+ as I updated the perdition packages at the same time.
- -- Simon Horman <[EMAIL PROTECTED]> Wed, 15 Mar 2006 08:43:16 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Thu, 13 Apr 2006 16:32:01 +0900
heartbeat (1.2.4-5) unstable; urgency=low
------------------------------
Message: 4
Date: Thu, 13 Apr 2006 02:30:37 -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:
hosted_resource_provider.c
Log Message:
reduce codes by using macro
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/hosted_resource_provider.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- hosted_resource_provider.c 10 Apr 2006 10:28:30 -0000 1.3
+++ hosted_resource_provider.c 13 Apr 2006 08:30:37 -0000 1.4
@@ -57,40 +57,25 @@
CMPIObjectPath * node_op, CMPIObjectPath * res_op,
CMPIStatus * rc)
{
- CMPIString * cmpi_rsc_id;
- CMPIString * cmpi_uname;
char * rsc_id;
char * uname;
- int host = 0;
+ int host = FALSE;
const char * running_node;
struct ha_msg * msg;
- /* resource name */
- cmpi_rsc_id = CMGetKey(res_op, "Id", rc).value.string;
- if ( CMIsNullObject(cmpi_rsc_id) ) {
- cl_log(LOG_INFO, "%s: resource_name = NULL", __FUNCTION__);
- return 0;
- }
- rsc_id = CMGetCharPtr(cmpi_rsc_id);
-
- /* uname */
- cmpi_uname = CMGetKey(node_op, "Name", rc).value.string;
- if ( CMIsNullObject( cmpi_uname ) ) {
- cl_log(LOG_INFO, "%s: invalid uname", __FUNCTION__);
- return 0;
- }
- uname = CMGetCharPtr(cmpi_uname);
+ rsc_id = CMGetKeyString(res_op, "Id", rc);
+ uname = CMGetKeyString(node_op, "Name", rc);
/* get running node */
if ((msg = cim_query_dispatch(GET_RSC_HOST, rsc_id, NULL)) == NULL ) {
cl_log(LOG_WARNING, "running node of %s is NULL", rsc_id);
- return 0;
+ return FALSE;
}
running_node = cl_get_string(msg, "host");
/* campare running node with uname */
- if ( strcmp(running_node, uname) == 0 ) {
- host = 1;
+ if ( strncmp(running_node, uname, MAXLEN) == 0 ) {
+ host = TRUE;
}
ha_msg_del(msg);
------------------------------
_______________________________________________
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 81
********************************************
