You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2010/06/10 19:05:55 UTC

svn commit: r953394 - in /cassandra/trunk: ./ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/commitlog/ src/java/org/apache/cassandra/gms/ src/java/org/apache/cassandra/net/ src/java/org/apache/cassandra/service...

Author: gdusbabek
Date: Thu Jun 10 17:05:54 2010
New Revision: 953394

URL: http://svn.apache.org/viewvc?rev=953394&view=rev
Log:
merge from 0.6

Added:
    cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
      - copied, changed from r953378, cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
    cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
      - copied, changed from r953378, cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
    cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
      - copied, changed from r953378, cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
Modified:
    cassandra/trunk/   (props changed)
    cassandra/trunk/CHANGES.txt
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java   (props changed)
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java   (props changed)
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java   (props changed)
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java   (props changed)
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java   (props changed)
    cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
    cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
    cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
    cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java

Propchange: cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 17:05:54 2010
@@ -1,4 +1,4 @@
-/cassandra/branches/cassandra-0.6:922689-952415
+/cassandra/branches/cassandra-0.6:922689-953378
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
 /incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5:888872-915439

Modified: cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=953394&r1=953393&r2=953394&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Thu Jun 10 17:05:54 2010
@@ -40,6 +40,9 @@ dev
    (CASSANDRA-1146)
  * use generation time to resolve node token reassignment disagreements
    (CASSANDRA-1118)
+ * restructure the startup ordering of Gossiper and MessageService to avoid
+   timing anomalies (CASSANDRA-1160)
+ * detect incomplete commit log hearders (CASSANDRA-1119)
 
 
 0.6.2

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 17:05:54 2010
@@ -1,4 +1,4 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-952415
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-953378
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
 /incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Cassandra.java:888872-903502

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 17:05:54 2010
@@ -1,4 +1,4 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-952415
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-953378
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
 /incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Column.java:888872-903502

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 17:05:54 2010
@@ -1,4 +1,4 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-952415
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-953378
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
 /incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:888872-903502

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 17:05:54 2010
@@ -1,4 +1,4 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-952415
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-953378
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
 /incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:888872-903502

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 17:05:54 2010
@@ -1,4 +1,4 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-952415
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-953378
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
 /incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-834239,834349-834350
 /incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:888872-903502

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java?rev=953394&r1=953393&r2=953394&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java Thu Jun 10 17:05:54 2010
@@ -18,35 +18,29 @@
 
 package org.apache.cassandra.db.commitlog;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
 import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.concurrent.StageManager;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Config;
-import org.apache.cassandra.config.KSMetaData;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.RowMutation;
 import org.apache.cassandra.db.Table;
-import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import org.apache.cassandra.io.DeletionService;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import org.apache.cassandra.io.util.FileUtils;
-import org.apache.cassandra.utils.Pair;
 import org.apache.cassandra.utils.WrappedRunnable;
-import org.apache.cassandra.concurrent.StageManager;
-
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.zip.Checksum;
-import java.util.zip.CRC32;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
 
 /*
  * Commit Log tracks every write operation into the system. The aim
@@ -188,7 +182,18 @@ public class CommitLog
         {
             int bufferSize = (int)Math.min(file.length(), 32 * 1024 * 1024);
             BufferedRandomAccessFile reader = new BufferedRandomAccessFile(file.getAbsolutePath(), "r", bufferSize);
-            final CommitLogHeader clHeader = CommitLogHeader.readCommitLogHeader(reader);
+
+            final CommitLogHeader clHeader;
+            try
+            {
+                clHeader = CommitLogHeader.readCommitLogHeader(reader);
+            }
+            catch (EOFException eofe)
+            {
+                logger.info("Attempted to recover an incomplete CommitLogHeader.  Everything is ok, don't panic.");
+                continue;
+            }
+
             /* seek to the lowest position where any CF has non-flushed data */
             int lowPos = CommitLogHeader.getLowestPosition(clHeader);
             if (lowPos == 0)

