Author: mduerig
Date: Fri Apr 22 14:49:48 2016
New Revision: 1740532
URL: http://svn.apache.org/viewvc?rev=1740532&view=rev
Log:
OAK-4278: Fix backup and restore
Update issue references in FIXME tags to point to point to this issue
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreBackup.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreRestore.java
jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/backup/FileStoreBackupTest.java
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreBackup.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreBackup.java?rev=1740532&r1=1740531&r2=1740532&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreBackup.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreBackup.java
Fri Apr 22 14:49:48 2016
@@ -55,7 +55,8 @@ public class FileStoreBackup {
FileStore backup = builder.build();
try {
SegmentNodeState state = backup.getHead();
- // FIXME OAK-3348 Use dedicated implementation instead of
compactor.
+ // FIXME OAK-4278: Fix backup and restore
+ // Use dedicated implementation instead of compactor.
// This is allows us to decouple and fix problems for online
compaction independent
// of backup / restore.
// Compactor compactor = new Compactor(backup.getTracker());
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreRestore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreRestore.java?rev=1740532&r1=1740531&r2=1740532&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreRestore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/backup/FileStoreRestore.java
Fri Apr 22 14:49:48 2016
@@ -51,7 +51,8 @@ public class FileStoreRestore {
FileStore store = FileStore.builder(destination).build();
SegmentNodeState current = store.getHead();
try {
- // FIXME OAK-3348 Use dedicated implementation instead of
compactor.
+ // FIXME OAK-4278: Fix backup and restore
+ // Use dedicated implementation instead of compactor.
// This is allows us to decouple and fix problems for online
compaction independent
// of backup / restore.
// compactor.setDeepCheckLargeBinaries(true);
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/backup/FileStoreBackupTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/backup/FileStoreBackupTest.java?rev=1740532&r1=1740531&r2=1740532&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/backup/FileStoreBackupTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/backup/FileStoreBackupTest.java
Fri Apr 22 14:49:48 2016
@@ -44,7 +44,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@Ignore
-// FIXME OAK-3348 FileStoreBackupTest
+// FIXME OAK-4278: Fix backup and restore
public class FileStoreBackupTest {
private File src;