Skip to content

Commit 1134a5e

Browse files
committed
Merge branch '05192025/UnpauseIndexingForPermits' of github.com:ankikuma/elasticsearch into 05192025/UnpauseIndexingForPermits
pull
2 parents 9729ebf + 31fe364 commit 1134a5e

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
import java.util.concurrent.Semaphore;
7878
import java.util.concurrent.TimeUnit;
7979
import java.util.concurrent.atomic.AtomicBoolean;
80-
import java.util.concurrent.locks.LockSupport;
8180
import java.util.stream.Collectors;
8281
import java.util.stream.Stream;
8382

server/src/main/java/org/elasticsearch/index/shard/IndexShard.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2755,7 +2755,7 @@ public IndexEventListener getIndexEventListener() {
27552755
* setting is set to true, throttling will pause indexing completely. Otherwise, indexing will be throttled to one thread.
27562756
*/
27572757
public void activateThrottling() {
2758-
assert shardRouting.primary(): "only primaries can be throttled: " + shardRouting;
2758+
assert shardRouting.primary() : "only primaries can be throttled: " + shardRouting;
27592759
try {
27602760
getEngine().activateThrottling();
27612761
} catch (AlreadyClosedException ex) {

0 commit comments

Comments
 (0)