Copied: cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java (from r953378, cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java?p2=cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java&p1=cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java&r1=953378&r2=953394&rev=953394&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java Thu Jun 10 17:05:54 2010
@@ -2,7 +2,8 @@ package org.apache.cassandra.gms;
 
 import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.Message;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -12,13 +13,13 @@ import java.util.Map;
 
 public class GossipDigestAck2VerbHandler implements IVerbHandler
 {
-    private static Logger logger_ = Logger.getLogger(GossipDigestAck2VerbHandler.class);
+    private static Logger logger_ = LoggerFactory.getLogger(GossipDigestAck2VerbHandler.class);
 
     public void doVerb(Message message)
     {
         InetAddress from = message.getFrom();
         if (logger_.isTraceEnabled())
-            logger_.trace("Received a GossipDigestAck2Message from " + from);
+            logger_.trace("Received a GossipDigestAck2Message from {}", from);
 
         byte[] bytes = message.getMessageBody();
         DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -31,7 +32,7 @@ public class GossipDigestAck2VerbHandler
         {
             throw new RuntimeException(e);
         }
-        Map<InetAddress, EndPointState> remoteEpStateMap = gDigestAck2Message.getEndPointStateMap();
+        Map<InetAddress, EndpointState> remoteEpStateMap = gDigestAck2Message.getEndpointStateMap();
         /* Notify the Failure Detector */
         Gossiper.instance.notifyFailureDetector(remoteEpStateMap);
         Gossiper.instance.applyStateLocally(remoteEpStateMap);

Copied: cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java (from r953378, cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java?p2=cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java&p1=cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java&r1=953378&r2=953394&rev=953394&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java Thu Jun 10 17:05:54 2010
@@ -3,7 +3,8 @@ package org.apache.cassandra.gms;
 import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.Message;
 import org.apache.cassandra.net.MessagingService;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -15,13 +16,13 @@ import java.util.Map;
 
 public class GossipDigestAckVerbHandler implements IVerbHandler
 {
-    private static Logger logger_ = Logger.getLogger(GossipDigestAckVerbHandler.class);
+    private static Logger logger_ = LoggerFactory.getLogger(GossipDigestAckVerbHandler.class);
 
     public void doVerb(Message message)
     {
         InetAddress from = message.getFrom();
         if (logger_.isTraceEnabled())
-            logger_.trace("Received a GossipDigestAckMessage from " + from);
+            logger_.trace("Received a GossipDigestAckMessage from {}", from);
 
         byte[] bytes = message.getMessageBody();
         DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -30,7 +31,7 @@ public class GossipDigestAckVerbHandler 
         {
             GossipDigestAckMessage gDigestAckMessage = GossipDigestAckMessage.serializer().deserialize(dis);
             List<GossipDigest> gDigestList = gDigestAckMessage.getGossipDigestList();
-            Map<InetAddress, EndPointState> epStateMap = gDigestAckMessage.getEndPointStateMap();
+            Map<InetAddress, EndpointState> epStateMap = gDigestAckMessage.getEndpointStateMap();
 
             if ( epStateMap.size() > 0 )
             {
@@ -40,11 +41,11 @@ public class GossipDigestAckVerbHandler 
             }
 
             /* Get the state required to send to this gossipee - construct GossipDigestAck2Message */
-            Map<InetAddress, EndPointState> deltaEpStateMap = new HashMap<InetAddress, EndPointState>();
+            Map<InetAddress, EndpointState> deltaEpStateMap = new HashMap<InetAddress, EndpointState>();
             for( GossipDigest gDigest : gDigestList )
             {
-                InetAddress addr = gDigest.getEndPoint();
-                EndPointState localEpStatePtr = Gossiper.instance.getStateForVersionBiggerThan(addr, gDigest.getMaxVersion());
+                InetAddress addr = gDigest.getEndpoint();
+                EndpointState localEpStatePtr = Gossiper.instance.getStateForVersionBiggerThan(addr, gDigest.getMaxVersion());
                 if ( localEpStatePtr != null )
                     deltaEpStateMap.put(addr, localEpStatePtr);
             }
@@ -52,7 +53,7 @@ public class GossipDigestAckVerbHandler 
             GossipDigestAck2Message gDigestAck2 = new GossipDigestAck2Message(deltaEpStateMap);
             Message gDigestAck2Message = Gossiper.instance.makeGossipDigestAck2Message(gDigestAck2);
             if (logger_.isTraceEnabled())
-                logger_.trace("Sending a GossipDigestAck2Message to " + from);
+                logger_.trace("Sending a GossipDigestAck2Message to {}", from);
             MessagingService.instance.sendOneWay(gDigestAck2Message, from);
         }
         catch ( IOException e )

Copied: cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java (from r953378, cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java?p2=cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java&p1=cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java&r1=953378&r2=953394&rev=953394&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java Thu Jun 10 17:05:54 2010
@@ -4,7 +4,8 @@ import org.apache.cassandra.config.Datab
 import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.Message;
 import org.apache.cassandra.net.MessagingService;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -14,13 +15,13 @@ import java.util.*;
 
 public class GossipDigestSynVerbHandler implements IVerbHandler
 {
-    private static Logger logger_ = Logger.getLogger( GossipDigestSynVerbHandler.class);
+    private static Logger logger_ = LoggerFactory.getLogger( GossipDigestSynVerbHandler.class);
 
     public void doVerb(Message message)
     {
         InetAddress from = message.getFrom();
         if (logger_.isTraceEnabled())
-            logger_.trace("Received a GossipDigestSynMessage from " + from);
+            logger_.trace("Received a GossipDigestSynMessage from {}", from);
 
         byte[] bytes = message.getMessageBody();
         DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -42,13 +43,13 @@ public class GossipDigestSynVerbHandler 
             doSort(gDigestList);
 
             List<GossipDigest> deltaGossipDigestList = new ArrayList<GossipDigest>();
-            Map<InetAddress, EndPointState> deltaEpStateMap = new HashMap<InetAddress, EndPointState>();
+            Map<InetAddress, EndpointState> deltaEpStateMap = new HashMap<InetAddress, EndpointState>();
             Gossiper.instance.examineGossiper(gDigestList, deltaGossipDigestList, deltaEpStateMap);
 
             GossipDigestAckMessage gDigestAck = new GossipDigestAckMessage(deltaGossipDigestList, deltaEpStateMap);
             Message gDigestAckMessage = Gossiper.instance.makeGossipDigestAckMessage(gDigestAck);
             if (logger_.isTraceEnabled())
-                logger_.trace("Sending a GossipDigestAckMessage to " + from);
+                logger_.trace("Sending a GossipDigestAckMessage to {}", from);
             MessagingService.instance.sendOneWay(gDigestAckMessage, from);
         }
         catch (IOException e)
@@ -70,19 +71,19 @@ public class GossipDigestSynVerbHandler 
         Map<InetAddress, GossipDigest> epToDigestMap = new HashMap<InetAddress, GossipDigest>();
         for ( GossipDigest gDigest : gDigestList )
         {
-            epToDigestMap.put(gDigest.getEndPoint(), gDigest);
+            epToDigestMap.put(gDigest.getEndpoint(), gDigest);
         }
 
         /*
          * These digests have their maxVersion set to the difference of the version
-         * of the local EndPointState and the version found in the GossipDigest.
+         * of the local EndpointState and the version found in the GossipDigest.
         */
         List<GossipDigest> diffDigests = new ArrayList<GossipDigest>();
         for ( GossipDigest gDigest : gDigestList )
         {
-            InetAddress ep = gDigest.getEndPoint();
-            EndPointState epState = Gossiper.instance.getEndPointStateForEndPoint(ep);
-            int version = (epState != null) ? Gossiper.instance.getMaxEndPointStateVersion( epState ) : 0;
+            InetAddress ep = gDigest.getEndpoint();
+            EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(ep);
+            int version = (epState != null) ? Gossiper.instance.getMaxEndpointStateVersion( epState ) : 0;
             int diffVersion = Math.abs(version - gDigest.getMaxVersion() );
             diffDigests.add( new GossipDigest(ep, gDigest.getGeneration(), diffVersion) );
         }
@@ -96,7 +97,7 @@ public class GossipDigestSynVerbHandler 
         */
         for ( int i = size - 1; i >= 0; --i )
         {
-            gDigestList.add( epToDigestMap.get(diffDigests.get(i).getEndPoint()) );
+            gDigestList.add( epToDigestMap.get(diffDigests.get(i).getEndpoint()) );
         }
     }
 }

Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=953394&r1=953393&r2=953394&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Thu Jun 10 17:05:54 2010
@@ -28,7 +28,6 @@ import java.net.InetAddress;
 
 import org.apache.cassandra.concurrent.StageManager;
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.Message;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.StorageService;
@@ -55,6 +54,9 @@ public class Gossiper implements IFailur
         {
             try
             {
+                //wait on messaging service to start listening
+                MessagingService.instance.waitUntilListening();
+                
                 /* Update the local heartbeat counter. */
                 endpointStateMap_.get(localEndpoint_).getHeartBeatState().updateHeartBeat();
                 List<GossipDigest> gDigests = new ArrayList<GossipDigest>();
@@ -487,7 +489,7 @@ public class Gossiper implements IFailur
         EndpointState ep2 = getEndpointStateForEndpoint(addr2);
         assert ep1 != null && ep2 != null;
         return ep1.getHeartBeatState().getGeneration() - ep2.getHeartBeatState().getGeneration();
-    }
+    }    
 
     void notifyFailureDetector(List<GossipDigest> gDigests)
     {
@@ -865,170 +867,4 @@ public class Gossiper implements IFailur
         gossipTimer_.cancel();
         gossipTimer_ = new Timer(false); // makes the Gossiper reentrant.
     }
-
-    public static class GossipDigestSynVerbHandler implements IVerbHandler
-    {
-        private static Logger logger_ = LoggerFactory.getLogger( GossipDigestSynVerbHandler.class);
-
-        public void doVerb(Message message)
-        {
-            InetAddress from = message.getFrom();
-            if (logger_.isTraceEnabled())
-                logger_.trace("Received a GossipDigestSynMessage from {}", from);
-
-            byte[] bytes = message.getMessageBody();
-            DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
-
-            try
-            {
-                GossipDigestSynMessage gDigestMessage = GossipDigestSynMessage.serializer().deserialize(dis);
-                /* If the message is from a different cluster throw it away. */
-                if ( !gDigestMessage.clusterId_.equals(DatabaseDescriptor.getClusterName()) )
-                {
-                    logger_.warn("ClusterName mismatch from " + from + " " + gDigestMessage.clusterId_  + "!=" + DatabaseDescriptor.getClusterName());
-                    return;
-                }
-
-                List<GossipDigest> gDigestList = gDigestMessage.getGossipDigests();
-                /* Notify the Failure Detector */
-                Gossiper.instance.notifyFailureDetector(gDigestList);
-
-                doSort(gDigestList);
-
-                List<GossipDigest> deltaGossipDigestList = new ArrayList<GossipDigest>();
-                Map<InetAddress, EndpointState> deltaEpStateMap = new HashMap<InetAddress, EndpointState>();
-                Gossiper.instance.examineGossiper(gDigestList, deltaGossipDigestList, deltaEpStateMap);
-
-                GossipDigestAckMessage gDigestAck = new GossipDigestAckMessage(deltaGossipDigestList, deltaEpStateMap);
-                Message gDigestAckMessage = Gossiper.instance.makeGossipDigestAckMessage(gDigestAck);
-                if (logger_.isTraceEnabled())
-                    logger_.trace("Sending a GossipDigestAckMessage to {}", from);
-                MessagingService.instance.sendOneWay(gDigestAckMessage, from);
-            }
-            catch (IOException e)
-            {
-                throw new RuntimeException(e);
-            }
-        }
-
-        /*
-         * First construct a map whose key is the endpoint in the GossipDigest and the value is the
-         * GossipDigest itself. Then build a list of version differences i.e difference between the
-         * version in the GossipDigest and the version in the local state for a given InetAddress.
-         * Sort this list. Now loop through the sorted list and retrieve the GossipDigest corresponding
-         * to the endpoint from the map that was initially constructed.
-        */
-        private void doSort(List<GossipDigest> gDigestList)
-        {
-            /* Construct a map of endpoint to GossipDigest. */
-            Map<InetAddress, GossipDigest> epToDigestMap = new HashMap<InetAddress, GossipDigest>();
-            for ( GossipDigest gDigest : gDigestList )
-            {
-                epToDigestMap.put(gDigest.getEndpoint(), gDigest);
-            }
-
-            /*
-             * These digests have their maxVersion set to the difference of the version
-             * of the local EndpointState and the version found in the GossipDigest.
-            */
-            List<GossipDigest> diffDigests = new ArrayList<GossipDigest>();
-            for ( GossipDigest gDigest : gDigestList )
-            {
-                InetAddress ep = gDigest.getEndpoint();
-                EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(ep);
-                int version = (epState != null) ? Gossiper.instance.getMaxEndpointStateVersion( epState ) : 0;
-                int diffVersion = Math.abs(version - gDigest.getMaxVersion() );
-                diffDigests.add( new GossipDigest(ep, gDigest.getGeneration(), diffVersion) );
-            }
-
-            gDigestList.clear();
-            Collections.sort(diffDigests);
-            int size = diffDigests.size();
-            /*
-             * Report the digests in descending order. This takes care of the endpoints
-             * that are far behind w.r.t this local endpoint
-            */
-            for ( int i = size - 1; i >= 0; --i )
-            {
-                gDigestList.add( epToDigestMap.get(diffDigests.get(i).getEndpoint()) );
-            }
-        }
-    }
-
-    public static class GossipDigestAckVerbHandler implements IVerbHandler
-    {
-        private static Logger logger_ = LoggerFactory.getLogger(GossipDigestAckVerbHandler.class);
-
-        public void doVerb(Message message)
-        {
-            InetAddress from = message.getFrom();
-            if (logger_.isTraceEnabled())
-                logger_.trace("Received a GossipDigestAckMessage from {}", from);
-
-            byte[] bytes = message.getMessageBody();
-            DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
-
-            try
-            {
-                GossipDigestAckMessage gDigestAckMessage = GossipDigestAckMessage.serializer().deserialize(dis);
-                List<GossipDigest> gDigestList = gDigestAckMessage.getGossipDigestList();
-                Map<InetAddress, EndpointState> epStateMap = gDigestAckMessage.getEndpointStateMap();
-
-                if ( epStateMap.size() > 0 )
-                {
-                    /* Notify the Failure Detector */
-                    Gossiper.instance.notifyFailureDetector(epStateMap);
-                    Gossiper.instance.applyStateLocally(epStateMap);
-                }
-
-                /* Get the state required to send to this gossipee - construct GossipDigestAck2Message */
-                Map<InetAddress, EndpointState> deltaEpStateMap = new HashMap<InetAddress, EndpointState>();
-                for( GossipDigest gDigest : gDigestList )
-                {
-                    InetAddress addr = gDigest.getEndpoint();
-                    EndpointState localEpStatePtr = Gossiper.instance.getStateForVersionBiggerThan(addr, gDigest.getMaxVersion());
-                    if ( localEpStatePtr != null )
-                        deltaEpStateMap.put(addr, localEpStatePtr);
-                }
-
-                GossipDigestAck2Message gDigestAck2 = new GossipDigestAck2Message(deltaEpStateMap);
-                Message gDigestAck2Message = Gossiper.instance.makeGossipDigestAck2Message(gDigestAck2);
-                if (logger_.isTraceEnabled())
-                    logger_.trace("Sending a GossipDigestAck2Message to {}", from);
-                MessagingService.instance.sendOneWay(gDigestAck2Message, from);
-            }
-            catch ( IOException e )
-            {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public static class GossipDigestAck2VerbHandler implements IVerbHandler
-    {
-        private static Logger logger_ = LoggerFactory.getLogger(GossipDigestAck2VerbHandler.class);
-
-        public void doVerb(Message message)
-        {
-            InetAddress from = message.getFrom();
-            if (logger_.isTraceEnabled())
-                logger_.trace("Received a GossipDigestAck2Message from {}", from);
-
-            byte[] bytes = message.getMessageBody();
-            DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
-            GossipDigestAck2Message gDigestAck2Message;
-            try
-            {
-                gDigestAck2Message = GossipDigestAck2Message.serializer().deserialize(dis);
-            }
-            catch (IOException e)
-            {
-                throw new RuntimeException(e);
-            }
-            Map<InetAddress, EndpointState> remoteEpStateMap = gDigestAck2Message.getEndpointStateMap();
-            /* Notify the Failure Detector */
-            Gossiper.instance.notifyFailureDetector(remoteEpStateMap);
-            Gossiper.instance.applyStateLocally(remoteEpStateMap);
-        }
-    }
 }

Modified: cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=953394&r1=953393&r2=953394&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Thu Jun 10 17:05:54 2010
@@ -18,14 +18,18 @@
 
 package org.apache.cassandra.net;
 
-import org.apache.cassandra.concurrent.*;
+import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
+import org.apache.cassandra.concurrent.NamedThreadFactory;
+import org.apache.cassandra.concurrent.StageManager;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.gms.IFailureDetectionEventListener;
 import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.net.io.SerializerType;
 import org.apache.cassandra.net.sink.SinkManager;
 import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.*;
+import org.apache.cassandra.utils.ExpiringMap;
+import org.apache.cassandra.utils.GuidGenerator;
+import org.apache.cassandra.utils.SimpleCondition;
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
 
 import org.slf4j.Logger;
@@ -33,15 +37,16 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOError;
 import java.io.IOException;
-import java.net.ServerSocket;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousCloseException;
 import java.nio.channels.ServerSocketChannel;
 import java.security.MessageDigest;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -73,8 +78,9 @@ public class MessagingService implements
     private static Logger logger_ = LoggerFactory.getLogger(MessagingService.class);
     
     public static final MessagingService instance = new MessagingService();
-    
+
     private SocketThread socketThread;
+    private SimpleCondition listenGate;
 
     public Object clone() throws CloneNotSupportedException
     {
@@ -83,7 +89,8 @@ public class MessagingService implements
     }
 
     protected MessagingService()
-    {        
+    {
+        listenGate = new SimpleCondition();
         verbHandlers_ = new HashMap<StorageService.Verb, IVerbHandler>();
         /*
          * Leave callbacks in the cachetable long enough that any related messages will arrive
@@ -104,7 +111,7 @@ public class MessagingService implements
 
         streamExecutor_ = new JMXEnabledThreadPoolExecutor("MESSAGE-STREAMING-POOL");
     }
-    
+
     public byte[] hash(String type, byte data[])
     {
         byte result[];
@@ -139,6 +146,19 @@ public class MessagingService implements
         ss.bind(new InetSocketAddress(localEp, DatabaseDescriptor.getStoragePort()));
         socketThread = new SocketThread(ss, "ACCEPT-" + localEp);
         socketThread.start();
+        listenGate.signalAll();
+    }
+
+    public void waitUntilListening()
+    {
+        try
+        {
+            listenGate.await();
+        }
+        catch (InterruptedException ie)
+        {
+            logger_.debug("await interrupted");
+        }
     }
 
     public static OutboundTcpConnectionPool getConnectionPool(InetAddress to)

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=953394&r1=953393&r2=953394&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Thu Jun 10 17:05:54 2010
@@ -231,9 +231,9 @@ public class StorageService implements I
         MessagingService.instance.registerVerbHandlers(Verb.TREE_REQUEST, new TreeRequestVerbHandler());
         MessagingService.instance.registerVerbHandlers(Verb.TREE_RESPONSE, new AntiEntropyService.TreeResponseVerbHandler());
 
-        MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_SYN, new Gossiper.GossipDigestSynVerbHandler());
-        MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_ACK, new Gossiper.GossipDigestAckVerbHandler());
-        MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_ACK2, new Gossiper.GossipDigestAck2VerbHandler());
+        MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_SYN, new GossipDigestSynVerbHandler());
+        MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_ACK, new GossipDigestAckVerbHandler());
+        MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_ACK2, new GossipDigestAck2VerbHandler());
         
         MessagingService.instance.registerVerbHandlers(Verb.DEFINITIONS_ANNOUNCE, new DefinitionsAnnounceVerbHandler());
         MessagingService.instance.registerVerbHandlers(Verb.DEFINITIONS_UPDATE_RESPONSE, new DefinitionsUpdateResponseVerbHandler());
@@ -308,10 +308,10 @@ public class StorageService implements I
         initialized = true;
         isClientMode = true;
         logger_.info("Starting up client gossip");
-        MessagingService.instance.listen(FBUtilities.getLocalAddress());
+        setMode("Client", false);
         Gossiper.instance.register(this);
         Gossiper.instance.start(FBUtilities.getLocalAddress(), (int)(System.currentTimeMillis() / 1000)); // needed for node-ring gathering.
-        setMode("Client", false);
+        MessagingService.instance.listen(FBUtilities.getLocalAddress());
         
         // sleep a while to allow gossip to warm up (the other nodes need to know about this one before they can reply).
         try
@@ -358,12 +358,6 @@ public class StorageService implements I
 
         logger_.info("Starting up server gossip");
 
-        MessagingService.instance.listen(FBUtilities.getLocalAddress());
-
-        StorageLoadBalancer.instance.startBroadcasting();
-        
-        MigrationManager.announce(DatabaseDescriptor.getDefsVersion(), DatabaseDescriptor.getSeeds());
-
         // have to start the gossip service before we can see any info on other nodes.  this is necessary
         // for bootstrap to get the load info it needs.
         // (we won't be part of the storage ring though until we add a nodeId to our state, below.)
@@ -371,6 +365,10 @@ public class StorageService implements I
         Gossiper.instance.register(migrationManager);
         Gossiper.instance.start(FBUtilities.getLocalAddress(), storageMetadata_.getGeneration()); // needed for node-ring gathering.
 
+        MessagingService.instance.listen(FBUtilities.getLocalAddress());
+        StorageLoadBalancer.instance.startBroadcasting();
+        MigrationManager.announce(DatabaseDescriptor.getDefsVersion(), DatabaseDescriptor.getSeeds());
+
         if (DatabaseDescriptor.isAutoBootstrap()
                 && DatabaseDescriptor.getSeeds().contains(FBUtilities.getLocalAddress())
                 && !SystemTable.isBootstrapped())

Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java?rev=953394&r1=953393&r2=953394&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java Thu Jun 10 17:05:54 2010
@@ -18,14 +18,16 @@
 */
 package org.apache.cassandra.db;
 
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import org.junit.Test;
-
 import org.apache.cassandra.CleanupHelper;
 import org.apache.cassandra.db.commitlog.CommitLog;
 import org.apache.cassandra.db.filter.QueryPath;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.ExecutionException;
 
 public class CommitLogTest extends CleanupHelper
 {
@@ -59,4 +61,15 @@ public class CommitLogTest extends Clean
         store2.forceBlockingFlush();
         assert CommitLog.instance().getSegmentCount() == 1;
     }
+
+    @Test
+    public void testRecoveryWithPartiallyWrittenHeader() throws Exception
+    {
+        File tmpFile = File.createTempFile("testRecoveryWithPartiallyWrittenHeaderTestFile", null);
+        tmpFile.deleteOnExit();
+        OutputStream out = new FileOutputStream(tmpFile);
+        out.write(new byte[6]);
+        //statics make it annoying to test things correctly
+        CommitLog.instance().recover(new File[] {tmpFile}); //CASSANDRA-1119 throws on failure
+    }
 }