Author: jbellis
Date: Mon Oct 4 22:06:36 2010
New Revision: 1004454
URL: http://svn.apache.org/viewvc?rev=1004454&view=rev
Log:
fix unbootstrap when no data is present in a transfer range
patch by jbellis; reviewed by Nick Bailey for CASSANDRA-1573
Modified:
cassandra/trunk/CHANGES.txt
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1004454&r1=1004453&r2=1004454&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Mon Oct 4 22:06:36 2010
@@ -9,6 +9,7 @@ dev
* remove assertion causing rare (and harmless) error messages in
commitlog (CASSANDRA-1330)
* fix moving nodes with no keyspaces defined (CASSANDRA-1574)
+ * fix unbootstrap when no data is present in a transfer range (CASSANDRA-1573)
0.7-beta2
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=1004454&r1=1004453&r2=1004454&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Mon Oct 4 22:06:36 2010
@@ -396,7 +396,7 @@ public class StorageService implements I
if (DatabaseDescriptor.getNonSystemTables().size() > 0)
{
bootstrap(token);
- assert !isBootstrapMode; // bootstrap will block until finishec
+ assert !isBootstrapMode; // bootstrap will block until finished
}
else
{
Modified: cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java?rev=1004454&r1=1004453&r2=1004454&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java Mon
Oct 4 22:06:36 2010
@@ -150,6 +150,10 @@ public class StreamOut
session.addFilesToStream(pending);
session.begin();
}
+ else
+ {
+ session.close();
+ }
}
// called prior to sending anything.
