IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
kijanowski
2023-05-17 11:51:18 +02:00
parent 1101df95c4
commit fb8f70bf9a
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/OpDispenser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 nosqlbench
* Copyright (c) 2022-2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

7
engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java
View File

@@ -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 {

10
engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java
View File

@@ -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() {

1
engine-core/src/main/java/io/nosqlbench/engine/core/logging/LoggerConfig.java
View File

@@ -17,7 +17,6 @@
package io.nosqlbench.engine.core.logging;
import io.nosqlbench.api.logging.NBLogLevel;
import io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers.ExpectedResultVerificationErrorHandler;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Filter;