Cleanup backup code

neo4j · Oct 10, 2016 · 3c1b851 · 3c1b851
1 parent 231d37e
commit 3c1b851
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 72 deletions.
diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java
@@ -42,7 +42,6 @@
 import org.neo4j.helpers.CancellationRequest;
 import org.neo4j.helpers.Exceptions;
 import org.neo4j.helpers.Service;
-import org.neo4j.helpers.progress.ProgressListener;
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
@@ -61,6 +60,7 @@
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
 import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
+import org.neo4j.kernel.lifecycle.Lifespan;
 import org.neo4j.kernel.monitoring.ByteCounterMonitor;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.logging.FormattedLogProvider;
@@ -88,7 +88,7 @@ class BackupOutcome
             this.consistent = consistent;
         }
 
-        public long getLastCommittedTx()
+        long getLastCommittedTx()
         {
             return lastCommittedTx;
         }
@@ -110,7 +110,6 @@ public boolean isConsistent()
     private final LogProvider logProvider;
     private final Log log;
     private final Monitors monitors;
-    private final VersionAwareLogEntryReader entryReader;
 
     BackupService()
     {
@@ -123,7 +122,6 @@ public boolean isConsistent()
         this.logProvider = logProvider;
         this.log = logProvider.getLog( getClass() );
         this.monitors = monitors;
-        this.entryReader = new VersionAwareLogEntryReader<>();
     }
 
     BackupOutcome doFullBackup( final String sourceHostNameOrIp, final int sourcePort, File targetDirectory,
@@ -142,7 +140,7 @@ BackupOutcome doFullBackup( final String sourceHostNameOrIp, final int sourcePor
                     loadKernelExtensions(), logProvider, new DefaultFileSystemAbstraction(), pageCache,
                     monitors.newMonitor( StoreCopyClient.Monitor.class, getClass() ), forensics );
             FullBackupStoreCopyRequester storeCopyRequester =
-                    new FullBackupStoreCopyRequester( sourceHostNameOrIp, sourcePort, timeout, forensics );
+                    new FullBackupStoreCopyRequester( sourceHostNameOrIp, sourcePort, timeout, forensics, monitors );
             storeCopier.copyStore( storeCopyRequester, CancellationRequest.NEVER_CANCELLED );
 
             bumpDebugDotLogFileVersion( targetDirectory, timestamp );
@@ -257,12 +255,13 @@ boolean directoryContainsDb( File targetDirectory )
         return fileSystem.fileExists( new File( targetDirectory, MetaDataStore.DEFAULT_NAME ) );
     }
 
-    boolean directoryIsEmpty( File targetDirectory )
+    private boolean directoryIsEmpty( File targetDirectory )
     {
         return !fileSystem.isDirectory( targetDirectory ) || 0 == fileSystem.listFiles( targetDirectory ).length;
     }
 
