Backup is now allowed with customized IO

neo4j · Sep 16, 2016 · 667a9b4 · 667a9b4
1 parent 1b23b62
commit 667a9b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 99 deletions.
diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java
@@ -42,7 +42,6 @@
 import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
 import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer;
-import org.neo4j.kernel.impl.util.CustomIOConfigValidator;
 import org.neo4j.kernel.impl.util.UnsatisfiedDependencyException;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.lifecycle.Lifecycle;
@@ -54,8 +53,6 @@
 
 public class OnlineBackupKernelExtension implements Lifecycle
 {
-    static final String CUSTOM_IO_EXCEPTION_MESSAGE = "Online Backup not allowed with custom IO integration";
-
     private Object startBindingListener;
     private Object bindingListener;
 
@@ -93,15 +90,8 @@ fileSystemAbstraction, new File( graphDatabaseAPI.getStoreDir() ),
                     monitors.newMonitor( StoreCopyServer.Monitor.class ), pageCache );
             LogicalTransactionStore logicalTransactionStore = logicalTransactionStoreSupplier.get();
             LogFileInformation logFileInformation = logFileInformationSupplier.get();
-            return new BackupImpl( copier, monitors,
-                    logicalTransactionStore, transactionIdStore, logFileInformation, new Supplier<StoreId>()
-                    {
-                        @Override
-                        public StoreId get()
-                        {
-                            return graphDatabaseAPI.storeId();
-                        }
-                    }, logProvider );
+            return new BackupImpl( copier, monitors, logicalTransactionStore, transactionIdStore, logFileInformation,
+                    graphDatabaseAPI::storeId, logProvider );
         }, monitors, logProvider );
     }
 
@@ -125,8 +115,6 @@ public void start() throws Throwable
     {
         if ( config.<Boolean>get( OnlineBackupSettings.online_backup_enabled ) )
         {
-            CustomIOConfigValidator.assertCustomIOConfigNotUsed( config, CUSTOM_IO_EXCEPTION_MESSAGE );
-
             try
             {
                 server = new BackupServer( backupProvider.newBackup(), config.get( online_backup_server ),

diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/PlatformConstraintBackupTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/PlatformConstraintBackupTest.java