Return-Path: 
 <dev-return-68625-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 82790 invoked from network); 2 May 2006 23:58:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 May 2006 23:58:47 -0000
Received: (qmail 12007 invoked by uid 500); 2 May 2006 23:58:42 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 11957 invoked by uid 500); 2 May 2006 23:58:42 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 11936 invoked by uid 500); 2 May 2006 23:58:42 -0000
Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org
Received: (qmail 11933 invoked by uid 99); 2 May 2006 23:58:42 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 May 2006 16:58:42 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 02 May 2006 16:58:41 -0700
Received: (qmail 82644 invoked by uid 65534); 2 May 2006 23:58:21 -0000
Message-ID: <20060502235821.82643.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r399095 -
 /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Date: Tue, 02 May 2006 23:58:20 -0000
To: tomcat-dev@jakarta.apache.org
From: fhanik@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: fhanik
Date: Tue May  2 16:58:18 2006
New Revision: 399095

URL: http://svn.apache.org/viewcvs?rev=399095&view=rev
Log:
implemented the heart beat, the failure detector should be ready to test

Modified:
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=399095&r1=399094&r2=399095&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java Tue May  2 16:58:18 2006
@@ -30,6 +30,7 @@
 import java.util.HashMap;
 import org.apache.catalina.tribes.membership.Membership;
 import org.apache.catalina.tribes.membership.MemberImpl;
+import java.util.Iterator;
 
 /**
  * <p>Title: A perfect failure detector </p>
@@ -137,9 +138,29 @@
         return super.getLocalMember(incAlive);
     }
     
-    public void heartbeat() {
-        //todo, implement an expiration of members that we deemed alive
-        //check them again and act accordingly
+    public synchronized void heartbeat() {
+        if ( membership == null ) setupMembership();
+        //update all alive times
+        Member[] members = super.getMembers();
+        for ( int i=0; i<members.length; i++ ) {
+            if ( membership.memberAlive((MemberImpl)members[i]) ) {
+                log.warn("Member added, even though we werent notified:"+members[i]);
+                super.memberAdded(members[i]);
+            }//end if
+        }//for
+        
+        //check suspect members if they are still alive,
+        //if not, simply issue the memberDisappeared message
+        
+        for (Iterator i = suspect.keySet().iterator(); i.hasNext(); ) {
+            MemberImpl m = (MemberImpl)i.next();
+            if (!memberAlive(m)) {
+                membership.removeMember(m);
+                super.memberDisappeared(m);
+                suspect.remove(m);
+            }//end if
+        }
+        
         super.heartbeat();
     }
     



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org