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

Update to GCE API 1.17.0-rc 

Seen in #9, Google changed its APIs. We need to update as it previous version causes a `404` error.

Closes #12.
Closes #9.
This commit is contained in:
David Pilato 2014-01-29 11:21:45 +01:00
parent b065179367
commit 4f11862cce
4 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
README.md
View File

@ -5,13 +5,13 @@ The GCE Cloud plugin allows to use GCE API for the unicast discovery mechanism.
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-gce/2.0.0.RC1`. In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-gce/2.0.0.RC1`.
| GCE Cloud Plugin | elasticsearch | Release date | | GCE Cloud Plugin | elasticsearch | gce api | Release date |
|----------------------------|---------------------|:------------:| |----------------------------|---------------------|--------------|:------------:|
| 2.0.0-SNAPSHOT (master) | 1.0.0.RC1 -> master | | | 2.0.0-SNAPSHOT (master) | 1.0.0.RC1 -> master | 1.17.0-rc | |
| 2.0.0.RC1 | 1.0.0.RC1 -> master | 2014-01-15 | | 2.0.0.RC1 | 1.0.0.RC1 -> master | 1.15.0-rc | 2014-01-15 |
| 1.2.0-SNAPSHOT (1.x) | 0.90.3 -> 0.90 | | | 1.2.0-SNAPSHOT (1.x) | 0.90.3 -> 0.90 | 1.17.0-rc | |
| 1.1.0 | 0.90.3 -> 0.90 | 2013-08-09 | | 1.1.0 | 0.90.3 -> 0.90 | 1.15.0-rc | 2013-08-09 |
| 1.0.0 | 0.90.0 -> 0.90.2 | 2013-07-23 | | 1.0.0 | 0.90.0 -> 0.90.2 | 1.15.0-rc | 2013-07-23 |
Google Compute Engine Virtual Machine Discovery Google Compute Engine Virtual Machine Discovery
@ -98,13 +98,13 @@ sudo apt-get update
sudo apt-get install curl sudo apt-get install curl
# Download Elasticsearch # Download Elasticsearch
curl https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.2.deb -o elasticsearch-0.90.2.deb wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.0.0.RC1.deb
# Prepare Java installation # Prepare Java installation
sudo apt-get install java7-runtime-headless sudo apt-get install java7-runtime-headless
# Prepare Elasticsearch installation # Prepare Elasticsearch installation
sudo dpkg -i elasticsearch-0.90.2.deb sudo dpkg -i elasticsearch-1.0.0.RC1.deb
# Check that elasticsearch is running: # Check that elasticsearch is running:
curl http://localhost:9200/ curl http://localhost:9200/
@ -116,10 +116,13 @@ This command should give you a JSON result:
{ {
"ok" : true, "ok" : true,
"status" : 200, "status" : 200,
"name" : "Lunatica", "name" : "Shriker",
"version" : { "version" : {
"number" : "0.90.2", "number" : "1.0.0.RC1",
"snapshot_build" : false "build_hash" : "0a5781f44876e8d1c30b6360628d59cb2a7a2bbb",
"build_timestamp" : "2014-01-10T10:18:37Z",
"build_snapshot" : false,
"lucene_version" : "4.6"
}, },
"tagline" : "You Know, for Search" "tagline" : "You Know, for Search"
} }
@ -131,8 +134,7 @@ Install the plugin:
```sh ```sh
# Use Plugin Manager to install it # Use Plugin Manager to install it
sudo /usr/share/elasticsearch/bin/plugin sudo /usr/share/elasticsearch/bin/plugin --install elasticsearch/elasticsearch-cloud-gce/2.0.0.RC1
--install elasticsearch/elasticsearch-cloud-gce/1.1.0
# Configure it: # Configure it:
sudo vi /etc/elasticsearch/elasticsearch.yml sudo vi /etc/elasticsearch/elasticsearch.yml
@ -206,7 +208,7 @@ gcutil listkernels --project es-cloud
| projects/google/global/kernels/gce-v20130603 | SCSI-enabled 3.3.8-gcg built 2013-05-29 01:04:00 | | | projects/google/global/kernels/gce-v20130603 | SCSI-enabled 3.3.8-gcg built 2013-05-29 01:04:00 | |
+----------------------------------------------+--------------------------------------------------+-------------+ +----------------------------------------------+--------------------------------------------------+-------------+
# Note the kernel you prefer to use and add your image to your catalog: # Note the kernel you prefer to use and add your image to your catalog:
gcutil --project=es-cloud addimage elasticsearch-0-90-2 \ gcutil --project=es-cloud addimage elasticsearch-1-0-0-RC1 \
gs://esimage/e4686d7f5bf904a924ae0cfeb58d0827c6d5b966.image.tar.gz \ gs://esimage/e4686d7f5bf904a924ae0cfeb58d0827c6d5b966.image.tar.gz \
--preferred_kernel=projects/google/global/kernels/gce-v20130603 --preferred_kernel=projects/google/global/kernels/gce-v20130603
@ -220,7 +222,7 @@ As you have now an image, you can create as many instances as you need:
```sh ```sh
# Just change node name (here myesnode2) # Just change node name (here myesnode2)
gcutil --project=es-cloud addinstance --image=elasticsearch-0-90-2 \ gcutil --project=es-cloud addinstance --image=elasticsearch-1-0-0-RC1 \
--kernel=projects/google/global/kernels/gce-v20130603 myesnode2 \ --kernel=projects/google/global/kernels/gce-v20130603 myesnode2 \
--zone europe-west1-a --machine_type f1-micro --service_account_scope=compute-rw \ --zone europe-west1-a --machine_type f1-micro --service_account_scope=compute-rw \
--persistent_boot_disk --persistent_boot_disk
@ -293,7 +295,7 @@ gcutil --project=es-cloud addinstance myesnode1 \
--metadata=es_port:9301 --metadata=es_port:9301
# when creating an instance from an image # when creating an instance from an image
gcutil --project=es-cloud addinstance --image=elasticsearch-0-90-2 \ gcutil --project=es-cloud addinstance --image=elasticsearch-1-0-0-RC1 \
--kernel=projects/google/global/kernels/gce-v20130603 myesnode2 \ --kernel=projects/google/global/kernels/gce-v20130603 myesnode2 \
--zone europe-west1-a --machine_type f1-micro --service_account_scope=compute-rw \ --zone europe-west1-a --machine_type f1-micro --service_account_scope=compute-rw \
--persistent_boot_disk --metadata=es_port:9301 --persistent_boot_disk --metadata=es_port:9301
@ -340,7 +342,7 @@ License
This software is licensed under the Apache 2 license, quoted below. This software is licensed under the Apache 2 license, quoted below.
Copyright 2009-2013 ElasticSearch <http://www.elasticsearch.org> Copyright 2009-2014 Elasticsearch <http://www.elasticsearch.org>
Licensed under the Apache License, Version 2.0 (the "License"); you may not Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of use this file except in compliance with the License. You may obtain a copy of

