If atomic move fails, perform a normal move (#4221)

* Move previously experimental endpoints to their correct locations Also deprecated old endpoints in favour of the new endpoints, as the old ones will cease to function when altair comes online. fixes #3703 Signed-off-by: Paul Harris <[email protected]>
Consensys · Aug 6, 2021 · c18fe87 · c18fe87
1 parent e137ce3
commit c18fe87
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/teku/src/main/java/tech/pegasys/teku/cli/util/DatabaseMigrater.java b/teku/src/main/java/tech/pegasys/teku/cli/util/DatabaseMigrater.java
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.List;
 import java.util.function.Consumer;
 import org.apache.commons.io.FileUtils;
@@ -109,20 +108,14 @@ void openDatabases(
   @VisibleForTesting
   void swapActiveDatabase() throws DatabaseMigraterError {
     try {
-      Files.move(
-          dataDirLayout.getBeaconDataDirectory(),
-          getMovedOldBeaconFolderPath(),
-          StandardCopyOption.ATOMIC_MOVE);
+      Files.move(dataDirLayout.getBeaconDataDirectory(), getMovedOldBeaconFolderPath());
     } catch (IOException ex) {
       statusUpdater.accept(ex.getMessage());
       throw new DatabaseMigraterError(
           "Failed to move old database to " + getMovedOldBeaconFolderPath().toString());
     }
     try {
-      Files.move(
-          getNewBeaconFolderPath(),
-          dataDirLayout.getBeaconDataDirectory(),
-          StandardCopyOption.ATOMIC_MOVE);
+      Files.move(getNewBeaconFolderPath(), dataDirLayout.getBeaconDataDirectory());
     } catch (IOException ex) {
       statusUpdater.accept(ex.getMessage());
       throw new DatabaseMigraterError(