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

use built-in activity error handler wiring for http

Browse Source
This commit is contained in:
Jonathan Shook 2021-04-27 15:27:25 -05:00
parent d905c35254
commit 5ecda12f44
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java
View File

@ -62,14 +62,6 @@ public class HttpActivity extends SimpleActivity implements Activity, ActivityDe
this.sequencer = createOpSequence(ReadyHttpOp::new);
setDefaultsFromOpSequence(sequencer);
onActivityDefUpdate(activityDef);
this.errorhandler = new NBErrorHandler(
() -> activityDef.getParams().getOptionalString("errors").orElse("stop"),
this::getExceptionMetrics
);
}
public NBErrorHandler getErrorHandler() {
return this.errorhandler;
}
@Override

14
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
View File

@ -4,6 +4,8 @@ import com.codahale.metrics.Timer;
import io.nosqlbench.engine.api.activityapi.core.*;
import io.nosqlbench.engine.api.activityapi.cyclelog.filters.IntPredicateDispenser;
import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics;
import io.nosqlbench.engine.api.activityapi.errorhandling.modular.ErrorHandler;
import io.nosqlbench.engine.api.activityapi.errorhandling.modular.NBErrorHandler;
import io.nosqlbench.engine.api.activityapi.input.Input;
import io.nosqlbench.engine.api.activityapi.input.InputDispenser;
import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
@ -31,7 +33,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.function.Function;
import java.util.function.LongFunction;
import java.util.function.Supplier;
/**
@ -57,6 +58,7 @@ public class SimpleActivity implements Activity, ProgressCapable {
private long startedAtMillis;
private int nameEnumerator = 0;
private ErrorMetrics errorMetrics;
private NBErrorHandler errorHandler;
public SimpleActivity(ActivityDef activityDef) {
this.activityDef = activityDef;
@ -84,6 +86,15 @@ public class SimpleActivity implements Activity, ProgressCapable {
onActivityDefUpdate(this.activityDef);
}
public synchronized NBErrorHandler getErrorHandler() {
if (errorHandler==null) {
errorHandler=new NBErrorHandler(
() -> activityDef.getParams().getOptionalString("errors").orElse("stop"),
() -> getExceptionMetrics(),
getErrorNameMapper());
}
return errorHandler;
}
public synchronized RunState getRunState() {
return runState;
@ -490,4 +501,5 @@ public class SimpleActivity implements Activity, ProgressCapable {
}
}