Author: mduerig
Date: Thu Sep  7 11:24:04 2017
New Revision: 1807591

URL: http://svn.apache.org/viewvc?rev=1807591&view=rev
Log:
OAK-6625: Avoid oak-run compact inadvertently upgrading the segment format
Test for the force option

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java?rev=1807591&r1=1807590&r2=1807591&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
 Thu Sep  7 11:24:04 2017
@@ -103,10 +103,28 @@ public class UpgradeIT {
                 .withForce(true)
                 .build()
                 .run();
+
+        // Upgraded
         checkStoreVersion(2);
         checkSegmentVersion(V_13);
     }
 
+    @Test
+    public void offRCUpgradesRequiresForce() throws IOException, 
InvalidFileStoreVersionException {
+        checkSegmentVersion(V_12);
+        checkStoreVersion(1);
+        Compact.builder()
+                .withPath(fileStoreHome.getRoot())
+                .withMmap(true)
+                .withForce(false)
+                .build()
+                .run();
+
+        // Not upgraded
+        checkStoreVersion(1);
+        checkSegmentVersion(V_12);
+    }
+
     private void checkStoreVersion(int version) throws IOException, 
InvalidFileStoreVersionException {
         newManifestChecker(new File(fileStoreHome.getRoot(), "/manifest"),
                 true, version, version).checkManifest();


Reply via email to