Fix conflict

elastic · Dec 19, 2018 · 9d22000 · 9d22000
1 parent d239dc8
commit 9d22000
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../elasticsearch/action/admin/indices/close/TransportVerifyShardBeforeCloseActionTests.java b/.../elasticsearch/action/admin/indices/close/TransportVerifyShardBeforeCloseActionTests.java
@@ -205,7 +205,8 @@ public void testUnavailableShardsMarkedAsStale() throws Exception {
         assertThat(replicationGroup.getUnavailableInSyncShards().size(), greaterThan(0));
 
         final PlainActionFuture<PrimaryResult> listener = new PlainActionFuture<>();
-        TransportVerifyShardBeforeCloseAction.ShardRequest request = new TransportVerifyShardBeforeCloseAction.ShardRequest(shardId);
+        TransportVerifyShardBeforeCloseAction.ShardRequest request =
+            new TransportVerifyShardBeforeCloseAction.ShardRequest(shardId, new TaskId(clusterService.localNode().getId(), 0L));
         ReplicationOperation.Replicas<TransportVerifyShardBeforeCloseAction.ShardRequest> proxy = action.newReplicasProxy(primaryTerm);
         ReplicationOperation<TransportVerifyShardBeforeCloseAction.ShardRequest,
             TransportVerifyShardBeforeCloseAction.ShardRequest, PrimaryResult> operation =