Author: jbellis
Date: Sun Nov 14 12:31:19 2010
New Revision: 1034991
URL: http://svn.apache.org/viewvc?rev=1034991&view=rev
Log:
reject rangequeries received during bootstrap
patch by Randall Leeds; reviewed by jbellis for CASSANDRA-1739
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=1034991&r1=1034990&r2=1034991&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Sun Nov 14 12:31:19 2010
@@ -1,6 +1,7 @@
0.6.9
* add clustertool, config-converter, sstablekeys, and schematool
Windows .bat files (CASSANDRA-1723)
+ * reject range queries received during bootstrap (CASSANDRA-1739)
0.6.8
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java?rev=1034991&r1=1034990&r2=1034991&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
Sun Nov 14 12:31:19 2010
@@ -36,6 +36,11 @@ public class RangeSliceVerbHandler imple
{
try
{
+ if (StorageService.instance.isBootstrapMode())
+ {
+ /* Don't service reads! */
+ throw new RuntimeException("Cannot service reads while
bootstrapping!");
+ }
RangeSliceCommand command = RangeSliceCommand.read(message);
ColumnFamilyStore cfs =
Table.open(command.keyspace).getColumnFamilyStore(command.column_family);
RangeSliceReply reply = cfs.getRangeSlice(command.super_column,
