From ebfe3491fc4a6a91a1d8ffe1201dfd54953289b9 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 26 Aug 2019 20:39:53 -0400 Subject: [PATCH 1/2] Remove already exist assertion while renew ccr lease --- .../elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java index ced081ec0edf6..87c0aa943c049 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java @@ -439,7 +439,6 @@ protected Scheduler.Cancellable scheduleBackgroundRetentionLeaseRenewal(final Lo * going on. Log it, and renew again after another renew interval has passed. */ final Throwable innerCause = ExceptionsHelper.unwrapCause(inner); - assert innerCause instanceof RetentionLeaseAlreadyExistsException == false; logRetentionLeaseFailure(retentionLeaseId, innerCause); })); } else { From a7986b8c732c2452fbd6b5cfbdd6835bfc81e8cd Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 26 Aug 2019 21:28:03 -0400 Subject: [PATCH 2/2] unused import --- .../elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java index 87c0aa943c049..ae025ae2a8d26 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java @@ -44,7 +44,6 @@ import org.elasticsearch.index.engine.CommitStats; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.seqno.RetentionLeaseActions; -import org.elasticsearch.index.seqno.RetentionLeaseAlreadyExistsException; import org.elasticsearch.index.seqno.RetentionLeaseNotFoundException; import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.shard.ShardId;