PR feedback: pass copy blob name as request parameter.

Author: bcully

x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/BlobAnalyzeAction.java

@@ -399,17 +399,16 @@ public StreamInput streamInput() throws IOException {
 
         private void onLastReadForInitialWrite() {
             var readBlobName = request.blobName;
-            if (request.doCopy && doEarlyCopy) {
+            if (request.copyBlobName != null && doEarlyCopy) {
                 try {
-                    final var copyName = request.blobName + "_copy";
                     blobContainer.copyBlob(
                         OperationPurpose.REPOSITORY_ANALYSIS,
                         blobContainer,
                         request.blobName,
-                        copyName,
+                        request.copyBlobName,
                         request.targetLength
                     );
-                    readBlobName = copyName;
+                    readBlobName = request.copyBlobName;
                 } catch (UnsupportedOperationException uoe) {
                     // not all repositories support copy
                 } catch (NoSuchFileException | FileNotFoundException ignored) {
@@ -441,17 +440,16 @@ private void doReadAfterWrite() {
                 logger.trace("sending read request to [{}] for [{}] after write complete", readNodes, request.getDescription());
             }
             var readBlobName = request.blobName;
-            if (request.doCopy && (doEarlyCopy == false) && (request.getAbortWrite() == false)) {
+            if (request.copyBlobName != null && doEarlyCopy == false && request.getAbortWrite() == false) {
                 try {
-                    final var copyName = request.blobName + "_copy";
                     blobContainer.copyBlob(
                         OperationPurpose.REPOSITORY_ANALYSIS,
                         blobContainer,
                         request.blobName,
-                        copyName,
+                        request.copyBlobName,
                         request.targetLength
                     );
-                    readBlobName = copyName;
+                    readBlobName = request.copyBlobName;
                 } catch (UnsupportedOperationException uoe) {
                     // not all repositories support copy
                 } catch (IOException e) {
@@ -734,7 +732,8 @@ static class Request extends ActionRequest {
         private final boolean readEarly;
         private final boolean writeAndOverwrite;
         private final boolean abortWrite;
-        private final boolean doCopy;
+        @Nullable
+        private final String copyBlobName;
 
         Request(
             String repositoryName,
@@ -748,7 +747,7 @@ static class Request extends ActionRequest {
             boolean readEarly,
             boolean writeAndOverwrite,
             boolean abortWrite,
-            boolean doCopy
+            @Nullable String copyBlobName
         ) {
             assert 0 < targetLength;
             assert targetLength <= MAX_ATOMIC_WRITE_SIZE || (readEarly == false && writeAndOverwrite == false) : "oversized atomic write";
@@ -764,7 +763,7 @@ static class Request extends ActionRequest {
             this.readEarly = readEarly;
             this.writeAndOverwrite = writeAndOverwrite;
             this.abortWrite = abortWrite;
-            this.doCopy = doCopy;
+            this.copyBlobName = copyBlobName;
         }
 
         Request(StreamInput in) throws IOException {
@@ -781,9 +780,9 @@ static class Request extends ActionRequest {
             writeAndOverwrite = in.readBoolean();
             abortWrite = in.readBoolean();
             if (in.getTransportVersion().onOrAfter(TransportVersions.REPO_ANALYSIS_COPY_BLOB)) {
-                doCopy = in.readBoolean();
+                copyBlobName = in.readOptionalString();
             } else {
-                doCopy = false;
+                copyBlobName = null;
             }
         }
 
@@ -802,8 +801,8 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeBoolean(writeAndOverwrite);
             out.writeBoolean(abortWrite);
             if (out.getTransportVersion().onOrAfter(TransportVersions.REPO_ANALYSIS_COPY_BLOB)) {
-                out.writeBoolean(doCopy);
-            } else if (doCopy) {
+                out.writeOptionalString(copyBlobName);
+            } else if (copyBlobName != null) {
                 assert false : out.getTransportVersion();
                 throw new IllegalStateException(
                     "cannot serialize " + this + "] using transport version [" + out.getTransportVersion() + "]"
@@ -834,8 +833,8 @@ public String getDescription() {
                 + writeAndOverwrite
                 + ", abortWrite="
                 + abortWrite
-                + ", doCopy="
-                + doCopy
+                + ", copyBlobName="
+                + copyBlobName
                 + "]";
         }
 

x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java

@@ -517,22 +517,26 @@ public void run() {
             final List<Long> blobSizes = getBlobSizes(request);
             Collections.shuffle(blobSizes, random);
 
-            for (int i = 0; i < request.getBlobCount(); i++) {
+            int blobCount = request.getBlobCount();
+            for (int i = 0; i < blobCount; i++) {
                 final long targetLength = blobSizes.get(i);
                 final boolean smallBlob = targetLength <= MAX_ATOMIC_WRITE_SIZE; // avoid the atomic API for larger blobs
                 final boolean abortWrite = smallBlob && request.isAbortWritePermitted() && rarely(random);
                 final boolean doCopy = minClusterTransportVersion.onOrAfter(TransportVersions.REPO_ANALYSIS_COPY_BLOB)
-                    && random.nextBoolean();
+                    && rarely(random) && i > 0;
+                final String blobName = "test-blob-" + i + "-" + UUIDs.randomBase64UUID(random);
+                String copyBlobName = null;
                 if (doCopy) {
-                    i++;
-                    if (i >= request.getBlobCount()) {
+                    copyBlobName = blobName + "-copy";
+                    blobCount--;
+                    if (i >= blobCount) {
                         break;
                     }
                 }
                 final BlobAnalyzeAction.Request blobAnalyzeRequest = new BlobAnalyzeAction.Request(
                     request.getRepositoryName(),
                     blobPath,
-                    "test-blob-" + i + "-" + UUIDs.randomBase64UUID(random),
+                    blobName,
                     targetLength,
                     random.nextLong(),
                     nodes,
@@ -541,7 +545,7 @@ public void run() {
                     smallBlob && rarely(random),
                     repository.supportURLRepo() && repository.hasAtomicOverwrites() && smallBlob && rarely(random) && abortWrite == false,
                     abortWrite,
-                    doCopy
+                    copyBlobName
                 );
                 final DiscoveryNode node = nodes.get(random.nextInt(nodes.size()));
                 queue.add(ref -> runBlobAnalysis(ref, blobAnalyzeRequest, node));