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: lib by zhenh from  ([email protected])
   2. Linux-HA CVS: heartbeat by gshi from 
      ([email protected])


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

Message: 1
Date: Sun, 23 Jul 2006 20:51:07 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by zhenh from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

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

Dir     : linux-ha/lib/plugins/lrm


Modified Files:
        raexecocf.c 


Log Message:
fix a bug. stat need full path as parameter
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexecocf.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- raexecocf.c 10 Jul 2006 10:07:04 -0000      1.58
+++ raexecocf.c 24 Jul 2006 02:51:06 -0000      1.59
@@ -434,8 +434,9 @@
                                free(namelist[file_num]);
                                continue;
                        }
-
-                       stat(namelist[file_num]->d_name, &prop);
+                       snprintf(tmp_buffer,FILENAME_MAX,"%s/%s",
+                                class_path, namelist[file_num]->d_name);
+                       stat(tmp_buffer, &prop);
                        if (!S_ISDIR(prop.st_mode)) {
                                free(namelist[file_num]);
                                continue;




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

Message: 2
Date: Mon, 24 Jul 2006 10:54:27 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by gshi from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : gshi
Host    : 
Project : linux-ha
Module  : heartbeat

Dir     : linux-ha/heartbeat


Modified Files:
        hb_uuid.c 


Log Message:
fix bug 1226 hostcache and delnodecache files should not be authoritative if 
autojoin is disabled 

these two files are not read in if autojoin is disabled (but they will be 
updated)



===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/hb_uuid.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- hb_uuid.c   13 Jun 2006 04:57:33 -0000      1.26
+++ hb_uuid.c   24 Jul 2006 16:54:26 -0000      1.27
@@ -554,7 +554,7 @@
        const char *    finalname =     HOSTUUIDCACHEFILE;
        FILE *          f;
 
-       if (!nodecache_read_yet) {
+       if (!nodecache_read_yet && cfg->rtjoinconfig != HB_JOIN_NONE) {
                read_node_uuid_file(cfg);
        }
        (void)unlink(tmpname);
@@ -669,7 +669,7 @@
        GList*          list = NULL;
        const struct node_info* hip;
        
-       if (!delcache_read_yet) {
+       if (!delcache_read_yet && cfg->rtjoinconfig != HB_JOIN_NONE) {
                read_delnode_file(cfg);
        }
        (void)unlink(tmpname);
@@ -776,7 +776,7 @@
 read_cache_file(struct sys_config* cfg)
 {
        
-       if (DoManageResources){
+       if (DoManageResources || cfg->rtjoinconfig == HB_JOIN_NONE){
                return HA_OK;
        }
        if (read_node_uuid_file(cfg) != HA_OK){




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

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


End of Linux-ha-cvs Digest, Vol 32, Issue 64
********************************************

Reply via email to