Repository: activemq-artemis Updated Branches: refs/heads/master a68eaf4e7 -> 51f4bf0f9
ARTEMIS-2086 Removing HDR Histogram option Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ed71e090 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ed71e090 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ed71e090 Branch: refs/heads/master Commit: ed71e090d1b99bb9e57f4eef5b6a5e0c9b88ef59 Parents: a68eaf4 Author: Clebert Suconic <[email protected]> Authored: Thu Sep 13 14:26:16 2018 -0400 Committer: Clebert Suconic <[email protected]> Committed: Thu Sep 13 15:46:50 2018 -0400 ---------------------------------------------------------------------- artemis-cli/pom.xml | 4 --- .../cli/commands/util/SyncCalculation.java | 31 -------------------- artemis-distribution/src/main/assembly/dep.xml | 1 - pom.xml | 10 ------- 4 files changed, 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ed71e090/artemis-cli/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml index 960d16a..fa386ef 100644 --- a/artemis-cli/pom.xml +++ b/artemis-cli/pom.xml @@ -127,10 +127,6 @@ <version>${commons.lang.version}</version> </dependency> <dependency> - <groupId>org.hdrhistogram</groupId> - <artifactId>HdrHistogram</artifactId> - </dependency> - <dependency> <groupId>com.sun.winsw</groupId> <artifactId>winsw</artifactId> <version>${winsw.version}</version> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ed71e090/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java index c01506d..5b5c9f4 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java @@ -24,7 +24,6 @@ import java.text.DecimalFormat; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import org.HdrHistogram.Histogram; import org.apache.activemq.artemis.core.io.IOCallback; import org.apache.activemq.artemis.core.io.SequentialFile; import org.apache.activemq.artemis.core.io.SequentialFileFactory; @@ -80,7 +79,6 @@ public class SyncCalculation { SequentialFileFactory factory = newFactory(datafolder, fsync, journalType, blockSize * blocks, maxAIO); final boolean asyncWrites = journalType == JournalType.ASYNCIO && !syncWrites; //the write latencies could be taken only when writes are effectively synchronous - final Histogram writeLatencies = (verbose && !asyncWrites) ? new Histogram(MAX_FLUSH_NANOS, 2) : null; if (journalType == JournalType.ASYNCIO && syncWrites) { System.out.println(); @@ -94,9 +92,6 @@ public class SyncCalculation { if (verbose) { System.out.println("Using " + factory.getClass().getName() + " to calculate sync times, alignment=" + factory.getAlignment()); - if (writeLatencies == null) { - System.out.println("*** Use --sync-writes if you want to see a histogram for each write performed ***"); - } } SequentialFile file = factory.createSequentialFile(fileName); //to be sure that a process/thread crash won't leave the dataFolder with garbage files @@ -144,18 +139,11 @@ public class SyncCalculation { bufferBlock.position(0); latch.countUp(); long startWrite = 0; - if (writeLatencies != null) { - startWrite = System.nanoTime(); - } file.writeDirect(bufferBlock, true, callback); if (syncWrites) { flushLatch(latch); } - if (writeLatencies != null) { - final long elapsedWriteNanos = System.nanoTime() - startWrite; - writeLatencies.recordValue(elapsedWriteNanos); - } } if (!syncWrites) flushLatch(latch); @@ -173,29 +161,10 @@ public class SyncCalculation { } file.close(); - if (ntry == 0 && writeLatencies != null) { - writeLatencies.reset(); // discarding the first one.. some warmup time - } } factory.releaseDirectBuffer(bufferBlock); - if (writeLatencies != null) { - System.out.println("Write Latencies Percentile Distribution in microseconds"); - //print latencies in us -> (ns * 1000d) - - System.out.println("*****************************************************************"); - writeLatencies.outputPercentileDistribution(System.out, 1000d); - System.out.println(); - System.out.println("*****************************************************************"); - System.out.println("*** this may be useful to generate charts if you like charts: ***"); - System.out.println("*** http://hdrhistogram.github.io/HdrHistogram/plotFiles.html ***"); - System.out.println("*****************************************************************"); - System.out.println(); - - writeLatencies.reset(); - } - long totalTime = Long.MAX_VALUE; for (int i = 0; i < tries; i++) { if (result[i] < totalTime) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ed71e090/artemis-distribution/src/main/assembly/dep.xml ---------------------------------------------------------------------- diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml index 2f6999a..ead7396 100644 --- a/artemis-distribution/src/main/assembly/dep.xml +++ b/artemis-distribution/src/main/assembly/dep.xml @@ -99,7 +99,6 @@ <include>org.jgroups:jgroups</include> <include>org.apache.geronimo.specs:geronimo-json_1.0_spec</include> <include>org.apache.johnzon:johnzon-core</include> - <include>org.hdrhistogram:HdrHistogram</include> <include>javax.xml.bind:jaxb-api</include> <include>com.sun.xml.bind:jaxb-impl</include> <include>com.sun.xml.bind:jaxb-core</include> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ed71e090/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index beb9dcd..36e5c33 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,6 @@ <activemq5-version>5.14.5</activemq5-version> <apache.derby.version>10.11.1.1</apache.derby.version> <commons.beanutils.version>1.9.3</commons.beanutils.version> - <org.hdrhistogram.version>2.1.10</org.hdrhistogram.version> <commons.collections.version>3.2.2</commons.collections.version> <fuse.mqtt.client.version>1.14</fuse.mqtt.client.version> <guava.version>19.0</guava.version> @@ -685,15 +684,6 @@ <!-- License: Apache 2.0 --> </dependency> - <!-- needed by SyncCalculation --> - <!-- https://mvnrepository.com/artifact/org.hdrhistogram/HdrHistogram --> - <dependency> - <groupId>org.hdrhistogram</groupId> - <artifactId>HdrHistogram</artifactId> - <version>${org.hdrhistogram.version}</version> - <!-- License: Public Domain --> - </dependency> - <!-- needed by artemis-selector --> <dependency> <groupId>xml-apis</groupId>
