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: heartbeat by lars 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: lib by alan from (linux-ha-cvs@lists.linux-ha.org) 4. Linux-HA CVS: tools by lars from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Mon, 29 May 2006 07:26:26 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by lars from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : lars Host : Project : linux-ha Module : heartbeat Dir : linux-ha/heartbeat/lib Modified Files: ha_propagate.in Log Message: Propagate the status of the heartbeat service too (Novell bugzilla #179233). =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/ha_propagate.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ha_propagate.in 16 May 2006 16:30:54 -0000 1.2 +++ ha_propagate.in 29 May 2006 13:26:26 -0000 1.3 @@ -39,3 +39,6 @@ for i, v in enumerate(nodes): print "Propagating HA configuration files to node " + v + "." res = os.system("scp " + cfgfile + " " + authfile + " root@" + v + ":" + cfgdir) + print "Setting HA startup configuration on node " + v + "." + res = os.system("ssh " + " root@" + v + " chkconfig `chkconfig heartbeat`") + ------------------------------ Message: 2 Date: Mon, 29 May 2006 07:29:32 -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/crmd Modified Files: join_dc.c Log Message: If the DC has the same version of the CIB as someone else, prefer the DC's copy =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- join_dc.c 22 May 2006 11:26:25 -0000 1.90 +++ join_dc.c 29 May 2006 13:29:31 -0000 1.91 @@ -252,6 +252,7 @@ { crm_data_t *generation = NULL; + int cmp = 0; int join_id = -1; gboolean ack_nack_bool = TRUE; const char *ack_nack = CRMD_JOINSTATE_MEMBER; @@ -267,9 +268,11 @@ generation = join_ack->xml; ha_msg_value_int(join_ack->msg, F_CRM_JOIN_ID, &join_id); - crm_log_xml_debug_2(max_generation_xml, "Max generation"); - crm_log_xml_debug_2(generation, "Their generation"); + if(max_generation_xml != NULL && generation != NULL) { + cmp = cib_compare_generation(max_generation_xml, generation); + } + if(join_node == NULL) { crm_err("Node %s is not a member", join_from); ack_nack_bool = FALSE; @@ -288,17 +291,23 @@ max_generation_xml = copy_xml(generation); max_generation_from = crm_strdup(join_from); - } else if(cib_compare_generation(max_generation_xml, generation) < 0) { + } else if(cmp < 0 + || (cmp == 0 && safe_str_eq(join_from, fsa_our_uname))) { crm_debug("%s has a better generation number than" " the current max %s", join_from, max_generation_from); + if(max_generation_xml) { + crm_log_xml_debug(max_generation_xml, "Max generation"); + } + crm_log_xml_debug(generation, "Their generation"); + crm_free(max_generation_from); free_xml(max_generation_xml); max_generation_from = crm_strdup(join_from); max_generation_xml = copy_xml(join_ack->xml); } - + if(ack_nack_bool == FALSE) { /* NACK this client */ ack_nack = CRMD_STATE_INACTIVE; ------------------------------ Message: 3 Date: Mon, 29 May 2006 07:38:07 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org 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/plugins/quorum Modified Files: majority.c twonodes.c Log Message: Explicitly initialize two variables to make things a little clearer. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/quorum/majority.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- majority.c 16 Dec 2005 02:12:00 -0000 1.1 +++ majority.c 29 May 2006 13:38:07 -0000 1.2 @@ -51,7 +51,7 @@ static PILPlugin* OurPlugin; static PILInterface* OurInterface; static struct hb_media_imports* OurImports; -static void* interfprivate; +static void* interfprivate = NULL; #define LOG PluginImports->log #define MALLOC PluginImports->alloc =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/quorum/twonodes.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- twonodes.c 29 May 2006 08:55:24 -0000 1.1 +++ twonodes.c 29 May 2006 13:38:07 -0000 1.2 @@ -43,7 +43,7 @@ static PILPlugin* OurPlugin; static PILInterface* OurInterface; static struct hb_media_imports* OurImports; -static void* interfprivate; +static void* interfprivate = NULL; #define LOG PluginImports->log #define MALLOC PluginImports->alloc ------------------------------ Message: 4 Date: Mon, 29 May 2006 08:21:37 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: tools by lars from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : lars Host : Project : linux-ha Module : tools Dir : linux-ha/tools Modified Files: cl_status.c Log Message: CID #44: Deadcode removal. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/tools/cl_status.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- cl_status.c 28 May 2006 01:00:58 -0000 1.22 +++ cl_status.c 29 May 2006 14:21:36 -0000 1.23 @@ -472,7 +472,6 @@ nodeweight(ll_cluster_t *hb, int argc, char ** argv, const char * optstr) { int weight; - int ret = UNKNOWN_ERROR; if ( general_simple_opt_deal(argc, argv, optstr) < 0 ) { /* There are option errors */ @@ -488,7 +487,7 @@ argv[optind+1]); weight = hb->llc_ops->node_weight(hb, argv[optind+1]); if ( weight == -1 ) { - fprintf(stderr, "Error. May be due to incorrect node name\n"); + fprintf(stderr, "Error. Maybe due to incorrect node name.\n"); return PARAMETER_ERROR; } if (FOR_HUMAN_READ == TRUE) { @@ -497,13 +496,7 @@ printf("%d\n", weight); } - if (weight != -1) { - ret = OK; - } else { - ret = NORMAL_FAIL; - } - - return ret; + return OK; } /* Map string std_output to return value ? * Active ------------------------------ _______________________________________________ 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 30, Issue 97 ********************************************