move cancel statement

palantir · Dec 17, 2024 · 14422d1 · 14422d1
1 parent 35cf3ec
commit 14422d1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1616,9 +1616,9 @@ private boolean bootstrap(final Collection<Token> tokens)
                     logger.info("Stopped waiting for bootstrap streaming to complete because detected a bootstrap error.", SafeArg.of("nonTransientErrors", getNonTransientErrors()));
                     break;
                 }
-                bootstrapStream.cancel(true);
                 Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
             }
+            bootstrapStream.cancel(true);
             isBootstrapMode = false;
             return !StorageService.instance.hasNonTransientError(StorageServiceMBean.NonTransientError.BOOTSTRAP_ERROR);
         }