Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 88767 invoked from network); 13 Sep 2010 13:41:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 13 Sep 2010 13:41:04 -0000 Received: (qmail 48028 invoked by uid 500); 13 Sep 2010 13:41:04 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 47882 invoked by uid 500); 13 Sep 2010 13:41:02 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 47873 invoked by uid 99); 13 Sep 2010 13:41:01 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Sep 2010 13:41:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Sep 2010 13:40:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E00E323889ED; Mon, 13 Sep 2010 13:40:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r996527 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/gms/Gossiper.java Date: Mon, 13 Sep 2010 13:40:22 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100913134022.E00E323889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Mon Sep 13 13:40:22 2010 New Revision: 996527 URL: http://svn.apache.org/viewvc?rev=996527&view=rev Log: add post-removeEndPoint "break" to avoid scary CME. functionality is unaffected (remainder of states will still not be processed until next round). patch by jbellis Modified: cassandra/branches/cassandra-0.6/CHANGES.txt cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java Modified: cassandra/branches/cassandra-0.6/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=996527&r1=996526&r2=996527&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.6/CHANGES.txt Mon Sep 13 13:40:22 2010 @@ -13,6 +13,9 @@ * make sure to close CommitLog files after replay (CASSANDRA-1348) * bulletproof sstable deletion process (CASSANDRA-1458) * Switch system.LocationInfo CF from UTF8Type to BytesType (CASSANDRA-1492) + * avoid ConcurrentModificationException in Gossiper after removing + a dead StorageProxy client, decommissioned node, or partially + bootstrapped one (CASSANDRA-1494) 0.6.5 Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java?rev=996527&r1=996526&r2=996527&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java Mon Sep 13 13:40:22 2010 @@ -405,6 +405,7 @@ public class Gossiper implements IFailur { logger_.info("FatClient " + endpoint + " has been silent for " + FatClientTimeout_ + "ms, removing from gossip"); removeEndPoint(endpoint); + break; // avoid CME. this is fixed better in 0.7 } }