Fixed compile errors and test failures after merging master into ccr.
This commit is contained in:
parent
9da3e739fb
commit
db2713bb7f
|
@ -3001,7 +3001,7 @@ public class IndexShardTests extends IndexShardTestCase {
|
||||||
ShardPath shardPath = new ShardPath(false, nodePath.resolve(shardId), nodePath.resolve(shardId), shardId);
|
ShardPath shardPath = new ShardPath(false, nodePath.resolve(shardId), nodePath.resolve(shardId), shardId);
|
||||||
AtomicBoolean markedInactive = new AtomicBoolean();
|
AtomicBoolean markedInactive = new AtomicBoolean();
|
||||||
AtomicReference<IndexShard> primaryRef = new AtomicReference<>();
|
AtomicReference<IndexShard> primaryRef = new AtomicReference<>();
|
||||||
IndexShard primary = newShard(shardRouting, shardPath, metaData, null, null, () -> {
|
IndexShard primary = newShard(shardRouting, shardPath, metaData, null, new InternalEngineFactory(), () -> {
|
||||||
}, new IndexEventListener() {
|
}, new IndexEventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onShardInactive(IndexShard indexShard) {
|
public void onShardInactive(IndexShard indexShard) {
|
||||||
|
|
Loading…
Reference in New Issue