summaryrefslogtreecommitdiff
path: root/plugins/repository-azure
diff options
context:
space:
mode:
authorDavid Pilato <david@pilato.fr>2016-01-19 18:02:33 +0100
committerDavid Pilato <david@pilato.fr>2016-01-19 18:02:33 +0100
commit725d7f968b8e08ecffb8a5498fb22e28bef160df (patch)
treea847c944e9165ff5f8ad22e1b05d4cfcd1ed8f7a /plugins/repository-azure
parent6db5b5033cfd84c89a7be1d4ece7654de87ad514 (diff)
parent11e7a746ae30bdb79a54e27a94eb76e90f1984da (diff)
Merge branch 'fix/12567-azure-timeout'
Diffstat (limited to 'plugins/repository-azure')
-rw-r--r--plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java b/plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java
index fb291855d1..3cecd810a9 100644
--- a/plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java
+++ b/plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java
@@ -123,7 +123,7 @@ public class AzureStorageServiceImpl extends AbstractLifecycleComponent<AzureSto
// Set timeout option. Defaults to 5mn. See cloud.azure.storage.timeout or cloud.azure.storage.xxx.timeout
try {
int timeout = (int) azureStorageSettings.getTimeout().getMillis();
- client.getDefaultRequestOptions().setTimeoutIntervalInMs(timeout);
+ client.getDefaultRequestOptions().setMaximumExecutionTimeInMs(timeout);
} catch (ClassCastException e) {
throw new IllegalArgumentException("Can not convert [" + azureStorageSettings.getTimeout() +
"]. It can not be longer than 2,147,483,647ms.");