From 7c840f6e5d08a025a8f8da8d28d84432f16071fb Mon Sep 17 00:00:00 2001
From: labkey-jeckels <Josh Eckels>
Date: Fri, 10 Apr 2020 18:20:53 -0700
Subject: [PATCH] Issue 39991: Remove FileRootCopyExpectedFailureSimulator and
 FileRootCopyUnexpectedFailureSimulator core module properties

---
 core/resources/module.xml                      | 18 ------------------
 .../core/admin/CopyFileRootPipelineJob.java    |  9 ---------
 2 files changed, 27 deletions(-)
 delete mode 100644 core/resources/module.xml

diff --git a/core/resources/module.xml b/core/resources/module.xml
deleted file mode 100644
index c1e2105b2fa..00000000000
--- a/core/resources/module.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<module xmlns="http://labkey.org/moduleProperties/xml/">
-    <properties>
-        <propertyDescriptor name="FileRootCopyExpectedFailureSimulator">
-            <canSetPerContainer>true</canSetPerContainer>
-            <description>During a migration from one file root to another (say, from local to cloud-based storage), simulate an I/O failure for files that match this regular expression. Note that this is a Java regular expression, not a file wildcard</description>
-            <editPermissions>
-                <permission>ADMIN</permission>
-            </editPermissions>
-        </propertyDescriptor>
-        <propertyDescriptor name="FileRootCopyUnexpectedFailureSimulator">
-            <canSetPerContainer>true</canSetPerContainer>
-            <description>During a migration from one file root to another (say, from local to cloud-based storage), simulate an unexpected type of failure for files that match this regular expression. Note that this is a Java regular expression, not a file wildcard</description>
-            <editPermissions>
-                <permission>ADMIN</permission>
-            </editPermissions>
-        </propertyDescriptor>
-    </properties>
-</module>
\ No newline at end of file
diff --git a/core/src/org/labkey/core/admin/CopyFileRootPipelineJob.java b/core/src/org/labkey/core/admin/CopyFileRootPipelineJob.java
index f583a4a2956..1e6a385cebb 100644
--- a/core/src/org/labkey/core/admin/CopyFileRootPipelineJob.java
+++ b/core/src/org/labkey/core/admin/CopyFileRootPipelineJob.java
@@ -321,15 +321,6 @@ private TaskStatus copyFiles(Path sourceDir, Path destDir, List<Long> lastStatTi
                         setStatus(TaskStatus.running, "Copying files");
                         info("Copying file  '" + pathString + "'");
 
-                        if (matchesCopyFailureSimulatorRegex("FileRootCopyExpectedFailureSimulator", sourceChild.getFileName().toString()))
-                        {
-                            throw new IOException("Simulating an I/O failure copying " + sourceChild);
-                        }
-                        if (matchesCopyFailureSimulatorRegex("FileRootCopyUnexpectedFailureSimulator", sourceChild.getFileName().toString()))
-                        {
-                            throw new NullPointerException("Simulating an unexpected error copying " + sourceChild);
-                        }
-
                         long sourceSize = Files.size(sourceChild);
                         boolean retainExisting = false;