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: crm by andrew from 
      ([email protected])
   2. Linux-HA CVS: lib by alan from  ([email protected])


----------------------------------------------------------------------

Message: 1
Date: Tue, 17 Jan 2006 06:24:24 -0700 (MST)
From: [email protected]
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/crmd


Modified Files:
        messages.c utils.c fsa.c 


Log Message:


Logging

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- messages.c  16 Jan 2006 09:19:53 -0000      1.141
+++ messages.c  17 Jan 2006 13:24:24 -0000      1.142
@@ -238,6 +238,7 @@
        }
 
        if(fsa_source) {
+               crm_debug_3("Triggering FSA: %s", __FUNCTION__);
                G_main_set_trigger(fsa_source);
        }
        return last_data_id;
@@ -723,6 +724,7 @@
 
                crm_debug_3("Updated client list with %s", crm_str(table_key));
                
+               crm_debug_3("Triggering FSA: %s", __FUNCTION__);
                G_main_set_trigger(fsa_source);
 
        } else {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/utils.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- utils.c     12 Jan 2006 16:13:05 -0000      1.83
+++ utils.c     17 Jan 2006 13:24:24 -0000      1.84
@@ -166,6 +166,8 @@
        } else if(timer->fsa_input != I_NULL) {
                register_fsa_input(C_TIMER_POPPED, timer->fsa_input, NULL);
        }
+       
+       crm_debug_3("Triggering FSA: %s", __FUNCTION__);
        G_main_set_trigger(fsa_source);
        
        return TRUE;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -3 -r1.133 -r1.134
--- fsa.c       16 Jan 2006 11:08:25 -0000      1.133
+++ fsa.c       17 Jan 2006 13:24:24 -0000      1.134
@@ -249,14 +249,6 @@
                                  fsa_state2string(fsa_state),
                                  fsa_cause2string(fsa_data->fsa_cause),
                                  fsa_data->origin);
-
-               } else if(fsa_actions == A_EXIT_0) {
-                       /* temporary error */
-                       crm_debug_2("Processing %s: [ state=%s cause=%s 
origin=%s ]",
-                                 fsa_input2string(fsa_data->fsa_input),
-                                 fsa_state2string(fsa_state),
-                                 fsa_cause2string(fsa_data->fsa_cause),
-                                 fsa_data->origin);
                }
                
 #ifdef FSA_TRACE




------------------------------

Message: 2
Date: Tue, 17 Jan 2006 10:44:40 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : alan
Host    : 
Project : linux-ha
Module  : lib

Dir     : linux-ha/lib/hbclient


Modified Files:
        client_lib.c 


Log Message:
Fixed a harmless type error discovered by Andrew Beekhof.
It only works because HA_FAIL == 0.  But, because it does == 0, there is
no run time "harm" done.

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/hbclient/client_lib.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- client_lib.c        21 Dec 2005 02:34:32 -0000      1.34
+++ client_lib.c        17 Jan 2006 17:44:39 -0000      1.35
@@ -1,4 +1,4 @@
-/* $Id: client_lib.c,v 1.34 2005/12/21 02:34:32 gshi Exp $ */
+/* $Id: client_lib.c,v 1.35 2006/01/17 17:44:39 alan Exp $ */
 /* 
  * client_lib: heartbeat API client side code
  *
@@ -2265,7 +2265,7 @@
 
        if (!ISOURS(llc)) {
                ha_api_log(LOG_ERR, "read_msg_w_callbacks: bad cinfo");
-               return HA_FAIL;
+               return NULL;
        }
        pi = (llc_private_t*) llc->ll_cluster_private;
 




------------------------------

_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs


End of Linux-ha-cvs Digest, Vol 26, Issue 41
********************************************

Reply via email to