Skip to content

Commit 85e6085

Browse files
committed
Add debug log for retention leases (elastic#42557)
We need more information to understand why CcrRetentionLeaseIT is failing. This commit adds some debug log to retention leases and enables them in CcrRetentionLeaseIT.
1 parent 5d2fcc5 commit 85e6085

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

server/src/main/java/org/elasticsearch/index/seqno/ReplicationTracker.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,15 @@ public synchronized Tuple<Boolean, RetentionLeases> getRetentionLeases(final boo
221221
.leases()
222222
.stream()
223223
.collect(Collectors.groupingBy(lease -> currentTimeMillis - lease.timestamp() > retentionLeaseMillis));
224-
if (partitionByExpiration.get(true) == null) {
224+
final Collection<RetentionLease> expiredLeases = partitionByExpiration.get(true);
225+
if (expiredLeases == null) {
225226
// early out as no retention leases have expired
227+
logger.debug("no retention leases are expired from current retention leases [{}]", retentionLeases);
226228
return Tuple.tuple(false, retentionLeases);
227229
}
228230
final Collection<RetentionLease> nonExpiredLeases =
229231
partitionByExpiration.get(false) != null ? partitionByExpiration.get(false) : Collections.emptyList();
232+
logger.debug("expiring retention leases [{}] from current retention leases [{}]", expiredLeases, retentionLeases);
230233
retentionLeases = new RetentionLeases(operationPrimaryTerm, retentionLeases.version() + 1, nonExpiredLeases);
231234
return Tuple.tuple(true, retentionLeases);
232235
}
@@ -255,6 +258,7 @@ public RetentionLease addRetentionLease(
255258
throw new RetentionLeaseAlreadyExistsException(id);
256259
}
257260
retentionLease = new RetentionLease(id, retainingSequenceNumber, currentTimeMillisSupplier.getAsLong(), source);
261+
logger.debug("adding new retention lease [{}] to current retention leases [{}]", retentionLease, retentionLeases);
258262
retentionLeases = new RetentionLeases(
259263
operationPrimaryTerm,
260264
retentionLeases.version() + 1,
@@ -312,6 +316,7 @@ public void removeRetentionLease(final String id, final ActionListener<Replicati
312316
if (retentionLeases.contains(id) == false) {
313317
throw new RetentionLeaseNotFoundException(id);
314318
}
319+
logger.debug("removing retention lease [{}] from current retention leases [{}]", id, retentionLeases);
315320
retentionLeases = new RetentionLeases(
316321
operationPrimaryTerm,
317322
retentionLeases.version() + 1,

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrRetentionLeaseIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
import static org.hamcrest.Matchers.greaterThan;
8989
import static org.hamcrest.Matchers.hasSize;
9090

91-
@TestLogging(value = "org.elasticsearch.xpack.ccr:trace,org.elasticsearch.indices.recovery:trace")
91+
@TestLogging(value = "org.elasticsearch.xpack.ccr:trace,org.elasticsearch.indices.recovery:trace,org.elasticsearch.index.seqno:debug")
9292
public class CcrRetentionLeaseIT extends CcrIntegTestCase {
9393

9494
public static final class RetentionLeaseRenewIntervalSettingPlugin extends Plugin {

0 commit comments

Comments
 (0)