Author: alexparvulescu Date: Mon Feb 1 11:24:53 2016 New Revision: 1727922
URL: http://svn.apache.org/viewvc?rev=1727922&view=rev Log: OAK-2480 Incremental (FileStore)Backup copies the entire source instead of just the delta - reintroduced restore method, as it broke some upstream dependencies Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreRestore.java Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java?rev=1727922&r1=1727921&r2=1727922&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java (original) +++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java Mon Feb 1 11:24:53 2016 @@ -25,6 +25,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.management.ManagementOperation.newManagementOperation; import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.formatTime; import static org.apache.jackrabbit.oak.plugins.backup.FileStoreBackup.backup; +import static org.apache.jackrabbit.oak.plugins.backup.FileStoreRestore.restore; import java.io.File; import java.util.concurrent.Callable; @@ -93,7 +94,9 @@ public class FileStoreBackupRestore impl restoreOp = newManagementOperation("Restore", new Callable<String>() { @Override public String call() throws Exception { - return "Restore not available as an online operation."; + long t0 = nanoTime(); + restore(file, store); + return "Restore completed in " + formatTime(nanoTime() - t0); } }); executor.execute(restoreOp); Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreRestore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreRestore.java?rev=1727922&r1=1727921&r2=1727922&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreRestore.java (original) +++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreRestore.java Mon Feb 1 11:24:53 2016 @@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeState; import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; import org.apache.jackrabbit.oak.plugins.segment.file.FileStore.ReadOnlyStore; +import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,6 +68,10 @@ public class FileStoreRestore { log.info("Restore finished in {}.", watch); } + public static void restore(File source, NodeStore store) { + log.warn("Restore not available as an online operation."); + } + private static boolean validFileStore(File source) { if (source == null || !source.isDirectory()) { return false;
