Remove renewal in retention lease recovery test (#42536)

This commit removes the act of renewing some retention leases during a
retention lease recovery test. Having renewal does not add anything
extra to this test, but does allow for some situations where the test
can fail spuriously (i.e., in a way that does not indicate that
production code is broken).
This commit is contained in:
Jason Tedor 2019-05-24 15:39:27 -07:00
parent 5695992094
commit f2cfd09289
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
1 changed files with 0 additions and 3 deletions

View File

@ -36,7 +36,6 @@ import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.indices.recovery.PeerRecoveryTargetService; import org.elasticsearch.indices.recovery.PeerRecoveryTargetService;
import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.test.transport.MockTransportService;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.TransportService;
@ -356,7 +355,6 @@ public class RetentionLeaseIT extends ESIntegTestCase {
assertFalse("retention leases background sync must be a noop if soft deletes is disabled", backgroundSyncRequestSent.get()); assertFalse("retention leases background sync must be a noop if soft deletes is disabled", backgroundSyncRequestSent.get());
} }
@TestLogging(value = "org.elasticsearch.index:debug,org.elasticsearch.indices.recovery:trace")
public void testRetentionLeasesSyncOnRecovery() throws Exception { public void testRetentionLeasesSyncOnRecovery() throws Exception {
final int numberOfReplicas = 2 - scaledRandomIntBetween(0, 2); final int numberOfReplicas = 2 - scaledRandomIntBetween(0, 2);
internalCluster().ensureAtLeastNumDataNodes(1 + numberOfReplicas); internalCluster().ensureAtLeastNumDataNodes(1 + numberOfReplicas);
@ -393,7 +391,6 @@ public class RetentionLeaseIT extends ESIntegTestCase {
final ActionListener<ReplicationResponse> listener = countDownLatchListener(latch); final ActionListener<ReplicationResponse> listener = countDownLatchListener(latch);
currentRetentionLeases.put(id, primary.addRetentionLease(id, retainingSequenceNumber, source, listener)); currentRetentionLeases.put(id, primary.addRetentionLease(id, retainingSequenceNumber, source, listener));
latch.await(); latch.await();
currentRetentionLeases.put(id, primary.renewRetentionLease(id, retainingSequenceNumber, source));
} }
logger.info("finished adding [{}] retention leases", length); logger.info("finished adding [{}] retention leases", length);