Skip to content

Commit

Permalink
Make EC2 Discovery Cache Empty Seed Hosts List
Browse files Browse the repository at this point in the history
Follow up to elastic#50550. Cache empty nodes lists (`fetchDynamicNodes` will return an empty list in case of failure)
now that the plugin properly retries requests to AWS EC2 APIs.
  • Loading branch information
original-brownbear committed Jan 3, 2020
1 parent 675b98f commit fb109cb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
import static org.elasticsearch.discovery.ec2.AwsEc2Service.HostType.TAG_PREFIX;

class AwsEc2SeedHostsProvider implements SeedHostsProvider {

private static final Logger logger = LogManager.getLogger(AwsEc2SeedHostsProvider.class);

private final TransportService transportService;
Expand Down Expand Up @@ -221,22 +221,13 @@ private DescribeInstancesRequest buildDescribeInstancesRequest() {

private final class TransportAddressesCache extends SingleObjectCache<List<TransportAddress>> {

private boolean empty = true;

protected TransportAddressesCache(TimeValue refreshInterval) {
super(refreshInterval, new ArrayList<>());
}

@Override
protected boolean needsRefresh() {
return (empty || super.needsRefresh());
}

@Override
protected List<TransportAddress> refresh() {
final List<TransportAddress> nodes = fetchDynamicNodes();
empty = nodes.isEmpty();
return nodes;
return fetchDynamicNodes();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,10 @@ protected List<TransportAddress> fetchDynamicNodes() {
return new ArrayList<>();
}
};
for (int i=0; i<3; i++) {
for (int i = 0; i < 3; i++) {
provider.getSeedAddresses(null);
}
assertThat(provider.fetchCount, is(3));
assertThat(provider.fetchCount, is(1));
}

public void testGetNodeListCached() throws Exception {
Expand Down

0 comments on commit fb109cb

Please sign in to comment.