svn commit: r1049580 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/service/StorageProxy.java

[jb...@apache.org]

Author: jbellis
Date: Wed Dec 15 15:10:21 2010
New Revision: 1049580

URL: http://svn.apache.org/viewvc?rev=1049580&view=rev
Log:
change exceptionfor readrequests duringbootstrap from InvalidRequest to Unavailable
patch by Nate McCall; reviewed by jbellis for CASSANDRA-1862

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1049580&r1=1049579&r2=1049580&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed Dec 15 15:10:21 2010
@@ -9,6 +9,8 @@ dev
    column families (CASSANDRA-1835)
  * unregister index MBeans when index is dropped (CASSANDRA-1843)
  * make ByteBufferUtil.clone thread-safe (CASSANDRA-1847)
+ * change exception for read requests during bootstrap from 
+   InvalidRequest to Unavailable (CASSANDRA-1862)
 
 
 0.7.0-rc2

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1049580&r1=1049579&r2=1049580&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java Wed Dec 15 15:10:21 2010
@@ -215,7 +215,7 @@ public class StorageProxy implements Sto
             throws IOException, UnavailableException, TimeoutException, InvalidRequestException
     {
         if (StorageService.instance.isBootstrapMode())
-            throw new InvalidRequestException("This node cannot accept reads until it has bootstrapped");
+            throw new UnavailableException();
         long startTime = System.nanoTime();
 
         List<Row> rows;