Fixed compile errors and test failures after merging master into ccr.

This commit is contained in:
Martijn van Groningen 2018-04-13 16:35:10 +02:00
parent 9da3e739fb
commit db2713bb7f
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
1 changed files with 1 additions and 1 deletions

View File

@ -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) {