Skip to content

retry 500 and 503 errors against kinesis #10059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jon-wei merged 4 commits into from
Jun 23, 2020
Merged

retry 500 and 503 errors against kinesis #10059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
550195a
retry 500 and 503 errors against kinesis
Jun 23, 2020
facb7dd
add test that exercises retry logic
Jun 23, 2020
9119d89
more branch coverage
Jun 23, 2020
af40b4f
retry 500 and 503 on getRecords request when fetching sequence numberu
Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...dexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisRecordSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ private static boolean isServiceExceptionRecoverable(AmazonServiceException ex)
{
final boolean isIOException = ex.getCause() instanceof IOException;
final boolean isTimeout = "RequestTimeout".equals(ex.getErrorCode());
return isIOException || isTimeout;
final boolean isInternalError = ex.getStatusCode() == 500 || ex.getStatusCode() == 503;
return isIOException || isTimeout || isInternalError;
}

/**
Expand Down Expand Up @@ -809,6 +810,10 @@ private String getSequenceNumber(StreamPartition<String> partition, ShardIterato
);
return true;
}
if (throwable instanceof AmazonServiceException) {
AmazonServiceException ase = (AmazonServiceException) throwable;
return isServiceExceptionRecoverable(ase);
}
return false;
},
GET_SEQUENCE_NUMBER_RETRY_COUNT
Expand Down
89 changes: 89 additions & 0 deletions ...ng-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisRecordSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.druid.indexing.kinesis;

import com.amazonaws.AmazonServiceException;
import com.amazonaws.services.kinesis.AmazonKinesis;
import com.amazonaws.services.kinesis.AmazonKinesisClient;
import com.amazonaws.services.kinesis.model.DescribeStreamRequest;
Expand Down Expand Up @@ -316,6 +317,94 @@ public void testPoll() throws InterruptedException
Assert.assertEquals(SHARDS_LAG_MILLIS, recordSupplier.getPartitionResourcesTimeLag());
}

@Test
public void testPollWithKinesisInternalFailure() throws InterruptedException
{
recordsPerFetch = 100;

EasyMock.expect(kinesis.getShardIterator(
EasyMock.anyObject(),
EasyMock.eq(SHARD_ID0),
EasyMock.anyString(),
EasyMock.anyString()
)).andReturn(
getShardIteratorResult0).anyTimes();

EasyMock.expect(kinesis.getShardIterator(
EasyMock.anyObject(),
EasyMock.eq(SHARD_ID1),
EasyMock.anyString(),
EasyMock.anyString()
)).andReturn(
getShardIteratorResult1).anyTimes();

EasyMock.expect(getShardIteratorResult0.getShardIterator()).andReturn(SHARD0_ITERATOR).anyTimes();
EasyMock.expect(getShardIteratorResult1.getShardIterator()).andReturn(SHARD1_ITERATOR).anyTimes();
EasyMock.expect(kinesis.getRecords(generateGetRecordsReq(SHARD0_ITERATOR, recordsPerFetch)))
.andReturn(getRecordsResult0)
.anyTimes();
EasyMock.expect(kinesis.getRecords(generateGetRecordsReq(SHARD1_ITERATOR, recordsPerFetch)))
.andReturn(getRecordsResult1)
.anyTimes();
AmazonServiceException getException = new AmazonServiceException("InternalFailure");
getException.setErrorCode("InternalFailure");
getException.setStatusCode(500);
getException.setServiceName("AmazonKinesis");
EasyMock.expect(getRecordsResult0.getRecords()).andThrow(getException).once();
EasyMock.expect(getRecordsResult0.getRecords()).andReturn(SHARD0_RECORDS).once();
AmazonServiceException getException2 = new AmazonServiceException("InternalFailure");
getException2.setErrorCode("InternalFailure");
getException2.setStatusCode(503);
getException2.setServiceName("AmazonKinesis");
EasyMock.expect(getRecordsResult1.getRecords()).andThrow(getException2).once();
EasyMock.expect(getRecordsResult1.getRecords()).andReturn(SHARD1_RECORDS).once();
EasyMock.expect(getRecordsResult0.getNextShardIterator()).andReturn(null).anyTimes();
EasyMock.expect(getRecordsResult1.getNextShardIterator()).andReturn(null).anyTimes();
EasyMock.expect(getRecordsResult0.getMillisBehindLatest()).andReturn(SHARD0_LAG_MILLIS).once();
EasyMock.expect(getRecordsResult0.getMillisBehindLatest()).andReturn(SHARD0_LAG_MILLIS).once();
EasyMock.expect(getRecordsResult1.getMillisBehindLatest()).andReturn(SHARD1_LAG_MILLIS).once();
EasyMock.expect(getRecordsResult1.getMillisBehindLatest()).andReturn(SHARD1_LAG_MILLIS).once();

replayAll();

Set<StreamPartition<String>> partitions = ImmutableSet.of(
StreamPartition.of(STREAM, SHARD_ID0),
StreamPartition.of(STREAM, SHARD_ID1)
);


recordSupplier = new KinesisRecordSupplier(
kinesis,
recordsPerFetch,
0,
2,
false,
100,
5000,
5000,
60000,
100,
true
);

recordSupplier.assign(partitions);
recordSupplier.seekToEarliest(partitions);
recordSupplier.start();

while (recordSupplier.bufferSize() < 14) {
Thread.sleep(100);
}

List<OrderedPartitionableRecord<String, String>> polledRecords = cleanRecords(recordSupplier.poll(
POLL_TIMEOUT_MILLIS));

verifyAll();

Assert.assertEquals(partitions, recordSupplier.getAssignment());
Assert.assertTrue(polledRecords.containsAll(ALL_RECORDS));
Assert.assertEquals(SHARDS_LAG_MILLIS, recordSupplier.getPartitionResourcesTimeLag());
}

@Test
public void testSeek()
throws InterruptedException
Expand Down