merger CASSANDRA-2290 from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1094798 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sylvain Lebresne 2011-04-18 22:21:26 +00:00
parent 98eaa99a6c
commit 20f83e459a
1 changed files with 11 additions and 0 deletions

View File

@ -41,6 +41,7 @@ import org.apache.cassandra.db.Table;
import org.apache.cassandra.dht.AbstractBounds;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.io.AbstractCompactedRow;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.io.sstable.SSTableReader;
@ -776,6 +777,16 @@ public class AntiEntropyService
return;
}
// Checking all nodes are live
for (InetAddress endpoint : endpoints)
{
if (!FailureDetector.instance.isAlive(endpoint))
{
logger.info("Could not proceed on repair because a neighbor (" + endpoint + ") is dead: " + getName() + " failed.");
return;
}
}
// begin a repair session
Callback callback = new Callback();
AntiEntropyService.instance.sessions.put(getName(), callback);