Author: frm
Date: Wed Dec 6 13:50:59 2017
New Revision: 1817296
URL: http://svn.apache.org/viewvc?rev=1817296&view=rev
Log:
OAK-7031 - Let the spool folder be a parameter of ResponseDecoder
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalPrivateStoreIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverMultipleClientsTestIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverSslTestIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/RecoverTestIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/TestBase.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BenchmarkBase.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BulkTransferBenchmark.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoderTest.java
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
Wed Dec 6 13:50:59 2017
@@ -28,6 +28,8 @@ import java.util.concurrent.ScheduledExe
import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
+
+import com.google.common.base.StandardSystemProperty;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.core.data.FileDataStore;
import org.apache.jackrabbit.oak.Oak;
@@ -249,7 +251,7 @@ class SegmentTarFixture extends OakFixtu
}
serverSyncs[i] = new StandbyServerSync(port, stores[i], 1 * MB);
- clientSyncs[i] = new StandbyClientSync("127.0.0.1", port, stores[n +
i], false, DEFAULT_TIMEOUT, false);
+ clientSyncs[i] = new StandbyClientSync("127.0.0.1", port, stores[n +
i], false, DEFAULT_TIMEOUT, false, new
File(StandardSystemProperty.JAVA_IO_TMPDIR.value()));
serverSyncs[i].start();
clientSyncs[i].start();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
Wed Dec 6 13:50:59 2017
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.segment.standby.client;
+import java.io.File;
import java.io.InputStream;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingDeque;
@@ -76,13 +77,16 @@ class StandbyClient implements AutoClose
private final NioEventLoopGroup group;
+ private final File spoolFolder;
+
private Channel channel;
- StandbyClient(NioEventLoopGroup group, String clientId, boolean secure,
int readTimeoutMs) {
+ StandbyClient(NioEventLoopGroup group, String clientId, boolean secure,
int readTimeoutMs, File spoolFolder) {
this.group = group;
this.clientId = clientId;
this.secure = secure;
this.readTimeoutMs = readTimeoutMs;
+ this.spoolFolder = spoolFolder;
}
void connect(String host, int port) throws Exception {
@@ -121,7 +125,7 @@ class StandbyClient implements AutoClose
// The frame length limits the chunk size to max. 2.2GB
p.addLast(new
LengthFieldBasedFrameDecoder(Integer.MAX_VALUE, 0, 4));
- p.addLast(new ResponseDecoder());
+ p.addLast(new ResponseDecoder(spoolFolder));
// Encoders
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
Wed Dec 6 13:50:59 2017
@@ -20,6 +20,7 @@
package org.apache.jackrabbit.oak.segment.standby.client;
import java.io.Closeable;
+import java.io.File;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.util.UUID;
@@ -35,8 +36,8 @@ import javax.management.StandardMBean;
import com.google.common.base.Supplier;
import io.netty.channel.nio.NioEventLoopGroup;
import org.apache.jackrabbit.core.data.util.NamedThreadFactory;
-import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
import org.apache.jackrabbit.oak.segment.standby.jmx.ClientStandbyStatusMBean;
import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean;
import org.apache.jackrabbit.oak.segment.standby.store.CommunicationObserver;
@@ -83,7 +84,9 @@ public final class StandbyClientSync imp
private final NioEventLoopGroup group;
- public StandbyClientSync(String host, int port, FileStore store, boolean
secure, int readTimeoutMs, boolean autoClean) {
+ private final File spoolFolder;
+
+ public StandbyClientSync(String host, int port, FileStore store, boolean
secure, int readTimeoutMs, boolean autoClean, File spoolFolder) {
this.state = STATUS_INITIALIZING;
this.lastSuccessfulRequest = -1;
this.syncStartTimestamp = -1;
@@ -97,7 +100,8 @@ public final class StandbyClientSync imp
this.fileStore = store;
String s = System.getProperty(CLIENT_ID_PROPERTY_NAME);
this.observer = new CommunicationObserver((s == null || s.isEmpty()) ?
UUID.randomUUID().toString() : s);
- group = new NioEventLoopGroup(0, new NamedThreadFactory("standby"));
+ this.group = new NioEventLoopGroup(0, new
NamedThreadFactory("standby"));
+ this.spoolFolder = spoolFolder;
final MBeanServer jmxServer =
ManagementFactory.getPlatformMBeanServer();
try {
@@ -150,7 +154,7 @@ public final class StandbyClientSync imp
try {
long startTimestamp = System.currentTimeMillis();
- try (StandbyClient client = new StandbyClient(group,
observer.getID(), secure, readTimeoutMs)) {
+ try (StandbyClient client = new StandbyClient(group,
observer.getID(), secure, readTimeoutMs, spoolFolder)) {
client.connect(host, port);
GCGeneration genBefore = headGeneration(fileStore);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
Wed Dec 6 13:50:59 2017
@@ -41,8 +41,6 @@ import org.slf4j.LoggerFactory;
public class ResponseDecoder extends ByteToMessageDecoder {
- private static final String TMP_DIR = System.getProperty("java.io.tmpdir");
-
private static final Logger log =
LoggerFactory.getLogger(ResponseDecoder.class);
private static class DeleteOnCloseFileInputStream extends FileInputStream {
@@ -68,9 +66,15 @@ public class ResponseDecoder extends Byt
}
}
+
+ private final File spoolFolder;
private int blobChunkSize;
-
+
+ public ResponseDecoder(File spoolFolder) {
+ this.spoolFolder = spoolFolder;
+ }
+
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object>
out) throws Exception {
int length = in.readInt();
@@ -131,7 +135,7 @@ public class ResponseDecoder extends Byt
byte[] blobIdBytes = new byte[blobIdLength];
in.readBytes(blobIdBytes);
String blobId = new String(blobIdBytes, Charsets.UTF_8);
- File tempFile = new File(TMP_DIR, blobId + ".tmp");
+ File tempFile = new File(spoolFolder, blobId + ".tmp");
// START_CHUNK flag enabled
if ((mask & (1 << 0)) != 0) {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
Wed Dec 6 13:50:59 2017
@@ -22,9 +22,11 @@ import static org.apache.felix.scr.annot
import static org.apache.felix.scr.annotations.ReferencePolicyOption.GREEDY;
import java.io.Closeable;
+import java.io.File;
import java.util.Dictionary;
import java.util.Hashtable;
+import com.google.common.base.StandardSystemProperty;
import com.google.common.io.Closer;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -156,7 +158,7 @@ public class StandbyStoreService {
int readTimeout = PropertiesUtil.toInteger(props.get(READ_TIMEOUT),
READ_TIMEOUT_DEFAULT);
boolean clean = PropertiesUtil.toBoolean(props.get(AUTO_CLEAN),
AUTO_CLEAN_DEFAULT);
- StandbyClientSync standbyClientSync = new StandbyClientSync(host,
port, fileStore, secure, readTimeout, clean);
+ StandbyClientSync standbyClientSync = new StandbyClientSync(host,
port, fileStore, secure, readTimeout, clean, new
File(StandardSystemProperty.JAVA_IO_TMPDIR.value()));
closer.register(standbyClientSync);
Dictionary<Object, Object> dictionary = new Hashtable<Object,
Object>();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/BrokenNetworkIT.java
Wed Dec 6 13:50:59 2017
@@ -68,7 +68,7 @@ public class BrokenNetworkIT extends Tes
try (
StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), serverStore, MB, false);
- StandbyClientSync clientSync = newStandbyClientSync(clientStore,
serverPort.getPort(), false);
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), clientStore, false,
getClientTimeout(), false, folder.newFolder());
) {
serverSync.start();
clientSync.run();
@@ -88,7 +88,7 @@ public class BrokenNetworkIT extends Tes
try (
StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, MB, true);
- StandbyClientSync clientSync = newStandbyClientSync(storeC,
serverPort.getPort(), true);
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), storeC, true,
getClientTimeout(), false, folder.newFolder());
) {
serverSync.start();
clientSync.run();
@@ -158,9 +158,11 @@ public class BrokenNetworkIT extends Tes
try (StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), serverStore, MB, ssl)) {
serverSync.start();
+ File spoolFolder = folder.newFolder();
+
try (
NetworkErrorProxy ignored = new
NetworkErrorProxy(proxyPort.getPort(), getServerHost(), serverPort.getPort(),
flipPosition, skipPosition, skipBytes);
- StandbyClientSync clientSync =
newStandbyClientSync(clientStore, proxyPort.getPort(), ssl)
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), proxyPort.getPort(), clientStore, ssl,
getClientTimeout(), false, spoolFolder)
) {
clientSync.run();
}
@@ -172,7 +174,7 @@ public class BrokenNetworkIT extends Tes
serverStore.flush();
}
- try (StandbyClientSync clientSync =
newStandbyClientSync(clientStore, serverPort.getPort(), ssl)) {
+ try (StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), clientStore, ssl,
getClientTimeout(), false, spoolFolder)) {
clientSync.run();
}
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
Wed Dec 6 13:50:59 2017
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Random;
@@ -51,6 +52,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,6 +64,9 @@ public abstract class DataStoreTestBase
private static final long GB = 1024 * 1024 * 1024;
@Rule
+ public TemporaryFolder folder = new TemporaryFolder(new File("target"));
+
+ @Rule
public TemporaryPort serverPort = new TemporaryPort();
@Rule
@@ -123,7 +128,7 @@ public abstract class DataStoreTestBase
}
@Before
- public void before() {
+ public void before() throws Exception {
logger.info("Test begin: {}", testName.getMethodName());
}
@@ -141,10 +146,12 @@ public abstract class DataStoreTestBase
NodeStore store = SegmentNodeStoreBuilders.builder(primary).build();
byte[] data = addTestContent(store, "server", blobSize);
+ File spoolFolder = folder.newFolder();
+
// run 1: unsuccessful
try (
StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, MB);
- StandbyClientSync cl = newStandbyClientSync(secondary,
serverPort.getPort(), 4_000)
+ StandbyClientSync cl = new StandbyClientSync(getServerHost(),
serverPort.getPort(), secondary, false, 4_000, false, spoolFolder)
) {
serverSync.start();
// no persisted head on primary
@@ -157,7 +164,7 @@ public abstract class DataStoreTestBase
// run 2: successful
try (
StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, MB);
- StandbyClientSync cl = newStandbyClientSync(secondary,
serverPort.getPort(), 4_000)
+ StandbyClientSync cl = new StandbyClientSync(getServerHost(),
serverPort.getPort(), secondary, false, 4_000, false, spoolFolder)
) {
serverSync.start();
// this time persisted head will be available on primary
@@ -194,7 +201,7 @@ public abstract class DataStoreTestBase
byte[] data = addTestContent(store, "server", blobSize);
try (
StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, MB);
- StandbyClientSync cl = newStandbyClientSync(secondary,
serverPort.getPort())
+ StandbyClientSync cl = new StandbyClientSync(getServerHost(),
serverPort.getPort(), secondary, false, getClientTimeout(), false,
folder.newFolder())
) {
serverSync.start();
primary.flush();
@@ -236,7 +243,7 @@ public abstract class DataStoreTestBase
try (
StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, 8 * MB);
- StandbyClientSync cl = newStandbyClientSync(secondary,
serverPort.getPort(), 2 * 60 * 1000)
+ StandbyClientSync cl = new StandbyClientSync(getServerHost(),
serverPort.getPort(), secondary, false, 2 * 60 * 1000, false,
folder.newFolder())
) {
serverSync.start();
primary.flush();
@@ -275,7 +282,7 @@ public abstract class DataStoreTestBase
NodeStore store = SegmentNodeStoreBuilders.builder(primary).build();
try (
StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, MB);
- StandbyClientSync clientSync = newStandbyClientSync(secondary,
serverPort.getPort())
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), secondary, false,
getClientTimeout(), false, folder.newFolder())
) {
serverSync.start();
@@ -339,9 +346,11 @@ public abstract class DataStoreTestBase
try (StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, MB)) {
serverSync.start();
+ File spoolFolder = folder.newFolder();
+
try (
NetworkErrorProxy ignored = new
NetworkErrorProxy(proxyPort.getPort(), getServerHost(), serverPort.getPort(),
flipPosition, skipPosition, skipBytes);
- StandbyClientSync clientSync = newStandbyClientSync(secondary,
proxyPort.getPort())
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), proxyPort.getPort(), secondary, false,
getClientTimeout(), false, spoolFolder)
) {
clientSync.run();
}
@@ -356,7 +365,7 @@ public abstract class DataStoreTestBase
primary.flush();
}
- try (StandbyClientSync clientSync =
newStandbyClientSync(secondary, serverPort.getPort())) {
+ try (StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), secondary, false,
getClientTimeout(), false, spoolFolder)) {
clientSync.run();
}
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalPrivateStoreIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalPrivateStoreIT.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalPrivateStoreIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalPrivateStoreIT.java
Wed Dec 6 13:50:59 2017
@@ -80,8 +80,8 @@ public class ExternalPrivateStoreIT exte
NodeStore store = SegmentNodeStoreBuilders.builder(primary).build();
addTestContent(store, "server", blobSize);
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, 1 * MB);
- StandbyClientSync cl = newStandbyClientSync(secondary,
serverPort.getPort(), false, 60)
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, MB);
+ StandbyClientSync cl = new StandbyClientSync(getServerHost(), 60,
secondary, false, getClientTimeout(), false, folder.newFolder())
) {
serverSync.start();
primary.flush();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/FailoverIPRangeIT.java
Wed Dec 6 13:50:59 2017
@@ -27,12 +27,12 @@ import static org.junit.Assume.assumeFal
import java.io.File;
+import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync;
import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync;
import org.apache.jackrabbit.oak.segment.test.TemporaryFileStore;
-import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Rule;
import org.junit.Test;
@@ -157,8 +157,8 @@ public class FailoverIPRangeIT extends T
NodeStore store = SegmentNodeStoreBuilders.builder(storeS).build();
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, 1 * MB, ipRanges);
- StandbyClientSync clientSync = new StandbyClientSync(host,
serverPort.getPort(), storeC, false, getClientTimeout(), false)
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, MB, ipRanges);
+ StandbyClientSync clientSync = new StandbyClientSync(host,
serverPort.getPort(), storeC, false, getClientTimeout(), false,
folder.newFolder())
) {
serverSync.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=1817296&r1=1817295&r2=1817296&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
Wed Dec 6 13:50:59 2017
@@ -23,13 +23,13 @@ import static org.junit.Assert.assertFal
import java.io.File;
+import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.SegmentTestUtils;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync;
import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync;
import org.apache.jackrabbit.oak.segment.test.TemporaryFileStore;
-import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Rule;
import org.junit.Test;
@@ -63,9 +63,9 @@ public class FailoverMultipleClientsTest
NodeStore store = SegmentNodeStoreBuilders.builder(storeS).build();
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, 1 * MB);
- StandbyClientSync cl1 = newStandbyClientSync(storeC,
serverPort.getPort());
- StandbyClientSync cl2 = newStandbyClientSync(storeC2,
serverPort.getPort())
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, MB);
+ StandbyClientSync cl1 = new StandbyClientSync(getServerHost(),
serverPort.getPort(), storeC, false, getClientTimeout(), false,
folder.newFolder());
+ StandbyClientSync cl2 = new StandbyClientSync(getServerHost(),
serverPort.getPort(), storeC2, false, getClientTimeout(), false,
folder.newFolder())
) {
serverSync.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=1817296&r1=1817295&r2=1817296&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
Wed Dec 6 13:50:59 2017
@@ -25,12 +25,12 @@ import static org.junit.Assert.assertTru
import java.io.File;
+import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync;
import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync;
import org.apache.jackrabbit.oak.segment.test.TemporaryFileStore;
-import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Rule;
import org.junit.Test;
@@ -58,8 +58,8 @@ public class FailoverSslTestIT extends T
FileStore storeS = serverFileStore.fileStore();
FileStore storeC = clientFileStore.fileStore();
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, 1 * MB, true);
- StandbyClientSync clientSync = newStandbyClientSync(storeC,
serverPort.getPort(), true);
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, MB, true);
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), storeC, true,
getClientTimeout(), false, folder.newFolder());
) {
assertTrue(synchronizeAndCompareHead(serverSync, clientSync));
}
@@ -70,8 +70,8 @@ public class FailoverSslTestIT extends T
FileStore storeS = serverFileStore.fileStore();
FileStore storeC = clientFileStore.fileStore();
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, 1 * MB, true);
- StandbyClientSync clientSync = newStandbyClientSync(storeC,
serverPort.getPort());
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, MB, true);
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), storeC, false,
getClientTimeout(), false, folder.newFolder());
) {
assertFalse(synchronizeAndCompareHead(serverSync, clientSync));
}
@@ -82,8 +82,8 @@ public class FailoverSslTestIT extends T
FileStore storeS = serverFileStore.fileStore();
FileStore storeC = clientFileStore.fileStore();
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, 1 * MB);
- StandbyClientSync clientSync = newStandbyClientSync(storeC,
serverPort.getPort(), true);
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, MB);
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), storeC, true,
getClientTimeout(), false, folder.newFolder());
) {
assertFalse(synchronizeAndCompareHead(serverSync, clientSync));
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/MBeanIT.java
Wed Dec 6 13:50:59 2017
@@ -31,11 +31,11 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync;
import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean;
import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync;
import org.apache.jackrabbit.oak.segment.test.TemporaryFileStore;
-import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
@@ -93,7 +93,7 @@ public class MBeanIT extends TestBase {
public void testClientEmptyConfigNoServer() throws Exception {
MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME +
",id=*");
- try (StandbyClientSync clientSync =
newStandbyClientSync(clientFileStore.fileStore(), serverPort.getPort())) {
+ try (StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(),
clientFileStore.fileStore(), false, getClientTimeout(), false,
folder.newFolder())) {
clientSync.start();
clientSync.run();
@@ -130,7 +130,7 @@ public class MBeanIT extends TestBase {
System.setProperty(StandbyClientSync.CLIENT_ID_PROPERTY_NAME, "Foo");
MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
ObjectName status;
- try (StandbyClientSync clientSync =
newStandbyClientSync(clientFileStore.fileStore(), serverPort.getPort())) {
+ try (StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(),
clientFileStore.fileStore(), false, getClientTimeout(), false,
folder.newFolder())) {
clientSync.start();
clientSync.run();
@@ -153,8 +153,8 @@ public class MBeanIT extends TestBase {
MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
ObjectName clientStatus, serverStatus;
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), serverFileStore.fileStore(), 1 * MB);
- StandbyClientSync clientSync =
newStandbyClientSync(clientFileStore.fileStore(), serverPort.getPort())
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), serverFileStore.fileStore(), MB);
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(),
clientFileStore.fileStore(), false, getClientTimeout(), false,
folder.newFolder())
) {
serverSync.start();
serverFileStore.fileStore().flush();
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=1817296&r1=1817295&r2=1817296&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
Wed Dec 6 13:50:59 2017
@@ -25,12 +25,12 @@ import static org.junit.Assert.assertFal
import java.io.File;
+import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync;
import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync;
import org.apache.jackrabbit.oak.segment.test.TemporaryFileStore;
-import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Rule;
import org.junit.Test;
@@ -62,8 +62,8 @@ public class RecoverTestIT extends TestB
addTestContent(store, "client");
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, 1 * MB);
- StandbyClientSync cl = newStandbyClientSync(storeC,
serverPort.getPort())
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), storeS, MB);
+ StandbyClientSync cl = new StandbyClientSync(getServerHost(),
serverPort.getPort(), storeC, false, getClientTimeout(), false,
folder.newFolder())
) {
serverSync.start();
store = SegmentNodeStoreBuilders.builder(storeS).build();
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=1817296&r1=1817295&r2=1817296&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
Wed Dec 6 13:50:59 2017
@@ -32,12 +32,12 @@ import com.google.common.io.ByteStreams;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync;
import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync;
import org.apache.jackrabbit.oak.segment.test.TemporaryFileStore;
-import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -65,15 +65,14 @@ public class StandbyTestIT extends TestB
@Test
public void testSync() throws Exception {
- final int mb = 1 * 1024 * 1024;
- final int blobSize = 5 * mb;
+ int blobSize = 5 * MB;
FileStore primary = serverFileStore.fileStore();
FileStore secondary = clientFileStore.fileStore();
NodeStore store = SegmentNodeStoreBuilders.builder(primary).build();
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, 1 * MB);
- StandbyClientSync clientSync = newStandbyClientSync(secondary,
serverPort.getPort())
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, MB);
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), secondary, false,
getClientTimeout(), false, folder.newFolder())
) {
serverSync.start();
byte[] data = addTestContent(store, "server", blobSize, 150);
@@ -112,8 +111,8 @@ public class StandbyTestIT extends TestB
NodeStore store = SegmentNodeStoreBuilders.builder(primary).build();
try (
- StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, 1 * MB);
- StandbyClientSync clientSync = newStandbyClientSync(secondary,
serverPort.getPort())
+ StandbyServerSync serverSync = new
StandbyServerSync(serverPort.getPort(), primary, MB);
+ StandbyClientSync clientSync = new
StandbyClientSync(getServerHost(), serverPort.getPort(), secondary, false,
getClientTimeout(), false, folder.newFolder())
) {
serverSync.start();
byte[] data = addTestContent(store, "server", blobSize, dataNodes);
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=1817296&r1=1817295&r2=1817296&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
Wed Dec 6 13:50:59 2017
@@ -23,12 +23,12 @@ import static org.junit.Assume.assumeTru
import org.apache.commons.lang3.SystemUtils;
import org.apache.jackrabbit.oak.commons.CIHelper;
-import org.apache.jackrabbit.oak.segment.file.FileStore;
-import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync;
import org.junit.BeforeClass;
public class TestBase {
+
static final int MB = 1024 * 1024;
+
private static final int timeout =
Integer.getInteger("standby.test.timeout", 5000);
// Java 6 on Windows doesn't support dual IP stacks, so we will skip our
@@ -48,19 +48,4 @@ public class TestBase {
return timeout;
}
- public StandbyClientSync newStandbyClientSync(FileStore store, int port)
throws Exception {
- return newStandbyClientSync(store, port, false, getClientTimeout());
- }
-
- public StandbyClientSync newStandbyClientSync(FileStore store, int port,
boolean secure) throws Exception {
- return newStandbyClientSync(store, port, secure, getClientTimeout());
- }
-
- public StandbyClientSync newStandbyClientSync(FileStore store, int port,
int timeout) throws Exception {
- return newStandbyClientSync(store, port, false, timeout);
- }
-
- public StandbyClientSync newStandbyClientSync(FileStore store, int port,
boolean secure, int timeout) throws Exception {
- return new StandbyClientSync(getServerHost(), port, store, secure,
timeout, false);
- }
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BenchmarkBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BenchmarkBase.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BenchmarkBase.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BenchmarkBase.java
Wed Dec 6 13:50:59 2017
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.oak.stats.D
class BenchmarkBase {
- private static class TemporaryFolder implements Closeable {
+ static class TemporaryFolder implements Closeable {
private final File folder;
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BulkTransferBenchmark.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BulkTransferBenchmark.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BulkTransferBenchmark.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/benchmark/BulkTransferBenchmark.java
Wed Dec 6 13:50:59 2017
@@ -96,8 +96,11 @@ public class BulkTransferBenchmark exten
private void test(String name, int nodeCount, boolean useSSL) throws
Exception {
createNodes(nodeCount);
- try (StandbyServerSync serverSync = new StandbyServerSync(PORT,
primaryStore, 1024 * 1024, useSSL);
- StandbyClientSync clientSync = new StandbyClientSync(HOST, PORT,
standbyStore, useSSL, TIMEOUT, false)) {
+ try (
+ TemporaryFolder spoolFolder = new TemporaryFolder("spool-");
+ StandbyServerSync serverSync = new StandbyServerSync(PORT,
primaryStore, 1024 * 1024, useSSL);
+ StandbyClientSync clientSync = new StandbyClientSync(HOST, PORT,
standbyStore, useSSL, TIMEOUT, false, spoolFolder.toFile())
+ ) {
serverSync.start();
MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoderTest.java?rev=1817296&r1=1817295&r2=1817296&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoderTest.java
Wed Dec 6 13:50:59 2017
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.File;
import java.io.InputStream;
import java.util.UUID;
@@ -37,17 +38,22 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.embedded.EmbeddedChannel;
import org.apache.commons.io.IOUtils;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
public class ResponseDecoderTest {
+ @Rule
+ public TemporaryFolder folder = new TemporaryFolder(new File("target"));
+
@Test
public void unrecognizedMessagesShouldBeDropped() throws Exception {
ByteBuf buf = Unpooled.buffer();
buf.writeInt(1);
buf.writeByte(-1);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
assertNull(channel.readInbound());
}
@@ -60,7 +66,7 @@ public class ResponseDecoderTest {
byte mask = createMask(1, 1);
ByteBuf buf = createBlobChunkBuffer(Messages.HEADER_BLOB, 3L, blobId,
blobData, mask);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
GetBlobResponse response = (GetBlobResponse) channel.readInbound();
assertEquals("blobId", response.getBlobId());
@@ -85,7 +91,7 @@ public class ResponseDecoderTest {
byte secondMask = createMask(2, 2);
ByteBuf secondBuf = createBlobChunkBuffer(Messages.HEADER_BLOB, 4L,
blobId, secondChunkbData, secondMask);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(firstBuf);
channel.writeInbound(secondBuf);
@@ -116,7 +122,7 @@ public class ResponseDecoderTest {
buf.writeLong(hash(mask, 3L, blobData) + 1);
buf.writeBytes(blobData);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
assertNull(channel.readInbound());
}
@@ -131,7 +137,7 @@ public class ResponseDecoderTest {
in.writeByte(Messages.HEADER_RECORD);
in.writeBytes(recordIdBytes);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(in);
GetHeadResponse response = (GetHeadResponse) channel.readInbound();
assertEquals(recordId, response.getHeadRecordId());
@@ -150,7 +156,7 @@ public class ResponseDecoderTest {
buf.writeLong(hash(data));
buf.writeBytes(data);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
GetSegmentResponse response = (GetSegmentResponse)
channel.readInbound();
assertEquals(uuid, UUID.fromString(response.getSegmentId()));
@@ -166,7 +172,7 @@ public class ResponseDecoderTest {
buf.writeByte(Messages.HEADER_REFERENCES);
buf.writeBytes(data);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
GetReferencesResponse response = (GetReferencesResponse)
channel.readInbound();
assertEquals("a", response.getSegmentId());
@@ -182,7 +188,7 @@ public class ResponseDecoderTest {
buf.writeByte(Messages.HEADER_REFERENCES);
buf.writeBytes(data);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
assertNull(channel.readInbound());
}
@@ -196,7 +202,7 @@ public class ResponseDecoderTest {
buf.writeByte(Messages.HEADER_REFERENCES);
buf.writeBytes(data);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
GetReferencesResponse response = (GetReferencesResponse)
channel.readInbound();
assertEquals("a", response.getSegmentId());
@@ -212,7 +218,7 @@ public class ResponseDecoderTest {
buf.writeByte(Messages.HEADER_REFERENCES);
buf.writeBytes(data);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
GetReferencesResponse response = (GetReferencesResponse)
channel.readInbound();
assertEquals("a", response.getSegmentId());
@@ -232,7 +238,7 @@ public class ResponseDecoderTest {
buf.writeLong(hash(data) + 1);
buf.writeBytes(data);
- EmbeddedChannel channel = new EmbeddedChannel(new ResponseDecoder());
+ EmbeddedChannel channel = new EmbeddedChannel(new
ResponseDecoder(folder.newFolder()));
channel.writeInbound(buf);
assertNull(channel.readInbound());
}
