honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove already exist assertion while renew ccr lease (#46009) 

If a CCR lease is disappeared while we are renewing it, then we will
issue asyncAddRetentionLease to add that lease. And if
asyncAddRetentionLease takes longer than retentionLeaseRenewInterval,
then we can issue another asyncAddRetentionLease request. One of
asyncAddRetentionLease requests will fail with
RetentionLeaseAlreadyExistsException, hence trip the assertion.

Closes #45192
This commit is contained in:
Nhat Nguyen 2019-08-27 12:36:25 -04:00
parent 8145845fca
commit 028e792e1d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java
View File

@ -45,7 +45,6 @@ import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.engine.CommitStats; import org.elasticsearch.index.engine.CommitStats;
import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.Engine;
import org.elasticsearch.index.seqno.RetentionLeaseActions; import org.elasticsearch.index.seqno.RetentionLeaseActions;
import org.elasticsearch.index.seqno.RetentionLeaseAlreadyExistsException;
import org.elasticsearch.index.seqno.RetentionLeaseNotFoundException; import org.elasticsearch.index.seqno.RetentionLeaseNotFoundException;
import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.seqno.SeqNoStats;
import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardId;
@ -440,7 +439,6 @@ public class ShardFollowTasksExecutor extends PersistentTasksExecutor<ShardFollo
* going on. Log it, and renew again after another renew interval has passed. * going on. Log it, and renew again after another renew interval has passed.
*/ */
final Throwable innerCause = ExceptionsHelper.unwrapCause(inner); final Throwable innerCause = ExceptionsHelper.unwrapCause(inner);
assert innerCause instanceof RetentionLeaseAlreadyExistsException == false;
logRetentionLeaseFailure(retentionLeaseId, innerCause); logRetentionLeaseFailure(retentionLeaseId, innerCause);
})); }));
} else { } else {