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

cloud-aws 2.1.0 doesn't support elasticsearch 1.1.1 

Closes #74.
(cherry picked from commit a9a76e2)
This commit is contained in:
David Pilato 2014-04-18 11:01:50 +02:00
parent 68a8e78b59
commit ecc4577836
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -32,8 +32,8 @@
</parent>
<properties>
<elasticsearch.version>1.0.0</elasticsearch.version>
<lucene.version>4.6.1</lucene.version>
<elasticsearch.version>1.1.1</elasticsearch.version>
<lucene.version>4.7.1</lucene.version>
<tests.output>onerror</tests.output>
<tests.jvms>1</tests.jvms>
<tests.shuffle>true</tests.shuffle>

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

@ -27,6 +27,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodeService;
import org.elasticsearch.common.collect.ImmutableList;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.discovery.DiscoverySettings;
import org.elasticsearch.discovery.zen.ZenDiscovery;
import org.elasticsearch.discovery.zen.ping.ZenPing;
import org.elasticsearch.discovery.zen.ping.ZenPingService;
@ -43,8 +44,9 @@ public class Ec2Discovery extends ZenDiscovery {
@Inject
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, Version.CURRENT);
DiscoveryNodeService discoveryNodeService, AwsEc2Service ec2Service, DiscoverySettings discoverySettings) {
super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService,
discoveryNodeService, pingService, Version.CURRENT, discoverySettings);
if (settings.getAsBoolean("cloud.enabled", true)) {
ImmutableList<? extends ZenPing> zenPings = pingService.zenPings();
UnicastZenPing unicastZenPing = null;

2
src/main/java/org/elasticsearch/gateway/s3/S3Gateway.java
View File

@ -49,7 +49,7 @@ public class S3Gateway extends BlobStoreGateway {
@Inject
public S3Gateway(Settings settings, ThreadPool threadPool, ClusterService clusterService,
ClusterName clusterName, AwsS3Service s3Service) throws IOException {
super(settings, threadPool, clusterService);
super(settings, threadPool, clusterService, clusterName);
String bucket = componentSettings.get("bucket");
if (bucket == null) {

2
src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreTest.java
View File

@ -142,7 +142,7 @@ public class S3SnapshotRestoreTest extends AbstractAwsTest {
// Test restore after index deletion
logger.info("--> delete indices");
wipeIndices("test-idx-1", "test-idx-2");
cluster().wipeIndices("test-idx-1", "test-idx-2");
logger.info("--> restore one index after deletion");
restoreSnapshotResponse = client.admin().cluster().prepareRestoreSnapshot("test-repo", "test-snap").setWaitForCompletion(true).setIndices("test-idx-*", "-test-idx-2").execute().actionGet();
assertThat(restoreSnapshotResponse.getRestoreInfo().totalShards(), greaterThan(0));