-    static GraphDatabaseAPI startTemporaryDb( File targetDirectory, PageCache pageCache, Map<String,String> config )
+    private static GraphDatabaseAPI startTemporaryDb( File targetDirectory, PageCache pageCache,
+            Map<String,String> config )
     {
         GraphDatabaseFactory factory = ExternallyManagedPageCache.graphDatabaseFactoryWithPageCache( pageCache );
         return (GraphDatabaseAPI) factory.newEmbeddedDatabaseBuilder( targetDirectory ).setConfig( config )
@@ -292,20 +291,14 @@ private BackupOutcome incrementalWithContext( String sourceHostNameOrIp, int sou
         LogProvider logProvider = resolver.resolveDependency( LogService.class ).getInternalLogProvider();
         BackupClient client = new BackupClient( sourceHostNameOrIp, sourcePort, null, logProvider, targetDb.storeId(),
                 timeout, unpacker, monitors.newMonitor( ByteCounterMonitor.class, BackupClient.class ),
-                monitors.newMonitor( RequestMonitor.class, BackupClient.class ), entryReader );
+                monitors.newMonitor( RequestMonitor.class, BackupClient.class ), new VersionAwareLogEntryReader<>() );
 
-        boolean consistent = false;
+        try ( Lifespan lifespan = new Lifespan( unpacker, client ) )
-        try
         {
-            client.start();
-            unpacker.start();
-
             try ( Response<Void> response = client.incrementalBackup( context ) )
             {
                 unpacker.unpackResponse( response, handler );
             }
-
-            consistent = true;
         }
         catch ( MismatchingStoreIdException e )
         {
@@ -327,19 +320,8 @@ private BackupOutcome incrementalWithContext( String sourceHostNameOrIp, int sou
         {
             throw new RuntimeException( "Unexpected error", throwable );
         }
-        finally
+
-        {
+        return new BackupOutcome( handler.getLastSeenTransactionId(), true );
-            try
-            {
-                client.stop();
-                unpacker.stop();
-            }
-            catch ( Throwable throwable )
-            {
-                log.warn( "Unable to stop backup client", throwable );
-            }
-        }
-        return new BackupOutcome( handler.getLastSeenTransactionId(), consistent );
     }
 
     private static boolean bumpDebugDotLogFileVersion( File dbDirectory, long toTimestamp )
@@ -381,52 +363,47 @@ private void clearIdFiles( File targetDirectory ) throws IOException
 
     private static class ProgressTxHandler implements TxHandler
     {
-        private final ProgressListener progress = ProgressMonitorFactory.textual( System.out ).openEnded(
-                "Transactions applied", 1000 );
         private long lastSeenTransactionId;
 
         @Override
         public void accept( long transactionId )
         {
-            progress.add( 1 );
             lastSeenTransactionId = transactionId;
         }
 
-        @Override
+        long getLastSeenTransactionId()
-        public void done()
-        {
-            progress.done();
-        }
-
-        public long getLastSeenTransactionId()
         {
             return lastSeenTransactionId;
         }
     }
 
-    private class FullBackupStoreCopyRequester implements StoreCopyClient.StoreCopyRequester
+    private static class FullBackupStoreCopyRequester implements StoreCopyClient.StoreCopyRequester
     {
         private final String sourceHostNameOrIp;
         private final int sourcePort;
         private final long timeout;
         private final boolean forensics;
+        private final Monitors monitors;
+
         private BackupClient client;
 
         private FullBackupStoreCopyRequester( String sourceHostNameOrIp, int sourcePort, long timeout,
-                                             boolean forensics )
+                                             boolean forensics, Monitors monitors )
         {
             this.sourceHostNameOrIp = sourceHostNameOrIp;
             this.sourcePort = sourcePort;
             this.timeout = timeout;
             this.forensics = forensics;
+            this.monitors = monitors;
         }
 
         @Override
         public Response<?> copyStore( StoreWriter writer )
         {
             client = new BackupClient( sourceHostNameOrIp, sourcePort, null, NullLogProvider.getInstance(),
                     StoreId.DEFAULT, timeout, ResponseUnpacker.NO_OP_RESPONSE_UNPACKER, monitors.newMonitor(
-                    ByteCounterMonitor.class ), monitors.newMonitor( RequestMonitor.class ), entryReader );
+                    ByteCounterMonitor.class ), monitors.newMonitor( RequestMonitor.class ),
+                    new VersionAwareLogEntryReader<>() );
             client.start();
             return client.fullBackup( writer, forensics );
         }

diff --git a/enterprise/com/src/main/java/org/neo4j/com/Client.java b/enterprise/com/src/main/java/org/neo4j/com/Client.java
@@ -56,7 +56,7 @@
 import static org.neo4j.com.Protocol.addLengthFieldPipes;
 import static org.neo4j.com.Protocol.assertChunkSizeIsWithinFrameSize;
 import static org.neo4j.com.ResourcePool.DEFAULT_CHECK_INTERVAL;
