Update to elasticsearch 1.3.0

Closes #17.

Author: dadoonet

README.md

@@ -6,20 +6,19 @@ The Azure Cloud plugin allows to use Azure API for the unicast discovery mechani
 In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-azure/2.3.0`.
 
 * For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-cloud-azure/tree/master).
+* For 1.3.x elasticsearch versions, look at [es-1.3 branch](https://github.com/elasticsearch/elasticsearch-cloud-azure/tree/es-1.3).
 * For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-cloud-azure/tree/es-1.2).
 * For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-cloud-azure/tree/es-1.1).
 * For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-cloud-azure/tree/es-1.0).
 * For 0.90.x elasticsearch versions, look at [es-0.90 branch](https://github.com/elasticsearch/elasticsearch-cloud-azure/tree/es-0.90).
 
 |     Azure Cloud Plugin      |    elasticsearch    | Release date |
 |-----------------------------|---------------------|:------------:|
-| 2.3.1-SNAPSHOT              | 1.2.0 -> 1.2        |  XXXX-XX-XX  |
-| 2.3.0                       | 1.2.0 -> 1.2        |  2014-06-19  |
+| 2.4.0-SNAPSHOT              | 1.3                 |  XXXX-XX-XX  |
 
 Please read documentation relative to the version you are using:
 
-* [2.3.1-SNAPSHOT](https://github.com/elasticsearch/elasticsearch-cloud-azure/blob/es-1.2/README.md)
-* [2.3.0](https://github.com/elasticsearch/elasticsearch-cloud-azure/blob/v2.3.0/README.md)
+* [2.4.0-SNAPSHOT](https://github.com/elasticsearch/elasticsearch-cloud-azure/blob/es-1.3/README.md)
 
 
 Azure Virtual Machine Discovery
@@ -29,17 +28,17 @@ Azure VM discovery allows to use the azure APIs to perform automatic discovery (
 multicast environments). Here is a simple sample configuration:
 
 ```
-    cloud:
-        azure:
-            keystore: /path/to/keystore
-            password: your_password_for_keystore
-            subscription_id: your_azure_subscription_id
-            service_name: your_azure_cloud_service_name
-    discovery:
-            type: azure
-
-    # recommended
-    # path.data: /mnt/resource/elasticsearch/data
+cloud:
+    azure:
+        keystore: /path/to/keystore
+        password: your_password_for_keystore
+        subscription_id: your_azure_subscription_id
+        service_name: your_azure_cloud_service_name
+discovery:
+        type: azure
+
+# recommended
+# path.data: /mnt/resource/elasticsearch/data
 ```
 
 How to start (short story)
@@ -263,17 +262,17 @@ And add the following lines:
 
 ```yaml
 # If you don't remember your account id, you may get it with `azure account list`
-    cloud:
-        azure:
-            keystore: /home/elasticsearch/azurekeystore.pkcs12
-            password: your_password_for_keystore
-            subscription_id: your_azure_subscription_id
-            service_name: your_azure_cloud_service_name
-    discovery:
-            type: azure
+cloud:
+    azure:
+        keystore: /home/elasticsearch/azurekeystore.pkcs12
+        password: your_password_for_keystore
+        subscription_id: your_azure_subscription_id
+        service_name: your_azure_cloud_service_name
+discovery:
+        type: azure
 
 # Recommended
-    path.data: /mnt/resource/elasticsearch/data
+path.data: /mnt/resource/elasticsearch/data
 ```
 
 Restart elasticsearch:
@@ -349,10 +348,10 @@ Azure Repository
 To enable Azure repositories, you have first to set your azure storage settings:
 
 ```
-    cloud:
-        azure:
-            storage_account: your_azure_storage_account
-            storage_key: your_azure_storage_key
+cloud:
+    azure:
+        storage_account: your_azure_storage_account
+        storage_key: your_azure_storage_key
 ```
 
 The Azure repository supports following settings:
@@ -404,10 +403,10 @@ Integrations tests in this plugin require working Azure configuration and theref
 To enable tests prepare a config file elasticsearch.yml with the following content:
 
 ```
