From ecb51e8c1d1703e923f36318d57e0013aefd9f77 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Oct 2014 07:20:58 +0000
Subject: [PATCH] OPENDJ-1549: xxxrate tools warmup duration does not clear etimes * com.forgerock.opendj.ldap.tools.PerformanceRunner ** Makes the ResponseTimeBuckets inner class package private to allow unit tests. * com.forgerock.opendj.ldap.tools.PerformanceRunnerStatsTestCase ** Adds a simple black box unit test to control PerformanceRunner eTimes calculation.
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java | 13 ++++--
opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerStatsTestCase.java | 50 +++++++++++++++++++++++++
2 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
index feb78b2..50e0795 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
@@ -71,7 +71,7 @@
* Benchmark application framework.
*/
abstract class PerformanceRunner implements ConnectionEventListener {
- private static final class ResponseTimeBuckets {
+ static final class ResponseTimeBuckets {
private static final long NS_1_US = NANOSECONDS.convert(1, MICROSECONDS);
private static final long NS_100_US = NANOSECONDS.convert(100, MICROSECONDS);
private static final long NS_1_MS = NANOSECONDS.convert(1, MILLISECONDS);
@@ -158,7 +158,7 @@
* @return array of response times in microseconds corresponding to
* percentiles.
*/
- private List<Long> getPercentile(double[] percentiles, long nbData) {
+ List<Long> getPercentile(double[] percentiles, long nbData) {
List<Long> responseTimes = new ArrayList<Long>();
Queue<Long> nbDataThresholds = new LinkedList<Long>();
long nbDataSum = nbData;
@@ -187,13 +187,13 @@
private void computePercentiles(Queue<Long> currentDataThreshold, List<Long> responseTimes, long currentSum,
long currentETime) {
- while (currentDataThreshold.peek() != null && currentDataThreshold.peek() > currentSum) {
+ while (currentDataThreshold.peek() != null && currentDataThreshold.peek() >= currentSum) {
responseTimes.add(currentETime);
currentDataThreshold.poll();
}
}
- private void addTimeToInterval(long responseTimeNanoSecs) {
+ void addTimeToInterval(long responseTimeNanoSecs) {
if (responseTimeNanoSecs >= NS_5_S) {
long matchingKey = responseTimeNanoSecs / NS_100_MS;
matchingKey -= matchingKey % 5;
@@ -226,6 +226,11 @@
}
}
+ //To allow tests
+ static ResponseTimeBuckets getResponseTimeBuckets() {
+ return new ResponseTimeBuckets();
+ }
+
/**
* Statistics thread base implementation.
diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerStatsTestCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerStatsTestCase.java
new file mode 100644
index 0000000..b95ee59
--- /dev/null
+++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerStatsTestCase.java
@@ -0,0 +1,50 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2014 ForgeRock AS.
+ */
+package com.forgerock.opendj.ldap.tools;
+
+import org.testng.annotations.Test;
+
+import com.forgerock.opendj.ldap.tools.PerformanceRunner.ResponseTimeBuckets;
+
+import static org.fest.assertions.Assertions.*;
+
+public class PerformanceRunnerStatsTestCase extends ToolsTestCase {
+ @Test
+ public void testResponseTimeBuckets() throws Exception {
+ ResponseTimeBuckets rtb = PerformanceRunner.getResponseTimeBuckets();
+ for (long etime = 100L; etime <= 6000000L; etime += 10L) {
+ rtb.addTimeToInterval(etime * 1000L);
+ }
+ double[] percentiles = new double[] { 0.0025, 0.0050, 0.0075, 0.05, 0.075, 0.1, 1.0, 2.0, 5.5, 10.0, 30.0,
+ 50.0, 80.0, 99.9, 99.99, 99.999 };
+ long[] expectedResult = new long[] { 240L, 390L, 540L, 3000L, 4500L, 6000L, 60000L, 120000L, 330000L,
+ 600000L, 1800000L, 3000000L, 4800000L, 5500000L, 5500000L, 5500000L };
+ int count = expectedResult.length;
+ for (Long computedPercentile : rtb.getPercentile(percentiles, 599991)) {
+ assertThat(computedPercentile).isEqualTo(expectedResult[--count]);
+ }
+ }
+}
--
Gitblit v1.10.0