Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java Thu Aug 25 14:51:36 2016 @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; +package org.apache.jackrabbit.oak.segment.standby; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir; +import static org.apache.jackrabbit.oak.segment.SegmentTestUtils.createTmpTargetDir; import java.io.File; import java.io.IOException; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.file.FileStore; import org.junit.After; public class ExternalSharedStoreIT extends DataStoreTestBase {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeTest.java Thu Aug 25 14:51:36 2016 @@ -16,20 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; -import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer; +package org.apache.jackrabbit.oak.segment.standby; + +import static org.apache.jackrabbit.oak.segment.SegmentTestUtils.addTestContent; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; +import org.apache.jackrabbit.oak.segment.standby.server.StandbyServer; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.addTestContent; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - public class FailoverIPRangeTest extends TestBase { @Before @@ -144,7 +145,7 @@ public class FailoverIPRangeTest extends } private void createTestWithConfig(String host, String[] ipRanges, boolean expectedToWork) throws Exception { - NodeStore store = SegmentNodeStore.builder(storeS).build(); + NodeStore store = SegmentNodeStoreBuilders.builder(storeS).build(); final StandbyServer server = new StandbyServer(port, storeS, ipRanges); server.start(); addTestContent(store, "server"); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java Thu Aug 25 14:51:36 2016 @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; +package org.apache.jackrabbit.oak.segment.standby; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils; -import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; -import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer; +import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.segment.SegmentTestUtils; +import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; +import org.apache.jackrabbit.oak.segment.standby.server.StandbyServer; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; @@ -44,7 +45,7 @@ public class FailoverMultipleClientsTest @Test public void testMultipleClients() throws Exception { - NodeStore store = SegmentNodeStore.builder(storeS).build(); + NodeStore store = SegmentNodeStoreBuilders.builder(storeS).build(); final StandbyServer server = new StandbyServer(port, storeS); server.start(); SegmentTestUtils.addTestContent(store, "server"); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverSslTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverSslTestIT.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverSslTestIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverSslTestIT.java Thu Aug 25 14:51:36 2016 @@ -16,20 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; -import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer; +package org.apache.jackrabbit.oak.segment.standby; + +import static org.apache.jackrabbit.oak.segment.SegmentTestUtils.addTestContent; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; +import org.apache.jackrabbit.oak.segment.standby.server.StandbyServer; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.addTestContent; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - public class FailoverSslTestIT extends TestBase { @Before @@ -45,7 +46,7 @@ public class FailoverSslTestIT extends T @Test public void testFailoverSecure() throws Exception { - NodeStore store = SegmentNodeStore.builder(storeS).build(); + NodeStore store = SegmentNodeStoreBuilders.builder(storeS).build(); final StandbyServer server = new StandbyServer(port, storeS, true); server.start(); addTestContent(store, "server"); @@ -65,7 +66,7 @@ public class FailoverSslTestIT extends T @Test public void testFailoverSecureServerPlainClient() throws Exception { - NodeStore store = SegmentNodeStore.builder(storeS).build(); + NodeStore store = SegmentNodeStoreBuilders.builder(storeS).build(); final StandbyServer server = new StandbyServer(port, storeS, true); server.start(); addTestContent(store, "server"); @@ -85,7 +86,7 @@ public class FailoverSslTestIT extends T @Test public void testFailoverPlainServerSecureClient() throws Exception { - NodeStore store = SegmentNodeStore.builder(storeS).build(); + NodeStore store = SegmentNodeStoreBuilders.builder(storeS).build(); final StandbyServer server = new StandbyServer(port, storeS); server.start(); addTestContent(store, "server"); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanTest.java Thu Aug 25 14:51:36 2016 @@ -16,23 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; -import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; -import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.StandbyStatusMBean; -import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +package org.apache.jackrabbit.oak.segment.standby; -import javax.management.MBeanServer; -import javax.management.ObjectName; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertTrue; +import static junit.framework.Assert.fail; import java.lang.management.ManagementFactory; import java.util.Set; -import static junit.framework.Assert.*; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; +import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean; +import org.apache.jackrabbit.oak.segment.standby.server.StandbyServer; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; public class MBeanTest extends TestBase { Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/RecoverTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/RecoverTestIT.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/RecoverTestIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/RecoverTestIT.java Thu Aug 25 14:51:36 2016 @@ -16,22 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; +package org.apache.jackrabbit.oak.segment.standby; -import org.apache.jackrabbit.oak.plugins.segment.DebugSegmentStore; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; -import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer; +import static org.apache.jackrabbit.oak.segment.SegmentTestUtils.addTestContent; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; +import org.apache.jackrabbit.oak.segment.standby.server.StandbyServer; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.addTestContent; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - public class RecoverTestIT extends TestBase { @Before @@ -45,41 +44,14 @@ public class RecoverTestIT extends TestB } @Test - public void testBrokenConnection() throws Exception { - - NodeStore store = SegmentNodeStore.builder(storeS).build(); - DebugSegmentStore s = new DebugSegmentStore(storeS); - addTestContent(store, "server"); - storeS.flush(); - - final StandbyServer server = new StandbyServer(port, s); - s.createReadErrors = true; - server.start(); - - StandbyClient cl = newStandbyClient(storeC); - cl.run(); - - try { - assertFalse("store are not expected to be equal", storeS.getHead().equals(storeC.getHead())); - s.createReadErrors = false; - cl.run(); - assertEquals(storeS.getHead(), storeC.getHead()); - } finally { - server.close(); - cl.close(); - } - - } - - @Test public void testLocalChanges() throws Exception { - NodeStore store = SegmentNodeStore.builder(storeC).build(); + NodeStore store = SegmentNodeStoreBuilders.builder(storeC).build(); addTestContent(store, "client"); final StandbyServer server = new StandbyServer(port, storeS); server.start(); - store = SegmentNodeStore.builder(storeS).build(); + store = SegmentNodeStoreBuilders.builder(storeS).build(); addTestContent(store, "server"); storeS.flush(); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTest.java Thu Aug 25 14:51:36 2016 @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; + +package org.apache.jackrabbit.oak.segment.standby; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -27,24 +28,24 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Random; +import com.google.common.io.ByteStreams; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; -import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; -import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; +import org.apache.jackrabbit.oak.segment.standby.server.StandbyServer; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; -import com.google.common.io.ByteStreams; - public class StandbyTest extends TestBase { @Before @@ -58,13 +59,14 @@ public class StandbyTest extends TestBas } @Test + @Ignore("OAK-4673") public void testSync() throws Exception { final int mb = 1 * 1024 * 1024; final int blobSize = 5 * mb; FileStore primary = getPrimary(); FileStore secondary = getSecondary(); - NodeStore store = SegmentNodeStore.builder(primary).build(); + NodeStore store = SegmentNodeStoreBuilders.builder(primary).build(); final StandbyServer server = new StandbyServer(port, primary); server.start(); byte[] data = addTestContent(store, "server", blobSize, 150); @@ -80,8 +82,8 @@ public class StandbyTest extends TestBas cl.close(); } - assertTrue(primary.size() > blobSize); - assertTrue(secondary.size() > blobSize); + assertTrue(primary.getStats().getApproximateSize() > blobSize); + assertTrue(secondary.getStats().getApproximateSize() > blobSize); PropertyState ps = secondary.getHead().getChildNode("root") .getChildNode("server").getProperty("testBlob"); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java Thu Aug 25 14:51:36 2016 @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; + +package org.apache.jackrabbit.oak.segment.standby; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -27,15 +28,16 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Random; +import com.google.common.io.ByteStreams; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; -import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; -import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; +import org.apache.jackrabbit.oak.segment.standby.server.StandbyServer; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -44,8 +46,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.google.common.io.ByteStreams; - public class StandbyTestIT extends TestBase { @Before @@ -91,7 +91,7 @@ public class StandbyTestIT extends TestB FileStore primary = getPrimary(); FileStore secondary = getSecondary(); - NodeStore store = SegmentNodeStore.builder(primary).build(); + NodeStore store = SegmentNodeStoreBuilders.builder(primary).build(); final StandbyServer server = new StandbyServer(port, primary); server.start(); byte[] data = addTestContent(store, "server", blobSize, dataNodes); @@ -108,7 +108,7 @@ public class StandbyTestIT extends TestB assertEquals(primary.getHead(), secondary.getHead()); assertTrue(store.release(cp)); cl.cleanup(); - assertTrue(secondary.size() > blobSize); + assertTrue(secondary.getStats().getApproximateSize() > blobSize); } } finally { @@ -116,8 +116,8 @@ public class StandbyTestIT extends TestB cl.close(); } - assertTrue(primary.size() > blobSize); - assertTrue(secondary.size() > blobSize); + assertTrue(primary.getStats().getApproximateSize() > blobSize); + assertTrue(secondary.getStats().getApproximateSize() > blobSize); long primaryFs = FileUtils.sizeOf(directoryS); long secondaryFs = FileUtils.sizeOf(directoryC); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/TestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/TestBase.java?rev=1757699&r1=1756619&r2=1757699&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/TestBase.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/TestBase.java Thu Aug 25 14:51:36 2016 @@ -16,9 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.standby; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir; +package org.apache.jackrabbit.oak.segment.standby; + +import static org.apache.jackrabbit.oak.segment.SegmentTestUtils.createTmpTargetDir; +import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder; import static org.junit.Assume.assumeTrue; import java.io.File; @@ -30,8 +32,8 @@ import org.apache.commons.lang3.SystemUt import org.apache.jackrabbit.oak.commons.CIHelper; import org.apache.jackrabbit.oak.commons.FixturesHelper; import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; -import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.standby.client.StandbyClient; import org.junit.BeforeClass; public class TestBase { @@ -80,11 +82,14 @@ public class TestBase { } private static FileStore newFileStore(File directory) throws Exception { - return FileStore.builder(directory) - .withMaxFileSize(1) - .withMemoryMapping(false) - .withNoCache() - .build(); + return fileStoreBuilder(directory) + .withMaxFileSize(1) + .withMemoryMapping(false) + .withNodeDeduplicationCacheSize(0) + .withSegmentCacheSize(0) + .withStringCacheSize(0) + .withTemplateCacheSize(0) + .build(); } protected FileStore setupPrimary(File directory) throws Exception {
