|
@@ -27,6 +27,8 @@ import org.elasticsearch.test.ESTestCase;
|
|
|
import java.net.URI;
|
|
|
|
|
|
import static org.hamcrest.Matchers.is;
|
|
|
+import static org.hamcrest.Matchers.lessThan;
|
|
|
+import static org.hamcrest.Matchers.nullValue;
|
|
|
|
|
|
public class AzureStorageServiceTests extends ESTestCase {
|
|
|
final static Settings settings = Settings.builder()
|
|
@@ -126,18 +128,30 @@ public class AzureStorageServiceTests extends ESTestCase {
|
|
|
AzureStorageServiceImpl azureStorageService = new AzureStorageServiceMock(timeoutSettings);
|
|
|
azureStorageService.doStart();
|
|
|
CloudBlobClient client1 = azureStorageService.getSelectedClient("azure1", LocationMode.PRIMARY_ONLY);
|
|
|
- assertThat(client1.getDefaultRequestOptions().getMaximumExecutionTimeInMs(), is(10 * 1000));
|
|
|
+ assertThat(client1.getDefaultRequestOptions().getTimeoutIntervalInMs(), is(10 * 1000));
|
|
|
CloudBlobClient client3 = azureStorageService.getSelectedClient("azure3", LocationMode.PRIMARY_ONLY);
|
|
|
- assertThat(client3.getDefaultRequestOptions().getMaximumExecutionTimeInMs(), is(30 * 1000));
|
|
|
+ assertThat(client3.getDefaultRequestOptions().getTimeoutIntervalInMs(), is(30 * 1000));
|
|
|
}
|
|
|
|
|
|
public void testGetSelectedClientDefaultTimeout() {
|
|
|
AzureStorageServiceImpl azureStorageService = new AzureStorageServiceMock(settings);
|
|
|
azureStorageService.doStart();
|
|
|
CloudBlobClient client1 = azureStorageService.getSelectedClient("azure1", LocationMode.PRIMARY_ONLY);
|
|
|
- assertThat(client1.getDefaultRequestOptions().getMaximumExecutionTimeInMs(), is(5 * 60 * 1000));
|
|
|
+ assertThat(client1.getDefaultRequestOptions().getTimeoutIntervalInMs(), nullValue());
|
|
|
CloudBlobClient client3 = azureStorageService.getSelectedClient("azure3", LocationMode.PRIMARY_ONLY);
|
|
|
- assertThat(client3.getDefaultRequestOptions().getMaximumExecutionTimeInMs(), is(30 * 1000));
|
|
|
+ assertThat(client3.getDefaultRequestOptions().getTimeoutIntervalInMs(), is(30 * 1000));
|
|
|
+ }
|
|
|
+
|
|
|
+ public void testGetSelectedClientNoTimeout() {
|
|
|
+ Settings timeoutSettings = Settings.builder()
|
|
|
+ .put("cloud.azure.storage.azure.account", "myaccount")
|
|
|
+ .put("cloud.azure.storage.azure.key", "mykey")
|
|
|
+ .build();
|
|
|
+
|
|
|
+ AzureStorageServiceImpl azureStorageService = new AzureStorageServiceMock(timeoutSettings);
|
|
|
+ azureStorageService.doStart();
|
|
|
+ CloudBlobClient client1 = azureStorageService.getSelectedClient("azure", LocationMode.PRIMARY_ONLY);
|
|
|
+ assertThat(client1.getDefaultRequestOptions().getTimeoutIntervalInMs(), is(nullValue()));
|
|
|
}
|
|
|
|
|
|
/**
|