Repository: ignite Updated Branches: refs/heads/ignite-zk 9e79588cd -> 75a8c742a
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75a8c742 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75a8c742 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75a8c742 Branch: refs/heads/ignite-zk Commit: 75a8c742aeb2524f1281d8d99c1b0308aa789a47 Parents: 9e79588 Author: sboikov <[email protected]> Authored: Tue Jan 9 11:22:40 2018 +0300 Committer: sboikov <[email protected]> Committed: Tue Jan 9 11:22:40 2018 +0300 ---------------------------------------------------------------------- .../ipfinder/elb/TcpDiscoveryElbIpFinder.java | 29 +++----------------- 1 file changed, 4 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/75a8c742/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinder.java b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinder.java index cfce92a..05137d3 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinder.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinder.java @@ -19,22 +19,15 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.elb; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.ec2.AmazonEC2; import com.amazonaws.services.ec2.AmazonEC2ClientBuilder; -import com.amazonaws.services.ec2.model.DescribeInstancesRequest; import com.amazonaws.services.elasticloadbalancing.AmazonElasticLoadBalancing; import com.amazonaws.services.elasticloadbalancing.AmazonElasticLoadBalancingClientBuilder; -import com.amazonaws.services.elasticloadbalancing.model.DescribeLoadBalancersRequest; -import com.amazonaws.services.elasticloadbalancing.model.Instance; -import com.amazonaws.services.elasticloadbalancing.model.LoadBalancerDescription; +import java.net.InetSocketAddress; +import java.util.Collection; import org.apache.ignite.spi.IgniteSpiConfiguration; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter; -import java.net.InetSocketAddress; -import java.util.Collection; -import java.util.List; - import static com.amazonaws.util.StringUtils.isNullOrEmpty; -import static java.util.stream.Collectors.toList; /** * AWS ELB-based IP finder. @@ -89,22 +82,8 @@ public class TcpDiscoveryElbIpFinder extends TcpDiscoveryIpFinderAdapter { public Collection<InetSocketAddress> getRegisteredAddresses() throws IgniteSpiException { initClients(); - DescribeLoadBalancersRequest req = new DescribeLoadBalancersRequest().withLoadBalancerNames(loadBalancerName); - - List<String> instanceIds = amazonELBClient.describeLoadBalancers(req) - .getLoadBalancerDescriptions() - .stream() - .map(LoadBalancerDescription::getInstances) - .flatMap(instances -> instances.stream()) - .map(Instance::getInstanceId) - .collect(toList()); - - return amazonEC2Client.describeInstances(new DescribeInstancesRequest().withInstanceIds(instanceIds)) - .getReservations() - .stream() - .flatMap(reservation -> reservation.getInstances().stream()) - .map(instance -> new InetSocketAddress(instance.getPrivateIpAddress(), 0)) - .collect(toList()); + // TODO ZK + return null; } /**
