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: include by sunjd from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: lib by sunjd from (linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lrm by sunjd from (linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by davidlee from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 22 Jun 2006 04:27:42 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: include by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/lrm
Modified Files:
lrm_api.h
Log Message:
tweak error code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/lrm/lrm_api.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- lrm_api.h 11 May 2005 23:34:19 -0000 1.31
+++ lrm_api.h 22 Jun 2006 10:27:41 -0000 1.32
@@ -52,8 +52,8 @@
* "rc" is the return code of an opertioan. it's value is in following enum
* which is defined in "raexec.h"
* enum UNIFORM_RET_EXECRA {
- * EXECRA_EXEC_UNKNOWN_ERROR = 152,
- * EXECRA_NO_RA = 151,
+ * EXECRA_EXEC_UNKNOWN_ERROR = -2,
+ * EXECRA_NO_RA = -1,
* EXECRA_OK = 0,
* EXECRA_UNKNOWN_ERROR = 1,
* EXECRA_INVALID_PARAM = 2,
@@ -253,6 +253,15 @@
int (*set_lrm_callback) (ll_lrm_t*,
lrm_op_done_callback_t op_done_callback_func);
+/*
+ int (*set_parameters)(ll_lrm_t*, const GHashTable* option);
+
+ GHashTable* (*get_all_parameters)(ll_lrm_t*);
+
+ char * (*get_parameter)(ll_lrm_t *, const char * paramname);
+
+ char * (*get_parameter_description)(ll_lrm_t*);
+*/
/*
*get_rsc_class_supported:
------------------------------
Message: 2
Date: Thu, 22 Jun 2006 04:29:06 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/lrm
Modified Files:
lrm_msg.c
Log Message:
remove the filter as Andrew's advice
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/lrm/lrm_msg.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- lrm_msg.c 29 May 2006 11:55:53 -0000 1.26
+++ lrm_msg.c 22 Jun 2006 10:29:05 -0000 1.27
@@ -1,4 +1,4 @@
-/* $Id: lrm_msg.c,v 1.26 2006/05/29 11:55:53 andrew Exp $ */
+/* $Id: lrm_msg.c,v 1.27 2006/06/22 10:29:05 sunjd Exp $ */
/*
* Message Functions For Local Resource Manager
*
@@ -63,11 +63,8 @@
if (g_hash_table_lookup(merged, key)) {
return;
+ }
- } else if(strncmp(key, "CRM_meta_" /*CRM_META*/, 9) == 0) {
- /* Never repopulate CRM meta attributes */
- return;
- }
g_hash_table_insert(merged, g_strdup(key), g_strdup(value));
}
@@ -217,6 +214,9 @@
/*
* $Log: lrm_msg.c,v $
+ * Revision 1.27 2006/06/22 10:29:05 sunjd
+ * remove the filter as Andrew's advice
+ *
* Revision 1.26 2006/05/29 11:55:53 andrew
* Fix for OSDL #1273
* This patch reverses the copy order for better performance and never
------------------------------
Message: 3
Date: Thu, 22 Jun 2006 04:33:23 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/admin
Modified Files:
lrmadmin.c
Log Message:
(bug1301): make a better output
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/admin/lrmadmin.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- lrmadmin.c 22 Jun 2006 05:56:31 -0000 1.38
+++ lrmadmin.c 22 Jun 2006 10:33:22 -0000 1.39
@@ -1,4 +1,4 @@
-/* $Id: lrmadmin.c,v 1.38 2006/06/22 05:56:31 sunjd Exp $ */
+/* $Id: lrmadmin.c,v 1.39 2006/06/22 10:33:22 sunjd Exp $ */
/* File: lrmadmin.c
* Description: A adminstration tool for Local Resource Manager
*
@@ -92,14 +92,37 @@
} lrmadmin_cmd_t;
#define nullcheck(p) ((p) ? (p) : "<null>")
-static const char * status_msg[5] = {
+static const char * status_msg[6] = {
+ "pending", /* LRM_OP_PENDING */
"succeed", /* LRM_OP_DONE */
"cancelled", /* LRM_OP_CANCELLED */
"timeout", /* LRM_OP_TIMEOUT */
"not Supported", /* LRM_OP_NOTSUPPORTED */
- "failed due to an error" /* LRM_OP_ERROR */
+ "failed due to an error" /* LRM_OP_ERROR */
};
+static const char * rc_msg[] = {
+ "unknown error",
+ "no ra",
+ "ok",
+ "unknown error",
+ "invalid parameter",
+ "unimplement feature",
+ "insufficient priority",
+ "not installed",
+ "not configured",
+ "not running",
+ "running master",
+ "failed master",
+ "invalid rc",
+ /* For status command only */
+ "daemon dead1",
+ "daemon dead2",
+ "daemon stopped",
+ "status unknow"
+};
+
+
static gboolean QUIT_GETOPT = FALSE;
static lrmadmin_cmd_t lrmadmin_cmd = NULL_OP;
static gboolean ASYN_OPS = FALSE;
@@ -542,7 +565,7 @@
printf("operation status:%s\n", status_msg[LRM_OP_DONE]);
} else {
printf("operation status:%s\n", status_msg[(op->op_status
- - LRM_OP_DONE) % DIMOF(status_msg)]);
+ - LRM_OP_PENDING) % DIMOF(status_msg)]);
}
printf("op_status: %d\n", op->op_status);
printf("return code: %d\n", op->rc);
@@ -841,8 +864,17 @@
param_gstr = g_string_new("");
g_hash_table_foreach(op->params, ocf_params_hash_to_str, ¶m_gstr);
- printf(" operation %s [call_id=%d], its parameters: %s\n"
- , nullcheck(op->op_type), op->call_id, param_gstr->str);
+ printf(" operation %s [call_id=%d]:\n"
+ " start_delay=%d, interval=%d, timeout=%d, app_name=%s\n"
+ " rc=%d (%s), op_status=%d (%s)\n"
+ " parameters: %s\n"
+ , nullcheck(op->op_type), op->call_id
+ , op->start_delay, op->interval, op->timeout
+ , nullcheck(op->app_name), op->rc
+ , rc_msg[(op->rc-EXECRA_EXEC_UNKNOWN_ERROR) % DIMOF(rc_msg)]
+ , op->op_status
+ , status_msg[(op->op_status-LRM_OP_PENDING) % DIMOF(status_msg)]
+ , param_gstr->str);
g_string_free(param_gstr, TRUE);
lrm_free_op(op);
}
@@ -950,6 +982,9 @@
/*
* $Log: lrmadmin.c,v $
+ * Revision 1.39 2006/06/22 10:33:22 sunjd
+ * (bug1301): make a better output
+ *
* Revision 1.38 2006/06/22 05:56:31 sunjd
* (bug1301): add the capacity of get_cur_state; polish on memory free
*
------------------------------
Message: 4
Date: Thu, 22 Jun 2006 04:46:10 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
lrm.c
Log Message:
Update (1.196) yesterday exposed some declarations in the middle of code,
causing compile-time errors.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -3 -r1.196 -r1.197
--- lrm.c 21 Jun 2006 14:44:31 -0000 1.196
+++ lrm.c 22 Jun 2006 10:46:10 -0000 1.197
@@ -330,6 +330,9 @@
crm_data_t *xml_op = NULL;
char *op_id = NULL;
const char *caller_version = NULL;
+ char *digest = NULL;
+ crm_data_t *args_xml = NULL;
+ crm_data_t *args_parent = NULL;
CRM_DEV_ASSERT(op != NULL);
if(crm_assert_failed) {
@@ -502,9 +505,7 @@
* resource's parameters have changed and we should force
* a restart
*/
- char *digest = NULL;
- crm_data_t *args_xml = NULL;
- crm_data_t *args_parent = NULL;
+ args_parent = NULL;
#if CRM_DEPRECATED_SINCE_2_0_4
if(compare_version("1.0.4", caller_version) > 0) {
args_parent = xml_op;
------------------------------
_______________________________________________
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 31, Issue 81
********************************************
