Allow specifying a custom LeaseManager in Worker.Builder with tests (#297)

* Allow specifying a custom LeaseManager in Worker.Builder

* Added unit tests for ILeaseManager injection in Worker Builder
This commit is contained in:
Felipe Gasparini 2018-02-14 18:03:49 +01:00 committed by Justin Pfifer
parent d7de6df958
commit 6fc148740d
2 changed files with 53 additions and 2 deletions

View file

@ -33,6 +33,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy; import com.amazonaws.services.kinesis.clientlibrary.proxies.IKinesisProxy;
import com.amazonaws.services.kinesis.leases.interfaces.ILeaseManager;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -424,6 +426,13 @@ public class Worker implements Runnable {
return applicationName; return applicationName;
} }
/**
* @return the leaseCoordinator
*/
KinesisClientLibLeaseCoordinator getLeaseCoordinator(){
return leaseCoordinator;
}
/** /**
* Start consuming data from the stream, and pass it to the application record processors. * Start consuming data from the stream, and pass it to the application record processors.
*/ */
@ -1076,6 +1085,7 @@ public class Worker implements Runnable {
private AmazonDynamoDB dynamoDBClient; private AmazonDynamoDB dynamoDBClient;
private AmazonCloudWatch cloudWatchClient; private AmazonCloudWatch cloudWatchClient;
private IMetricsFactory metricsFactory; private IMetricsFactory metricsFactory;
private ILeaseManager<KinesisClientLease> leaseManager;
private ExecutorService execService; private ExecutorService execService;
private ShardPrioritization shardPrioritization; private ShardPrioritization shardPrioritization;
private IKinesisProxy kinesisProxy; private IKinesisProxy kinesisProxy;
@ -1173,6 +1183,18 @@ public class Worker implements Runnable {
return this; return this;
} }
/**
* Set the lease manager.
*
* @param leaseManager
* Lease manager used to manage shard leases
* @return A reference to this updated object so that method calls can be chained together.
*/
public Builder leaseManager(ILeaseManager<KinesisClientLease> leaseManager) {
this.leaseManager = leaseManager;
return this;
}
/** /**
* Set the executor service for processing records. * Set the executor service for processing records.
* *
@ -1273,6 +1295,9 @@ public class Worker implements Runnable {
if (metricsFactory == null) { if (metricsFactory == null) {
metricsFactory = getMetricsFactory(cloudWatchClient, config); metricsFactory = getMetricsFactory(cloudWatchClient, config);
} }
if (leaseManager == null) {
leaseManager = new KinesisClientLeaseManager(config.getTableName(), dynamoDBClient);
}
if (shardPrioritization == null) { if (shardPrioritization == null) {
shardPrioritization = new ParentsFirstShardPrioritization(1); shardPrioritization = new ParentsFirstShardPrioritization(1);
} }
@ -1294,8 +1319,7 @@ public class Worker implements Runnable {
config.getShardSyncIntervalMillis(), config.getShardSyncIntervalMillis(),
config.shouldCleanupLeasesUponShardCompletion(), config.shouldCleanupLeasesUponShardCompletion(),
null, null,
new KinesisClientLibLeaseCoordinator(new KinesisClientLeaseManager(config.getTableName(), new KinesisClientLibLeaseCoordinator(leaseManager,
dynamoDBClient),
config.getWorkerIdentifier(), config.getWorkerIdentifier(),
config.getFailoverTimeMillis(), config.getFailoverTimeMillis(),
config.getEpsilonMillis(), config.getEpsilonMillis(),

View file

@ -1500,6 +1500,33 @@ public class WorkerTest {
Assert.assertTrue(worker.getStreamConfig().getStreamProxy() instanceof KinesisLocalFileProxy); Assert.assertTrue(worker.getStreamConfig().getStreamProxy() instanceof KinesisLocalFileProxy);
} }
@Test
public void testBuilderWithDefaultLeaseManager() {
IRecordProcessorFactory recordProcessorFactory = mock(IRecordProcessorFactory.class);
Worker worker = new Worker.Builder()
.recordProcessorFactory(recordProcessorFactory)
.config(config)
.build();
Assert.assertNotNull(worker.getLeaseCoordinator().getLeaseManager());
}
@SuppressWarnings("unchecked")
@Test
public void testBuilderWhenLeaseManagerIsSet() {
IRecordProcessorFactory recordProcessorFactory = mock(IRecordProcessorFactory.class);
// Create an instance of ILeaseManager for injection and validation
ILeaseManager<KinesisClientLease> leaseManager = (ILeaseManager<KinesisClientLease>) mock(ILeaseManager.class);
Worker worker = new Worker.Builder()
.recordProcessorFactory(recordProcessorFactory)
.config(config)
.leaseManager(leaseManager)
.build();
Assert.assertSame(leaseManager, worker.getLeaseCoordinator().getLeaseManager());
}
private abstract class InjectableWorker extends Worker { private abstract class InjectableWorker extends Worker {
InjectableWorker(String applicationName, IRecordProcessorFactory recordProcessorFactory, InjectableWorker(String applicationName, IRecordProcessorFactory recordProcessorFactory,
KinesisClientLibConfiguration config, StreamConfig streamConfig, KinesisClientLibConfiguration config, StreamConfig streamConfig,