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: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Wed, 5 Jul 2006 08:22:59 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
regression.sh
Log Message:
Regression tests
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- regression.sh 3 Jul 2006 11:47:38 -0000 1.90
+++ regression.sh 5 Jul 2006 14:22:59 -0000 1.91
@@ -212,6 +212,7 @@
do_test 797 "Bugzilla 797"
do_test 829 "Bugzilla 829"
do_test 994 "Bugzilla 994"
+do_test 1360 "OSDL #1360 - Clone stickiness"
do_test unrunnable-1 "Unrunnable"
echo ""
------------------------------
Message: 2
Date: Wed, 5 Jul 2006 08:23:00 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine/testcases
Added Files:
1360.dot 1360.exp 1360.xml
Log Message:
Regression tests
------------------------------
Message: 3
Date: Wed, 5 Jul 2006 09:11:17 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
callbacks.c
Log Message:
Fix remote replies
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- callbacks.c 4 Jul 2006 14:07:42 -0000 1.127
+++ callbacks.c 5 Jul 2006 15:11:16 -0000 1.128
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.127 2006/07/04 14:07:42 andrew Exp $ */
+/* $Id: callbacks.c,v 1.128 2006/07/05 15:11:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -804,7 +804,7 @@
static gboolean
parse_peer_options(
- cib_client_t *cib_client, int call_type, HA_Message *request,
+ int call_type, HA_Message *request,
gboolean *local_notify, gboolean *needs_reply, gboolean *process,
gboolean *needs_forward)
{
const char *op = cl_get_string(request, F_CIB_OPERATION);
@@ -876,11 +876,12 @@
static void
-forward_request(HA_Message *request, cib_client_t *cib_client,
- int call_options, const char *host, const char *op)
+forward_request(HA_Message *request, cib_client_t *cib_client, int
call_options)
{
HA_Message *forward_msg = NULL;
cl_mem_stats_t saved_stats;
+ const char *op = cl_get_string(request, F_CIB_OPERATION);
+ const char *host = cl_get_string(request, F_CIB_HOST);
crm_save_mem_stats(__PRETTY_FUNCTION__, &saved_stats);
forward_msg = cib_msg_copy(request, TRUE);
@@ -922,7 +923,7 @@
CRM_ASSERT(msg != NULL);
crm_save_mem_stats(__PRETTY_FUNCTION__, &saved_stats);
- reply_copy = cib_msg_copy(msg, FALSE);
+ reply_copy = cib_msg_copy(msg, TRUE);
if(broadcast) {
/* this (successful) call modified the CIB _and_ the
@@ -952,49 +953,13 @@
add_message_xml(reply_copy, F_CIB_UPDATE_DIFF, result_diff);
crm_log_message(LOG_DEBUG_3, reply_copy);
-#if 1
send_ha_message(hb_conn, reply_copy, NULL, TRUE);
-#else
- /* code to verify the messaging layer leaks */
- CRM_ASSERT(hb_conn->llc_ops->sendclustermsg(hb_conn,
reply_copy) == HA_OK);
- {
- IPC_Channel *ipc = NULL;
- IPC_Queue *send_q = NULL;
- ipc = hb_conn->llc_ops->ipcchan(hb_conn);
- if(ipc != NULL) {
- ipc->ops->waitout(ipc);
- send_q = ipc->send_queue;
- }
- if(send_q != NULL) {
- CRM_CHECK(send_q->current_qlen == 0 ,
- crm_err("Send Queue len: %d",
(int)send_q->current_qlen));
- }
- }
-#endif
} else if(originator != NULL) {
/* send reply via HA to originating node */
crm_debug_2("Sending request result to originator only");
ha_msg_add(reply_copy, F_CIB_ISREPLY, originator);
-#if 1
send_ha_message(hb_conn, reply_copy, originator, FALSE);
-#else
- /* code to verify the messaging layer leaks */
- CRM_ASSERT(hb_conn->llc_ops->send_ordered_nodemsg(hb_conn,
reply_copy) == HA_OK);
- {
- IPC_Channel *ipc = NULL;
- IPC_Queue *send_q = NULL;
- ipc = hb_conn->llc_ops->ipcchan(hb_conn);
- if(ipc != NULL) {
- ipc->ops->waitout(ipc);
- send_q = ipc->send_queue;
- }
- if(send_q != NULL) {
- CRM_CHECK(send_q->current_qlen == 0 ,
- crm_err("Send Queue len: %d",
(int)send_q->current_qlen));
- }
- }
-#endif
}
crm_msg_del(reply_copy);
@@ -1063,8 +1028,8 @@
parse_local_options(cib_client, call_type, call_options, host,
op,
&local_notify, &needs_reply, &process,
&needs_forward);
- } else if(parse_peer_options(cib_client, call_type, request,
- &local_notify, &needs_reply, &process,
&needs_forward) == FALSE) {
+ } else if(parse_peer_options(call_type, request, &local_notify,
+ &needs_reply, &process, &needs_forward) ==
FALSE) {
return;
}
crm_debug_3("Finished determining processing actions");
@@ -1075,7 +1040,7 @@
}
if(needs_forward && stand_alone == FALSE) {
- forward_request(request, cib_client, call_options, host, op);
+ forward_request(request, cib_client, call_options);
return;
}
@@ -1139,27 +1104,21 @@
send_peer_reply(request, result_diff, originator, TRUE);
} else if((call_options & cib_discard_reply) == 0) {
- gboolean should_send = TRUE;
CRM_DEV_ASSERT(cib_server_ops[call_type].modifies_cib == FALSE
|| result_diff != NULL || rc != cib_ok);
+ crm_debug("Directed reply to %s", originator);
- if(call_options & cib_inhibit_bcast ) {
- should_send = FALSE;
+ if(call_options & cib_inhibit_bcast) {
crm_debug("Request not broadcast: inhibited");
}
if(cib_server_ops[call_type].modifies_cib == FALSE) {
- should_send = FALSE;
crm_debug_2("Request not broadcast: R/O call");
}
if(rc != cib_ok) {
- should_send = FALSE;
crm_warn("Request not broadcast: call failed: %s",
cib_error2string(rc));
}
- if(from_peer == FALSE) {
- should_send = FALSE;
- }
- if(should_send) {
+ if(from_peer) {
send_peer_reply(op_reply, result_diff, originator,
FALSE);
}
}
------------------------------
Message: 4
Date: Wed, 5 Jul 2006 09:21:01 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
crmadmin.c
Log Message:
CRM version details
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crmadmin.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- crmadmin.c 7 Jun 2006 12:46:57 -0000 1.73
+++ crmadmin.c 5 Jul 2006 15:21:00 -0000 1.74
@@ -1,4 +1,4 @@
-/* $Id: crmadmin.c,v 1.73 2006/06/07 12:46:57 andrew Exp $ */
+/* $Id: crmadmin.c,v 1.74 2006/07/05 15:21:00 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -105,7 +105,7 @@
const char *sys_to = NULL;
const char *crm_system_name = NULL;
-#define OPTARGS "V?K:S:HE:Dd:i:RNqt:B"
+#define OPTARGS "V?K:S:HE:Dd:i:RNqt:Bv"
int
main(int argc, char **argv)
@@ -138,6 +138,7 @@
{"dc_lookup", 0, 0, 'D'},
{"nodes", 0, 0, 'N'},
{"option", 1, 0, 'o'},
+ {"version", 0, 0, 'v'},
{0, 0, 0, 0}
};
@@ -192,7 +193,12 @@
digit_optind = this_option_optind;
printf ("option %c\n", c);
*/
-
+
+ case 'v':
+ fprintf(stdout, "CRM Version %s (CIB feature
set %s)\n",
+ CRM_FEATURE_SET, CIB_FEATURE_SET);
+ exit(0);
+ break;
case 'V':
BE_VERBOSE = TRUE;
admin_verbose = XML_BOOLEAN_TRUE;
@@ -685,10 +691,11 @@
stream = exit_status ? stderr : stdout;
- fprintf(stream, "usage: %s [-?vs] [command] [command args]\n", cmd);
+ fprintf(stream, "usage: %s [-?Vs] [command] [command args]\n", cmd);
fprintf(stream, "Options\n");
fprintf(stream, "\t--%s (-%c)\t: this help message\n", "help", '?');
+ fprintf(stream, "\t--%s (-%c)\t: version details\n", "version", 'v');
fprintf(stream, "\t--%s (-%c)\t: "
"turn on debug info. additional instances increase verbosity\n",
"verbose", 'V');
------------------------------
_______________________________________________
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 32, Issue 18
********************************************
