honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to jclouds 1-beta6

This commit is contained in:
kimchy 2010-05-27 02:28:31 +03:00
parent 74fa3ed32f
commit ad5a4dde83
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.idea/modules/plugins-cloud.iml
View File

@ -28,31 +28,32 @@
<root url="jar://$GRADLE_REPOSITORY$/com.google.guava/guava-base/jars/guava-base-r03.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/com.google.guava/guava-collections/jars/guava-collections-r03.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/com.google.code.guice/guice/jars/guice-2.1-r1128.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-compute/jars/jclouds-compute-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-bluelock/jars/jclouds-bluelock-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-core/jars/jclouds-core-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-aws/jars/jclouds-aws-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-terremark/jars/jclouds-terremark-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-gogrid/jars/jclouds-gogrid-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-atmos/jars/jclouds-atmos-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-jsch/jars/jclouds-jsch-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-blobstore/jars/jclouds-blobstore-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-hostingdotcom/jars/jclouds-hostingdotcom-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-azure/jars/jclouds-azure-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-rimuhosting/jars/jclouds-rimuhosting-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-scriptbuilder/jars/jclouds-scriptbuilder-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-vcloud/jars/jclouds-vcloud-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-rackspace/jars/jclouds-rackspace-1.0-beta-5.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jboss.resteasy/resteasy-jaxrs-client/jars/resteasy-jaxrs-client-1.2.1.GA.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-terremark/jars/jclouds-terremark-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-rackspace/jars/jclouds-rackspace-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-blobstore/jars/jclouds-blobstore-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-gogrid/jars/jclouds-gogrid-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-jsch/jars/jclouds-jsch-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-bluelock/jars/jclouds-bluelock-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-aws/jars/jclouds-aws-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-hostingdotcom/jars/jclouds-hostingdotcom-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-compute/jars/jclouds-compute-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-scriptbuilder/jars/jclouds-scriptbuilder-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-atmos/jars/jclouds-atmos-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-core/jars/jclouds-core-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-vcloud/jars/jclouds-vcloud-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-rimuhosting/jars/jclouds-rimuhosting-1.0-beta-6.jar!/" />
<root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-azure/jars/jclouds-azure-1.0-beta-6.jar!/" />
</CLASSES>
<JAVADOC>
<root url="http://jclouds.rimuhosting.com/apidocs/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-5/core/src/jclouds-compute-1.0-beta-5-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-5/core/src/jclouds-core-1.0-beta-5-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-5/core/src/jclouds-blobstore-1.0-beta-5-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-5/providers/aws/src/jclouds-aws-1.0-beta-5-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-6/providers/rackspace/src/jclouds-rackspace-1.0-beta-6-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-6/providers/aws/src/jclouds-aws-1.0-beta-6-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-6/core/src/jclouds-compute-1.0-beta-6-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-6/core/src/jclouds-core-1.0-beta-6-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../opt/jclouds/1.0-beta-6/core/src/jclouds-blobstore-1.0-beta-6-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>

2
plugins/cloud/build.gradle
View File

@ -32,7 +32,7 @@ repositories {
mavenRepo urls: "http://java-xmlbuilder.googlecode.com/svn/repo"
}
jcloudsVersion = "1.0-beta-5"
jcloudsVersion = "1.0-beta-6"
dependencies {
compile project(':elasticsearch')

15
plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudZenPing.java
View File

@ -32,10 +32,8 @@ import org.jclouds.compute.ComputeService;
import org.jclouds.compute.domain.ComputeMetadata;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeState;
import org.jclouds.compute.options.GetNodesOptions;
import org.jclouds.domain.Location;
import java.net.InetAddress;
import java.util.List;
import java.util.Set;
@ -67,7 +65,7 @@ public class CloudZenPing extends UnicastZenPing {
@Override protected List<DiscoveryNode> buildDynamicNodes() {
List<DiscoveryNode> discoNodes = newArrayList();
Set<? extends ComputeMetadata> nodes = computeService.listNodes(GetNodesOptions.Builder.withDetails());
Set<? extends ComputeMetadata> nodes = computeService.listNodes();
if (logger.isTraceEnabled()) {
StringBuilder sb = new StringBuilder("Processing Nodes:");
for (ComputeMetadata node : nodes) {
@ -76,7 +74,12 @@ public class CloudZenPing extends UnicastZenPing {
logger.trace(sb.toString());
}
for (ComputeMetadata node : nodes) {
NodeMetadata nodeMetadata = (NodeMetadata) node;
NodeMetadata nodeMetadata;
if (node instanceof NodeMetadata) {
nodeMetadata = (NodeMetadata) node;
} else {
nodeMetadata = computeService.getNodeMetadata(node.getId());
}
if (tag != null && !nodeMetadata.getTag().equals(tag)) {
logger.trace("Filtering node {} with unmatched tag {}", nodeMetadata.getName(), nodeMetadata.getTag());
continue;
@ -102,9 +105,9 @@ public class CloudZenPing extends UnicastZenPing {
}
if (nodeMetadata.getState() == NodeState.PENDING || nodeMetadata.getState() == NodeState.RUNNING) {
logger.debug("Adding {}, addresses {}", nodeMetadata.getName(), nodeMetadata.getPrivateAddresses());
for (InetAddress inetAddress : nodeMetadata.getPrivateAddresses()) {
for (String inetAddress : nodeMetadata.getPrivateAddresses()) {
for (int port : new PortsRange(ports).ports()) {
discoNodes.add(new DiscoveryNode("#cloud-" + inetAddress.getHostAddress() + "-" + port, new InetSocketTransportAddress(inetAddress, port)));
discoNodes.add(new DiscoveryNode("#cloud-" + inetAddress + "-" + port, new InetSocketTransportAddress(inetAddress, port)));
}
}
}