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

Update to Elasticsearch 0.90.3 

Closes #31.
This commit is contained in:
David Pilato 2013-08-09 09:17:01 +02:00
parent 2c386046f5
commit 8b20e57fd7
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -8,11 +8,11 @@ In order to install the plugin, simply run: `bin/plugin -install elasticsearch/e
-----------------------------------------------
| AWS Cloud Plugin | ElasticSearch |
-----------------------------------------------
| 1.13.0-SNAPSHOT (master) | 0.90 -> master |
| 1.13.0-SNAPSHOT (master) | 0.90.3 -> master |
-----------------------------------------------
| 1.12.0 | 0.90 -> master |
| 1.12.0 | 0.90 -> 0.90.2 |
-----------------------------------------------
| 1.11.0 | 0.90 -> master |
| 1.11.0 | 0.90 -> 0.90.2 |
-----------------------------------------------
| 1.10.0 | 0.19 |
-----------------------------------------------

2
pom.xml
View File

@ -31,7 +31,7 @@
</parent>
<properties>
<elasticsearch.version>0.90.1</elasticsearch.version>
<elasticsearch.version>0.90.3</elasticsearch.version>
</properties>
<repositories>

4
src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java
View File

@ -19,10 +19,10 @@
package org.elasticsearch.cloud.aws.network;
import org.apache.lucene.util.IOUtils;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.cloud.aws.AwsEc2Service;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.io.Closeables;
import org.elasticsearch.common.network.NetworkService.CustomNameResolver;
import org.elasticsearch.common.settings.Settings;
@ -117,7 +117,7 @@ public class Ec2NameResolver extends AbstractComponent implements CustomNameReso
}
return null;
} finally {
Closeables.closeQuietly(in);
IOUtils.closeWhileHandlingException(in);
}
}

4
src/main/java/org/elasticsearch/cloud/aws/node/Ec2CustomNodeAttributes.java
View File

@ -19,12 +19,12 @@
package org.elasticsearch.cloud.aws.node;
import org.apache.lucene.util.IOUtils;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.cloud.aws.AwsEc2Service;
import org.elasticsearch.cluster.node.DiscoveryNodeService;
import org.elasticsearch.common.collect.Maps;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.io.Closeables;
import org.elasticsearch.common.settings.Settings;
import java.io.BufferedReader;
@ -69,7 +69,7 @@ public class Ec2CustomNodeAttributes extends AbstractComponent implements Discov
} catch (IOException e) {
logger.debug("failed to get metadata for [placement/availability-zone]: " + ExceptionsHelper.detailedMessage(e));
} finally {
Closeables.closeQuietly(in);
IOUtils.closeWhileHandlingException(in);
}
return ec2Attributes;

3
src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.discovery.ec2;
import com.amazonaws.services.ec2.AmazonEC2;
import com.amazonaws.services.ec2.model.*;
import org.elasticsearch.Version;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.ImmutableMap;
@ -179,7 +180,7 @@ public class AwsEc2UnicastHostsProvider extends AbstractComponent implements Uni
// we only limit to 1 addresses, makes no sense to ping 100 ports
for (int i = 0; (i < addresses.length && i < UnicastZenPing.LIMIT_PORTS_COUNT); i++) {
logger.trace("adding {}, address {}, transport_address {}", instance.getInstanceId(), address, addresses[i]);
discoNodes.add(new DiscoveryNode("#cloud-" + instance.getInstanceId() + "-" + i, addresses[i]));
discoNodes.add(new DiscoveryNode("#cloud-" + instance.getInstanceId() + "-" + i, addresses[i], Version.CURRENT));
}
} catch (Exception e) {
logger.warn("failed ot add {}, address {}", e, instance.getInstanceId(), address);

3
src/main/java/org/elasticsearch/discovery/ec2/Ec2Discovery.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.discovery.ec2;
import org.elasticsearch.Version;
import org.elasticsearch.cloud.aws.AwsEc2Service;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterService;
@ -43,7 +44,7 @@ public class Ec2Discovery extends ZenDiscovery {
public Ec2Discovery(Settings settings, ClusterName clusterName, ThreadPool threadPool, TransportService transportService,
ClusterService clusterService, NodeSettingsService nodeSettingsService, ZenPingService pingService,
DiscoveryNodeService discoveryNodeService, AwsEc2Service ec2Service) {
super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, discoveryNodeService, pingService);
super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService, discoveryNodeService, pingService, Version.CURRENT);
if (settings.getAsBoolean("cloud.enabled", true)) {
ImmutableList<? extends ZenPing> zenPings = pingService.zenPings();
UnicastZenPing unicastZenPing = null;