Issue #4570 WAL backup feature is implemented.

core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/OAbstractPaginatedStorage.java

@@ -33,7 +33,6 @@
 import com.orientechnologies.orient.core.command.OCommandRequestText;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
 import com.orientechnologies.orient.core.config.OStorageClusterConfiguration;
-import com.orientechnologies.orient.core.config.OStorageConfiguration;
 import com.orientechnologies.orient.core.config.OStoragePaginatedClusterConfiguration;
 import com.orientechnologies.orient.core.conflict.ORecordConflictStrategy;
 import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
@@ -87,17 +86,13 @@
 import com.orientechnologies.orient.core.version.ORecordVersion;
 import com.orientechnologies.orient.core.version.OVersionFactory;
 
-import javax.swing.text.DateFormatter;
 import java.io.*;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -2395,7 +2390,6 @@ private boolean restoreFrom(OLogSequenceNumber lsn) throws IOException {
           OLogManager.instance().info(this, "%d operations were processed, current LSN is %s last LSN is %s", recordsProcessed,
               lsn, writeAheadLog.end());
 
-          // throw new Exception("test");
         }
 
         lsn = writeAheadLog.next(lsn);
@@ -2441,49 +2435,54 @@ private void backUpWAL(Exception e) {
       }
 
       final FileOutputStream archiveOutputStream = new FileOutputStream(archiveFile);
-      final ZipOutputStream archiveZipOutputStream = new ZipOutputStream(archiveOutputStream);
+      final ZipOutputStream archiveZipOutputStream = new ZipOutputStream(new BufferedOutputStream(archiveOutputStream));
 
       final ZipEntry metadataEntry = new ZipEntry(metadataName);
 
       archiveZipOutputStream.putNextEntry(metadataEntry);
 
       final PrintWriter metadataFileWriter = new PrintWriter(archiveZipOutputStream);
-      metadataFileWriter.append("Storage name : ").append(getName()).append("\n");
-      metadataFileWriter.append("Date : ").append(strDate).append("\n");
-      metadataFileWriter.append("Stacktrace : \n");
+      metadataFileWriter.append("Storage name : ").append(getName()).append("\r\n");
+      metadataFileWriter.append("Date : ").append(strDate).append("\r\n");
+      metadataFileWriter.append("Stacktrace : \r\n");
       e.printStackTrace(metadataFileWriter);
       metadataFileWriter.flush();
       archiveZipOutputStream.closeEntry();
 
-      final List<String> walPaths = ((ODiskWriteAheadLog) writeAheadLog).getFiles();
+      final List<String> walPaths = ((ODiskWriteAheadLog) writeAheadLog).getWalFiles();
       for (String walSegment : walPaths) {
-        final File walFile = new File(walSegment);
-        final ZipEntry walZipEntry = new ZipEntry(walFile.getName());
-        archiveZipOutputStream.putNextEntry(walZipEntry);
-
-        final FileInputStream walInputStream = new FileInputStream(walFile);
-        final BufferedInputStream walBufferedInputStream = new BufferedInputStream(walInputStream);
-        final BufferedOutputStream walBufferedOutputStream = new BufferedOutputStream(archiveOutputStream);
-
-        final byte[] buffer = new byte[1024];
-        int readBytes = 0;
-
-        while ((readBytes = walBufferedInputStream.read(buffer)) > -1) {
-          walBufferedOutputStream.write(buffer, 0, readBytes);
-        }
-
-        walInputStream.close();
-        walBufferedOutputStream.flush();
-        archiveZipOutputStream.closeEntry();
+        archiveEntry(archiveZipOutputStream, walSegment);
       }
 
+      archiveEntry(archiveZipOutputStream, ((ODiskWriteAheadLog) writeAheadLog).getWMRFile());
+
       archiveZipOutputStream.close();
     } catch (Exception ioe) {
       OLogManager.instance().error(this, "Error during WAL backup.", ioe);
     }
 
   }
 
+  private void archiveEntry(ZipOutputStream archiveZipOutputStream, String walSegment) throws IOException {
+    final File walFile = new File(walSegment);
+    final ZipEntry walZipEntry = new ZipEntry(walFile.getName());
+    archiveZipOutputStream.putNextEntry(walZipEntry);
+
+    final FileInputStream walInputStream = new FileInputStream(walFile);
+    final BufferedInputStream walBufferedInputStream = new BufferedInputStream(walInputStream);
+
+    final byte[] buffer = new byte[1024];
+    int readBytes = 0;
+
+    while ((readBytes = walBufferedInputStream.read(buffer)) > -1) {
+      archiveZipOutputStream.write(buffer, 0, readBytes);
+    }
+
+    walBufferedInputStream.close();
+
+    archiveZipOutputStream.closeEntry();
+  }
+
   protected void restoreAtomicUnit(List<OWALRecord> atomicUnit, OModifiableBoolean atLeastOnePageUpdate) throws IOException {
     assert atomicUnit.get(atomicUnit.size() - 1) instanceof OAtomicUnitEndRecord;
 

core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/wal/ODiskWriteAheadLog.java

@@ -923,7 +923,7 @@ public long size() {
     }
   }
 
-  public List<String> getFiles() {
+  public List<String> getWalFiles() {
     final ArrayList<String> result = new ArrayList<String>();
     syncObject.lock();
     try {
@@ -937,6 +937,15 @@ public List<String> getFiles() {
     return result;
   }
 
+  public String getWMRFile() {
+    syncObject.lock();
+    try {
+      return masterRecordFile.getAbsolutePath();
+    } finally {
+      syncObject.unlock();
+    }
+  }
+
   public void truncate() throws IOException {
     syncObject.lock();
     try {