16
pom.xml
View File

@ -48,8 +48,8 @@ governing permissions and limitations under the License. -->
<properties> <properties>
<elasticsearch.version>1.0.0.RC1</elasticsearch.version> <elasticsearch.version>1.0.0.RC1</elasticsearch.version>
<google.gce.version>v1beta15-rev3-1.15.0-rc</google.gce.version> <google.gce.version>v1beta16-rev1-1.17.0-rc</google.gce.version>
<google.api.version>1.15.0-rc</google.api.version> <google.api.version>1.17.0-rc</google.api.version>
<lucene.version>4.6.0</lucene.version> <lucene.version>4.6.0</lucene.version>
<tests.jvms>1</tests.jvms> <tests.jvms>1</tests.jvms>
<tests.shuffle>true</tests.shuffle> <tests.shuffle>true</tests.shuffle>
@ -109,6 +109,18 @@ governing permissions and limitations under the License. -->
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3.RC2</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>

5
src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java
View File

@ -123,6 +123,11 @@ public class GceUnicastHostsProvider extends AbstractComponent implements Unicas
try { try {
Collection<Instance> instances = gceComputeService.instances(); Collection<Instance> instances = gceComputeService.instances();
if (instances == null) {
logger.trace("no instance found for project [{}], zone [{}].", this.project, this.zone);
return cachedDiscoNodes;
}
for (Instance instance : instances) { for (Instance instance : instances) {
String name = instance.getName(); String name = instance.getName();
String type = instance.getMachineType(); String type = instance.getMachineType();

2
src/test/resources/log4j.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!-- Licensed to ElasticSearch under one or more contributor <!-- Licensed to Elasticsearch under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. ElasticSearch licenses this file to you information regarding copyright ownership. ElasticSearch licenses this file to you
under the Apache License, Version 2.0 (the "License"); you may not use this under the Apache License, Version 2.0 (the "License"); you may not use this