You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ad...@apache.org on 2017/12/19 15:34:32 UTC
svn commit: r1818682 - in /jackrabbit/oak/trunk:
oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/
oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/
oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/be...
Author: adulceanu
Date: Tue Dec 19 15:34:31 2017
New Revision: 1818682
URL: http://svn.apache.org/viewvc?rev=1818682&view=rev
Log:
OAK-6606 - Move BulkTransferBenchmark to oak-benchmarks module
Refactored BulkTransferBenchmark to adhere to constraints imposed by ScalabilityBenchmark
Created ScalabilityStandbySuite which takes care of setting up cold standby server and client
Added:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityStandbySuite.java
Removed:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/BenchmarkBase.java
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/BulkTransferBenchmark.java
Modified:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
Modified: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1818682&r1=1818681&r2=1818682&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java Tue Dec 19 15:34:31 2017
@@ -182,7 +182,7 @@ public class BenchmarkRunner {
.accepts("oneShotRun",
"Whether to do a continuous sync between client and server or sync only once (Segment-Tar-Cold only)")
.withOptionalArg().ofType(Boolean.class)
- .defaultsTo(Boolean.TRUE);
+ .defaultsTo(Boolean.FALSE);
OptionSpec<Boolean> coldSecure = parser
.accepts("secure",
"Whether to enable secure communication between primary and standby in the cold standby topology (Segment-Tar-Cold only)")
Modified: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java?rev=1818682&r1=1818681&r2=1818682&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java Tue Dec 19 15:34:31 2017
@@ -28,6 +28,14 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.google.common.base.Charsets;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.benchmark.CSVResultGenerator;
import org.apache.jackrabbit.oak.benchmark.util.Date;
@@ -55,19 +63,11 @@ import org.apache.jackrabbit.oak.scalabi
import org.apache.jackrabbit.oak.scalability.benchmarks.search.SplitOrderByKeysetPageSearcher;
import org.apache.jackrabbit.oak.scalability.benchmarks.search.SplitOrderByOffsetPageSearcher;
import org.apache.jackrabbit.oak.scalability.benchmarks.search.SplitOrderBySearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.segment.standby.StandbyBulkTransferBenchmark;
import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeRelationshipSuite;
import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityStandbySuite;
/**
* Main class for running scalability/longevity tests.
@@ -209,7 +209,9 @@ public class ScalabilityRunner {
new ConcurrentReader(),
new ConcurrentWriter()),
new ScalabilityNodeRelationshipSuite(withStorage.value(options))
- .addBenchmarks(new AggregateNodeSearcher())
+ .addBenchmarks(new AggregateNodeSearcher()),
+ new ScalabilityStandbySuite()
+ .addBenchmarks(new StandbyBulkTransferBenchmark())
};
Set<String> argset = Sets.newHashSet(nonOption.values(options));
Added: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java?rev=1818682&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java (added)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java Tue Dec 19 15:34:31 2017
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.scalability.benchmarks.segment.standby;
+
+import java.lang.management.ManagementFactory;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.base.Stopwatch;
+import javax.jcr.Credentials;
+import javax.jcr.Repository;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.segment.file.FileStore;
+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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Bulk transfers <code>nodeCount</code> nodes from primary to standby and
+ * outputs statistics related to duration, number of segments transferred and
+ * number of segment bytes transferred.
+ */
+public class StandbyBulkTransferBenchmark extends ScalabilityBenchmark {
+ protected static final Logger LOG = LoggerFactory.getLogger(ScalabilityAbstractSuite.class);
+
+ @Override
+ public void execute(Repository repository, Credentials credentials, ExecutionContext context) throws Exception {
+ Map<Object, Object> contextMap = context.getMap();
+ StandbyClientSync[] clientSyncs = (StandbyClientSync[]) contextMap.get("clientSyncs");
+ StandbyServerSync[] serverSyncs = (StandbyServerSync[]) contextMap.get("serverSyncs");
+ FileStore[] stores = (FileStore[]) contextMap.get("stores");
+
+ stores[0].flush();
+ serverSyncs[0].start();
+
+ MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
+ ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=*");
+ ObjectName clientStatus = new ObjectName(clientSyncs[0].getMBeanName());
+ ObjectName serverStatus = new ObjectName(serverSyncs[0].getMBeanName());
+
+ Stopwatch stopwatch = Stopwatch.createStarted();
+ clientSyncs[0].run();
+ stopwatch.stop();
+
+ Set<ObjectName> instances = jmxServer.queryNames(status, null);
+ ObjectName connectionStatus = null;
+ for (ObjectName s : instances) {
+ if (!s.equals(clientStatus) && !s.equals(serverStatus)) {
+ connectionStatus = s;
+ }
+ }
+ assert (connectionStatus != null);
+
+ long segments = (Long) jmxServer.getAttribute(connectionStatus, "TransferredSegments");
+ long bytes = (Long) jmxServer.getAttribute(connectionStatus, "TransferredSegmentBytes");
+
+ LOG.info("Bulk transfer for {} nodes finished! Segments = {}, segments size = {} bytes, time = {}",
+ Integer.getInteger("nodeCount", 100_000), segments, bytes, stopwatch);
+ }
+}
Added: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityStandbySuite.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityStandbySuite.java?rev=1818682&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityStandbySuite.java (added)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityStandbySuite.java Tue Dec 19 15:34:31 2017
@@ -0,0 +1,131 @@
+package org.apache.jackrabbit.oak.scalability.suites;
+
+import java.io.ByteArrayInputStream;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.Random;
+
+import javax.jcr.Credentials;
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.Session;
+import org.apache.jackrabbit.oak.fixture.OakFixture;
+import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
+import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
+import org.apache.jackrabbit.oak.fixture.SegmentTarFixture;
+import org.apache.jackrabbit.oak.scalability.ScalabilitySuite;
+import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark;
+
+/**
+ * This suite test will set up a primary instance and a standby instance. It
+ * will create <code>nodeCount</code> nodes on primary, to be synced on the
+ * standby. It is the responsibility of the test to start the standby process
+ * and to query different JMX MBeans for asserting benchmark duration.
+ *
+ * <p>
+ * In order to obtain meaningful results, please note that the
+ * <code>noWarmup</code> JVM property needs to be set to <code>true</code>. This
+ * way "false" sync cycles taking up only a few milliseconds are avoided.
+ *
+ * <p>
+ * The following system JVM properties can be defined to configure the suite.
+ *
+ * <ul>
+ * <li><code>nodeCount</code> - Controls the number of nodes to be created on
+ * the primary. Defaults to 100_000.</li>
+ * </ul>
+ *
+ */
+public class ScalabilityStandbySuite extends ScalabilityAbstractSuite {
+
+ /**
+ * Number of nodes to be created on primary.
+ */
+ private static final int NODE_COUNT = Integer.getInteger("nodeCount", 100_000);
+
+ /**
+ * Iteration counter
+ */
+ private int iteration = 0;
+
+ @Override
+ public ScalabilitySuite addBenchmarks(ScalabilityBenchmark... benchmarks) {
+ for (ScalabilityBenchmark sb : benchmarks) {
+ this.benchmarks.put(sb.toString(), sb);
+ }
+ return this;
+ }
+
+ @Override
+ public void setUp(Repository repository, RepositoryFixture fixture, Credentials credentials) throws Exception {
+ super.setUp(repository, fixture, credentials);
+
+ if (!(fixture instanceof OakRepositoryFixture)) {
+ return;
+ }
+
+ OakRepositoryFixture orf = (OakRepositoryFixture) fixture;
+ SegmentTarFixture stf = (SegmentTarFixture) orf.getOakFixture();
+
+ if (orf.toString().equals(OakFixture.OAK_SEGMENT_TAR_COLD)) {
+
+ Map<Object, Object> contextMap = context.getMap();
+ contextMap.put("clientSyncs", stf.getClientSyncs());
+ contextMap.put("serverSyncs", stf.getServerSyncs());
+ contextMap.put("stores", stf.getStores());
+ } else {
+ throw new IllegalArgumentException(
+ "Cannot run ScalabilityStandbySuite on current fixture. Use Oak-Segment-Tar-Cold instead!");
+ }
+ }
+
+ @Override
+ public void beforeIteration(ExecutionContext context) throws Exception {
+ Session session = loginWriter();
+ Node rootFolder = session.getRootNode().addNode("rootFolder" + iteration++, "nt:folder");
+ createNodes(rootFolder, NODE_COUNT, new Random());
+ session.save();
+ }
+
+ @Override
+ protected void executeBenchmark(ScalabilityBenchmark benchmark, ExecutionContext context) throws Exception {
+ LOG.info("Started pre benchmark hook : {}", benchmark);
+ benchmark.beforeExecute(getRepository(), CREDENTIALS, context);
+
+ LOG.info("Started execution : {}", benchmark);
+ if (PROFILE) {
+ context.startProfiler();
+ }
+
+ try {
+ benchmark.execute(getRepository(), CREDENTIALS, context);
+ } catch (Exception e) {
+ LOG.error("Exception in benchmark execution ", e);
+ }
+
+ context.stopProfiler();
+
+ LOG.info("Started post benchmark hook : {}", benchmark);
+ benchmark.afterExecute(getRepository(), CREDENTIALS, context);
+ }
+
+ @SuppressWarnings("deprecation")
+ private static void createNodes(Node parent, int nodeCount, Random random) throws Exception {
+ final int blobSize = 5 * 1024;
+
+ for (int j = 0; j <= nodeCount / 1000; j++) {
+ Node folder = parent.addNode("Folder#" + j, "nt:folder");
+ for (int i = 0; i < (nodeCount < 1000 ? nodeCount : 1000); i++) {
+ Node file = folder.addNode("server" + i, "nt:file");
+
+ byte[] data = new byte[blobSize];
+ new Random().nextBytes(data);
+
+ Node content = file.addNode("jcr:content", "nt:resource");
+ content.setProperty("jcr:mimeType", "application/octet-stream");
+ content.setProperty("jcr:lastModified", Calendar.getInstance());
+ content.setProperty("jcr:data", new ByteArrayInputStream(data));
+ }
+ }
+ }
+}
Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1818682&r1=1818681&r2=1818682&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java Tue Dec 19 15:34:31 2017
@@ -323,7 +323,7 @@ public abstract class OakFixture {
return new SegmentTarFixture(builder, withColdStandby, syncInterval, shareBlobStore, secure, oneShotRun);
}
-
+
public static OakFixture getVanillaSegmentTar(final File base, final int maxFileSizeMB,
final int cacheSizeMB, final boolean memoryMapping) {
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=1818682&r1=1818681&r2=1818682&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 Tue Dec 19 15:34:31 2017
@@ -46,7 +46,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
-class SegmentTarFixture extends OakFixture {
+public class SegmentTarFixture extends OakFixture {
/**
* Listener instance doing nothing on a {@code SegmentNotFoundException}
*/
@@ -258,9 +258,6 @@ class SegmentTarFixture extends OakFixtu
serverSyncs[i] = new StandbyServerSync(port, stores[i], 1 * MB, secure);
clientSyncs[i] = new StandbyClientSync("127.0.0.1", port, stores[n + i], secure, DEFAULT_TIMEOUT, false, new File(StandardSystemProperty.JAVA_IO_TMPDIR.value()));
- serverSyncs[i].start();
- clientSyncs[i].start();
-
if (!oneShotRun) {
serverSyncs[i].start();
clientSyncs[i].start();
@@ -348,4 +345,12 @@ class SegmentTarFixture extends OakFixtu
return stores;
}
+ public StandbyServerSync[] getServerSyncs() {
+ return serverSyncs;
+ }
+
+ public StandbyClientSync[] getClientSyncs() {
+ return clientSyncs;
+ }
+
}