-import static org.neo4j.com.storecopy.ResponseUnpacker.NO_OP_TX_HANDLER;
+import static org.neo4j.com.storecopy.ResponseUnpacker.TxHandler.NO_OP_TX_HANDLER;
 import static org.neo4j.helpers.NamedThreadFactory.daemon;
 
 /**

diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/ResponseUnpacker.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/ResponseUnpacker.java
@@ -28,32 +28,12 @@ public interface ResponseUnpacker
      */
     void unpackResponse( Response<?> response, TxHandler txHandler ) throws Exception;
 
-    public static final ResponseUnpacker NO_OP_RESPONSE_UNPACKER = new ResponseUnpacker()
+    ResponseUnpacker NO_OP_RESPONSE_UNPACKER = ( response, txHandler ) -> { /* Do nothing */ };
-    {
-        @Override
-        public void unpackResponse( Response<?> response, TxHandler txHandler )
-        {
-            txHandler.done();
-        }
-    };
 
-    public interface TxHandler
+    interface TxHandler
     {
-        void accept( long transactionId );
+        TxHandler NO_OP_TX_HANDLER = transactionId -> { /* Do nothing */ };
 
-        void done();
+        void accept( long transactionId );
     }
-
-    public static final TxHandler NO_OP_TX_HANDLER = new TxHandler()
-    {
-        @Override
-        public void accept( long transactionId )
-        { // Do nothing
-        }
-
-        @Override
-        public void done()
-        { // Do nothing
-        }
-    };
 }
diff --git a/enterprise/com/src/test/java/org/neo4j/com/TestCommunication.java b/enterprise/com/src/test/java/org/neo4j/com/TestCommunication.java
@@ -50,9 +50,9 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.neo4j.com.MadeUpServer.FRAME_LENGTH;
-import static org.neo4j.com.TxChecksumVerifier.ALWAYS_MATCH;
-import static org.neo4j.com.storecopy.ResponseUnpacker.NO_OP_TX_HANDLER;
 import static org.neo4j.com.StoreIdTestFactory.newStoreIdForCurrentVersion;
+import static org.neo4j.com.TxChecksumVerifier.ALWAYS_MATCH;
+import static org.neo4j.com.storecopy.ResponseUnpacker.TxHandler.NO_OP_TX_HANDLER;
 
 public class TestCommunication
 {

diff --git a/.../com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java b/.../com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java
@@ -39,7 +39,6 @@
 import org.neo4j.kernel.impl.logging.NullLogService;
 import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation;
-import org.neo4j.kernel.impl.transaction.command.Commands;
 import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation;
 import org.neo4j.kernel.impl.transaction.log.entry.LogEntryStart;
 import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit;
@@ -56,7 +55,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.neo4j.com.storecopy.ResponseUnpacker.NO_OP_TX_HANDLER;
+import static org.neo4j.com.storecopy.ResponseUnpacker.TxHandler.NO_OP_TX_HANDLER;
 import static org.neo4j.kernel.impl.transaction.log.LogPosition.UNSPECIFIED;
 import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID;
 

diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterClient214.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterClient214.java
@@ -193,7 +193,7 @@ public Response<Void> endLockSession( RequestContext context, final boolean succ
     @Override
     public Response<Void> pullUpdates( RequestContext context )
     {
-        return pullUpdates( context, ResponseUnpacker.NO_OP_TX_HANDLER );
+        return pullUpdates( context, ResponseUnpacker.TxHandler.NO_OP_TX_HANDLER );
     }
 
     @Override
@@ -210,7 +210,7 @@ public Response<HandshakeResult> handshake( final long txId, StoreId storeId )
         Deserializer<HandshakeResult> deserializer =
                 ( buffer, temporaryBuffer ) -> new HandshakeResult( buffer.readLong(), buffer.readLong() );
         return sendRequest( requestTypes.type( HaRequestTypes.Type.HANDSHAKE ), RequestContext.EMPTY,
-                serializer, deserializer, storeId, ResponseUnpacker.NO_OP_TX_HANDLER );
+                serializer, deserializer, storeId, ResponseUnpacker.TxHandler.NO_OP_TX_HANDLER );
     }
 
     @Override