[TEST] fixes SharedClusterSnapshotRestoreIT test so it assumes we are

working with a repository that supports atomic move operations
elastic · Jan 25, 2017 · d5d2a91 · d5d2a91
1 parent 5fb69de
commit d5d2a91
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java b/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java
@@ -267,9 +267,7 @@ private void maybeIOExceptionOrBlock(String blobName) throws IOException {
                             }
                         }
                     }
-                }
-                // don't block on the index-N files, as getRepositoryData depends on it
-                else if (blobName.startsWith("index-") == false) {
+                } else {
                     if (shouldFail(blobName, randomControlIOExceptionRate) && (incrementAndGetFailureCount() < maximumNumberOfFailures)) {
                         logger.info("throwing random IOException for file [{}] at path [{}]", blobName, path());
                         throw new IOException("Random IOException");
@@ -324,17 +322,9 @@ public Map<String, BlobMetaData> listBlobsByPrefix(String blobNamePrefix) throws
 
             @Override
             public void move(String sourceBlob, String targetBlob) throws IOException {
-                if (RandomizedContext.current().getRandom().nextBoolean()) {
-                    // simulate a non-atomic move, since many blob container implementations
-                    // will not have an atomic move, and we should be able to handle that
-                    maybeIOExceptionOrBlock(targetBlob);
-                    super.writeBlob(targetBlob, super.readBlob(sourceBlob), 0L);
-                    super.deleteBlob(sourceBlob);
-                } else {
-                    // atomic move since this inherits from FsBlobContainer which provides atomic moves
-                    maybeIOExceptionOrBlock(targetBlob);
-                    super.move(sourceBlob, targetBlob);
-                }
+                // atomic move since this inherits from FsBlobContainer which provides atomic moves
+                maybeIOExceptionOrBlock(targetBlob);
+                super.move(sourceBlob, targetBlob);
             }
 
             @Override