Hint streaming can cause decommission to fail

patch by jasobrown, reviewed by marcuse for CASSANDRA-7219
This commit is contained in:
Jason Brown 2014-05-30 05:40:30 -07:00
parent ea26dbd730
commit 2f497eda0f
2 changed files with 3 additions and 1 deletions

View File

@ -26,6 +26,7 @@
* exit CQLSH with error status code if script fails (CASSANDRA-6344)
* Fix bug with some IN queries missig results (CASSANDRA-7105)
* Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
* Hint streaming can cause decommission to fail (CASSANDRA-7219)
1.2.16

View File

@ -2966,7 +2966,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private CountDownLatch streamHints()
{
if (HintedHandOffManager.instance.listEndpointsPendingHints().size() == 0)
ColumnFamilyStore hintsCF = Table.open(Table.SYSTEM_KS).getColumnFamilyStore(SystemTable.HINTS_CF);
if (hintsCF.getMemtableColumnsCount() == 0 && hintsCF.estimateKeys() == 0)
return new CountDownLatch(0);
// gather all live nodes in the cluster that aren't also leaving