Take into account range start to compute the current stream end on url repositories. (#70509)

Closes #70310

Author: fcofdez

modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/HttpURLBlobContainer.java

@@ -12,6 +12,7 @@
 import org.elasticsearch.common.blobstore.url.URLBlobContainer;
 import org.elasticsearch.common.blobstore.url.URLBlobStore;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -33,6 +34,10 @@ public HttpURLBlobContainer(URLBlobStore blobStore,
 
     @Override
     public InputStream readBlob(String name, long position, long length) throws IOException {
+        if (length == 0) {
+            return new ByteArrayInputStream(new byte[0]);
+        }
+
         return new RetryingHttpInputStream(name,
             getURIForBlob(name),
             position,

modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/RetryingHttpInputStream.java

@@ -220,7 +220,7 @@ private HttpResponseInputStream openInputStream() throws IOException {
                             " Status code: [" + statusCode + "] - Body: " + body));
                     }
 
-                    currentStreamLastOffset = getStreamLength(response);
+                    currentStreamLastOffset = Math.addExact(Math.addExact(start, totalBytesRead), getStreamLength(response));
 
                     return response.getInputStream();
                 } catch (URLHttpClientException e) {

modules/repository-url/src/test/java/org/elasticsearch/common/blobstore/url/URLBlobContainerRetriesTests.java

@@ -41,12 +41,6 @@ public static void tearDownHttpClient() throws IOException {
         factory.close();
     }
 
-    @Override
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/70310")
-    public void testReadRangeBlobWithRetries() {
-
-    }
-
     @Override
     protected String downloadStorageEndpoint(String blob) {
         return "/" + blob;