STAR-582 avoid assertion when repairing 1 node cluster (#185)

Porting patch DB-1511, riptano/apollo#627 Co-authored-by: Zhao Yang <[email protected]> (cherry picked from commit 998eca0) (cherry picked from commit 18a8ce9) (cherry picked from commit 2b37f32) (cherry picked from commit 2a29739) (cherry picked from commit 3d9e3a6) (cherry picked from commit a21dd64) (cherry picked from commit 8044571)
ekaterinadimitrova2 · Jul 28, 2023 · f066fb3 · f066fb3
1 parent 473a3a1
commit f066fb3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -326,6 +326,7 @@ private NeighborsAndRanges getNeighborsAndRanges()
             EndpointsForRange neighbors = ActiveRepairService.getNeighbors(keyspace, keyspaceLocalRanges, range,
                                                                            options.getDataCenters(),
                                                                            options.getHosts());
+            // local RF = 1 or given range is not part of local range, neighbors would be empty.
             if (neighbors.isEmpty())
             {
                 if (options.ignoreUnreplicatedKeyspaces())

diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
@@ -4207,8 +4207,11 @@ else if (option.isInLocalDCOnly())
                 Iterables.addAll(option.getRanges(), getLocalReplicas(keyspace).onlyFull().ranges());
             }
         }
-        if (option.getRanges().isEmpty() || Keyspace.open(keyspace).getReplicationStrategy().getReplicationFactor().allReplicas < 2)
+        if (option.getRanges().isEmpty() || Keyspace.open(keyspace).getReplicationStrategy().getReplicationFactor().allReplicas < 2
+            || tokenMetadata.getAllEndpoints().size() < 2)
+        {
             return Pair.create(0, Futures.immediateFuture(null));
+        }
 
         int cmd = nextRepairCommand.incrementAndGet();
         return Pair.create(cmd, ActiveRepairService.repairCommandExecutor().submit(createRepairTask(cmd, keyspace, option, listeners)));