move EngineResetLock

Author: tlrx

server/src/main/java/org/elasticsearch/index/engine/Engine.java

@@ -77,6 +77,7 @@
 import org.elasticsearch.index.seqno.SequenceNumbers;
 import org.elasticsearch.index.shard.DenseVectorStats;
 import org.elasticsearch.index.shard.DocsStats;
+import org.elasticsearch.index.shard.EngineResetLock;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.ShardFieldStats;
 import org.elasticsearch.index.shard.ShardId;

server/src/main/java/org/elasticsearch/index/engine/EngineConfig.java

@@ -29,6 +29,7 @@
 import org.elasticsearch.index.codec.CodecService;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.seqno.RetentionLeases;
+import org.elasticsearch.index.shard.EngineResetLock;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.store.Store;
 import org.elasticsearch.index.translog.TranslogConfig;

server/src/main/java/org/elasticsearch/index/engine/EngineResetLock.java renamed to server/src/main/java/org/elasticsearch/index/shard/EngineResetLock.java

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.index.engine;
+package org.elasticsearch.index.shard;
 
 import org.elasticsearch.core.Assertions;
 
@@ -84,7 +84,8 @@ public int getReadLockCount() {
     /**
      * See {@link ReentrantReadWriteLock#getQueuedWriterThreads()}
      */
-    public Collection<Thread> getQueuedWriterThreads() {
+    // package-private for tests
+    Collection<Thread> getQueuedWriterThreads() {
         if (lock instanceof QueuedWriterThreadsReentrantReadWriteLock queuedLock) {
             return queuedLock.queuedWriterThreads();
         } else {

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

@@ -91,7 +91,6 @@
 import org.elasticsearch.index.engine.EngineConfig;
 import org.elasticsearch.index.engine.EngineException;
 import org.elasticsearch.index.engine.EngineFactory;
-import org.elasticsearch.index.engine.EngineResetLock;
 import org.elasticsearch.index.engine.ReadOnlyEngine;
 import org.elasticsearch.index.engine.RefreshFailedEngineException;
 import org.elasticsearch.index.engine.SafeCommitInfo;

server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java

@@ -39,7 +39,6 @@
 import org.elasticsearch.index.codec.CodecService;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.engine.EngineConfig;
-import org.elasticsearch.index.engine.EngineResetLock;
 import org.elasticsearch.index.engine.EngineTestCase;
 import org.elasticsearch.index.engine.InternalEngine;
 import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;

test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java

@@ -91,6 +91,7 @@
 import org.elasticsearch.index.seqno.ReplicationTracker;
 import org.elasticsearch.index.seqno.RetentionLeases;
 import org.elasticsearch.index.seqno.SequenceNumbers;
+import org.elasticsearch.index.shard.EngineResetLock;
 import org.elasticsearch.index.shard.SearcherHelper;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.store.Store;

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

@@ -32,7 +32,7 @@
 import org.elasticsearch.index.engine.DocIdSeqNoAndSource;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.engine.EngineConfig;
-import org.elasticsearch.index.engine.EngineResetLock;
+import org.elasticsearch.index.shard.EngineResetLock;
 import org.elasticsearch.index.engine.EngineTestCase;
 import org.elasticsearch.index.engine.InternalEngine;
 import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;