Skip to content

Commit dc1d160

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 4fa503c commit dc1d160

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4697,12 +4697,12 @@ EngineResetLock getEngineResetLock() {
46974697
private boolean assertNoEngineResetLock() {
46984698
assert engineResetLock.isReadLockedByCurrentThread()
46994699
: "Expected current thread ["
4700-
+ Thread.currentThread()
4701-
+ "] to not hold an engine read lock (lock ordering should be: engineMutex -> engineResetLock -> mutex)";
4700+
+ Thread.currentThread()
4701+
+ "] to not hold an engine read lock (lock ordering should be: engineMutex -> engineResetLock -> mutex)";
47024702
assert engineResetLock.isWriteLockedByCurrentThread()
47034703
: "Expected current thread ["
4704-
+ Thread.currentThread()
4705-
+ "] to not hold the engine write lock (lock ordering should be: engineMutex -> engineResetLock -> mutex)";
4704+
+ Thread.currentThread()
4705+
+ "] to not hold the engine write lock (lock ordering should be: engineMutex -> engineResetLock -> mutex)";
47064706
return true;
47074707
}
47084708
}

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.elasticsearch.index.engine.DocIdSeqNoAndSource;
3333
import org.elasticsearch.index.engine.Engine;
3434
import org.elasticsearch.index.engine.EngineConfig;
35-
import org.elasticsearch.index.shard.EngineResetLock;
3635
import org.elasticsearch.index.engine.EngineTestCase;
3736
import org.elasticsearch.index.engine.InternalEngine;
3837
import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
@@ -44,6 +43,7 @@
4443
import org.elasticsearch.index.mapper.SourceToParse;
4544
import org.elasticsearch.index.seqno.RetentionLeases;
4645
import org.elasticsearch.index.seqno.SequenceNumbers;
46+
import org.elasticsearch.index.shard.EngineResetLock;
4747
import org.elasticsearch.index.shard.IndexShard;
4848
import org.elasticsearch.index.shard.ShardId;
4949
import org.elasticsearch.index.store.Store;

0 commit comments

Comments
 (0)