mirror of
https://github.com/nosqlbench/nosqlbench.git
synced 2025-02-25 18:55:28 -06:00
Resolve merge conflicts
This commit is contained in:
@@ -62,10 +62,9 @@ public class ErrorMetrics {
|
||||
}
|
||||
|
||||
public synchronized ExceptionExpectedResultVerificationMetrics getExceptionExpectedResultVerificationMetrics() {
|
||||
if (exceptionExpectedResultVerificationMetrics == null) {
|
||||
exceptionExpectedResultVerificationMetrics = new ExceptionExpectedResultVerificationMetrics(activityDef);
|
||||
}
|
||||
return exceptionExpectedResultVerificationMetrics;
|
||||
if (null == exceptionExpectedResultVerificationMetrics)
|
||||
this.exceptionExpectedResultVerificationMetrics = new ExceptionExpectedResultVerificationMetrics(this.parentLabels);
|
||||
return this.exceptionExpectedResultVerificationMetrics;
|
||||
}
|
||||
|
||||
public interface Aware {
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
package io.nosqlbench.engine.api.metrics;
|
||||
|
||||
import com.codahale.metrics.Counter;
|
||||
import io.nosqlbench.api.engine.activityimpl.ActivityDef;
|
||||
import io.nosqlbench.api.config.NBLabeledElement;
|
||||
import io.nosqlbench.api.engine.metrics.ActivityMetrics;
|
||||
|
||||
|
||||
@@ -25,12 +25,14 @@ import io.nosqlbench.api.engine.metrics.ActivityMetrics;
|
||||
* Use this to provide exception metering during expected result verification.
|
||||
*/
|
||||
public class ExceptionExpectedResultVerificationMetrics {
|
||||
private final NBLabeledElement parentLabels;
|
||||
private final Counter verificationErrors;
|
||||
private final Counter verificationRetries;
|
||||
|
||||
public ExceptionExpectedResultVerificationMetrics(ActivityDef activityDef) {
|
||||
verificationRetries = ActivityMetrics.counter(activityDef, "verificationcounts.RETRIES");
|
||||
verificationErrors = ActivityMetrics.counter(activityDef, "verificationcounts.ERRORS");
|
||||
public ExceptionExpectedResultVerificationMetrics(final NBLabeledElement parentLabels) {
|
||||
this.parentLabels = parentLabels;
|
||||
verificationRetries = ActivityMetrics.counter(parentLabels, "verificationcounts.RETRIES");
|
||||
verificationErrors = ActivityMetrics.counter(parentLabels, "verificationcounts.ERRORS");
|
||||
}
|
||||
|
||||
public void countVerificationRetries() {
|
||||
|
||||
Reference in New Issue
Block a user