Merge pull request #66 from emc-mongoose/release-v3.6.1

issue #1157 resolution
emc-mongoose · Mar 23, 2018 · 19cfacf · 19cfacf
2 parents 266494c + 60c99d2
commit 19cfacf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/api/metrics/src/main/java/com/emc/mongoose/api/metrics/BasicMetricsContext.java b/api/metrics/src/main/java/com/emc/mongoose/api/metrics/BasicMetricsContext.java
@@ -3,6 +3,7 @@
 import com.codahale.metrics.Clock;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.SlidingWindowReservoir;
+import com.codahale.metrics.UniformReservoir;
 import com.codahale.metrics.UniformSnapshot;
 import com.emc.mongoose.api.model.io.IoType;
 
@@ -71,10 +72,10 @@ public BasicMetricsContext(
 		this.perfDbResultsFileFlag = perfDbResultsFileFlag;
 		this.outputPeriodMillis = TimeUnit.SECONDS.toMillis(updateIntervalSec);
 
-		respLatency = new Histogram(new SlidingWindowReservoir(DEFAULT_RESERVOIR_SIZE));
+		respLatency = new Histogram(new UniformReservoir(DEFAULT_RESERVOIR_SIZE));
 		respLatSnapshot = respLatency.getSnapshot();
 		respLatencySum = new LongAdder();
-		reqDuration = new Histogram(new SlidingWindowReservoir(DEFAULT_RESERVOIR_SIZE));
+		reqDuration = new Histogram(new UniformReservoir(DEFAULT_RESERVOIR_SIZE));
 		reqDurSnapshot = reqDuration.getSnapshot();
 		actualConcurrency = new Histogram(new SlidingWindowReservoir(DEFAULT_RESERVOIR_SIZE));
 		actualConcurrencySnapshot = actualConcurrency.getSnapshot();

diff --git a/api/metrics/src/main/java/com/emc/mongoose/api/metrics/logging/MetricsCsvLogMessage.java b/api/metrics/src/main/java/com/emc/mongoose/api/metrics/logging/MetricsCsvLogMessage.java
@@ -77,7 +77,7 @@ public final void formatTo(final StringBuilder strb) {
 			.append(snapshot.getDurationMed()).append(',')
 			.append(snapshot.getDurationHiQ()).append(',')
 			.append(snapshot.getDurationMax()).append(',')
-			.append(snapshot.getDurationMean()).append(',')
+			.append(snapshot.getLatencyMean()).append(',')
 			.append(snapshot.getLatencyMin()).append(',')
 			.append(snapshot.getLatencyLoQ()).append(',')
 			.append(snapshot.getLatencyMed()).append(',')

diff --git a/config/defaults.json b/config/defaults.json
@@ -219,7 +219,7 @@
 				// An user may place here a key-value pair which will be used as HTTP header.
 				"headers": {
 					"Connection": "Keep-Alive",
-					"User-Agent": "mongoose/3.6.0"
+					"User-Agent": "mongoose/3.6.1"
 				},
 				// The HTTP storage namespace.
 				// WARNING: the default value (null) will not work in the case of Swift API
@@ -272,7 +272,7 @@
 		}
 	},
 	// The Mongoose version
-	"version": "3.6.0",
+	"version": "3.6.1",
 	// The aliasing section mapping the old configuration parameters/values to the current ones
 	"aliasing": [