-  cloud:
-      azure:
-          account: "YOUR-AZURE-STORAGE-NAME"
-          key: "YOUR-AZURE-STORAGE-KEY"
+cloud:
+  azure:
+      account: "YOUR-AZURE-STORAGE-NAME"
+      key: "YOUR-AZURE-STORAGE-KEY"
 ```
 
 Replaces `account`, `key` with your settings. Please, note that the test will delete all snapshot/restore related files in the specified bucket.

pom.xml

@@ -16,7 +16,7 @@ governing permissions and limitations under the License. -->
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-cloud-azure</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Elasticsearch Azure cloud plugin</name>
     <description>The Azure Cloud plugin allows to use Azure API for the unicast discovery mechanism and add Azure storage repositories.</description>
@@ -43,7 +43,7 @@ governing permissions and limitations under the License. -->
     </parent>
 
     <properties>
-        <elasticsearch.version>1.2.1</elasticsearch.version>
+        <elasticsearch.version>1.3.0-SNAPSHOT</elasticsearch.version>
         <lucene.version>4.8.1</lucene.version>
         <tests.output>onerror</tests.output>
         <tests.shuffle>true</tests.shuffle>

src/test/java/org/elasticsearch/discovery/azure/AbstractAzureComputeServiceTest.java

@@ -24,6 +24,7 @@
 import org.elasticsearch.cloud.azure.AzureComputeService;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.plugins.PluginsService;
 
 public abstract class AbstractAzureComputeServiceTest extends AbstractAzureTest {
 
@@ -43,6 +44,7 @@ protected void checkNumberOfNodes(int expected) {
 
     protected Settings settingsBuilder() {
         ImmutableSettings.Builder builder = ImmutableSettings.settingsBuilder()
+                .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
                 .put("discovery.type", "azure")
                 .put("cloud.azure.api.impl", mock)
                 // We add a fake subscription_id to start mock compute service

src/test/java/org/elasticsearch/discovery/azure/AzureMinimumMasterNodesTest.java

@@ -25,6 +25,8 @@
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
+import java.io.IOException;
+
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
@@ -51,21 +53,21 @@ protected final Settings settingsBuilder() {
     }
 
     @Test
-    public void simpleOnlyMasterNodeElection() {
+    public void simpleOnlyMasterNodeElection() throws IOException {
         logger.info("--> start data node / non master node");
-        cluster().startNode(settingsBuilder());
+        internalCluster().startNode(settingsBuilder());
         try {
             assertThat(client().admin().cluster().prepareState().setMasterNodeTimeout("100ms").execute().actionGet().getState().nodes().masterNodeId(), nullValue());
             fail("should not be able to find master");
         } catch (MasterNotDiscoveredException e) {
             // all is well, no master elected
         }
         logger.info("--> start another node");
-        cluster().startNode(settingsBuilder());
+        internalCluster().startNode(settingsBuilder());
         assertThat(client().admin().cluster().prepareState().setMasterNodeTimeout("1s").execute().actionGet().getState().nodes().masterNodeId(), notNullValue());
 
         logger.info("--> stop master node");
-        cluster().stopCurrentMasterNode();
+        internalCluster().stopCurrentMasterNode();
 
         try {
             assertThat(client().admin().cluster().prepareState().setMasterNodeTimeout("1s").execute().actionGet().getState().nodes().masterNodeId(), nullValue());
@@ -75,7 +77,7 @@ public void simpleOnlyMasterNodeElection() {
         }
 
         logger.info("--> start another node");
-        cluster().startNode(settingsBuilder());
+        internalCluster().startNode(settingsBuilder());
         assertThat(client().admin().cluster().prepareState().setMasterNodeTimeout("1s").execute().actionGet().getState().nodes().masterNodeId(), notNullValue());
     }
 }

src/test/java/org/elasticsearch/discovery/azure/AzureSimpleTest.java

@@ -37,7 +37,7 @@ public AzureSimpleTest() {
     @Test
     public void one_node_should_run() {
         logger.info("--> start one node");
-        cluster().startNode(settingsBuilder());
+        internalCluster().startNode(settingsBuilder());
         assertThat(client().admin().cluster().prepareState().setMasterNodeTimeout("1s").execute().actionGet().getState().nodes().masterNodeId(), notNullValue());
 
         // We expect having 1 node as part of the cluster, let's test that

src/test/java/org/elasticsearch/discovery/azure/AzureTwoStartedNodesTest.java

@@ -37,11 +37,11 @@ public AzureTwoStartedNodesTest() {
     @Test
     public void two_nodes_should_run() {
         logger.info("--> start first node");
-        cluster().startNode(settingsBuilder());
+        internalCluster().startNode(settingsBuilder());
         assertThat(client().admin().cluster().prepareState().setMasterNodeTimeout("1s").execute().actionGet().getState().nodes().masterNodeId(), notNullValue());
 
         logger.info("--> start another node");
-        cluster().startNode(settingsBuilder());
+        internalCluster().startNode(settingsBuilder());
         assertThat(client().admin().cluster().prepareState().setMasterNodeTimeout("1s").execute().actionGet().getState().nodes().masterNodeId(), notNullValue());
 
         // We expect having 2 nodes as part of the cluster, let's test that

src/test/java/org/elasticsearch/repositories/azure/AbstractAzureRepositoryServiceTest.java

@@ -26,6 +26,7 @@
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.repositories.RepositoryMissingException;
 import org.elasticsearch.test.store.MockDirectoryHelper;
 import org.junit.After;
@@ -65,6 +66,7 @@ public static void wipeRepositories(String... repositories) {
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
         ImmutableSettings.Builder builder = ImmutableSettings.settingsBuilder()
+                .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
                 .put("cloud.azure." + AzureStorageService.Fields.ACCOUNT, "mock_azure_account")
                 .put("cloud.azure." + AzureStorageService.Fields.KEY, "mock_azure_key")
                 .put("repositories.azure.api.impl", mock)
@@ -94,9 +96,9 @@ public final void wipe() throws StorageException, ServiceException, URISyntaxExc
      * Purge the test container
      */
     public void cleanRepositoryFiles(String path) throws StorageException, ServiceException, URISyntaxException {
-        String container = cluster().getInstance(Settings.class).get("repositories.azure.container");
+        String container = internalCluster().getInstance(Settings.class).get("repositories.azure.container");
         logger.info("--> remove blobs in container [{}]", container);
-        AzureStorageService client = cluster().getInstance(AzureStorageService.class);
+        AzureStorageService client = internalCluster().getInstance(AzureStorageService.class);
         client.deleteFiles(container, path);
     }
 }

src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreITest.java

@@ -245,10 +245,10 @@ public static void wipeRepositories(String... repositories) {
      * Purge the test container
      */
     public void cleanRepositoryFiles(String path) throws StorageException, ServiceException, URISyntaxException {
-        String container = cluster().getInstance(Settings.class).get("repositories.azure.container",
+        String container = internalCluster().getInstance(Settings.class).get("repositories.azure.container",
                 AzureRepository.CONTAINER_DEFAULT);
         logger.info("--> remove blobs in container [{}], path [{}]", container, path);
-        AzureStorageService client = cluster().getInstance(AzureStorageService.class);
+        AzureStorageService client = internalCluster().getInstance(AzureStorageService.class);
 
         // Remove starting / if any
         path = Strings.trimLeadingCharacter(path, '/');

src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTest.java

@@ -36,6 +36,7 @@
 @ElasticsearchIntegrationTest.ClusterScope(
         scope = ElasticsearchIntegrationTest.Scope.SUITE,
         numDataNodes = 1,
+        numClientNodes = 0,
         transportClientRatio = 0.0)
 public class AzureSnapshotRestoreTest extends AbstractAzureRepositoryServiceTest {