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

fix for duplicate config_cyclerate gauge when striderate is used

Browse Source
This commit is contained in:
Mark Wolters 2024-01-31 16:37:33 -04:00
parent 46917d18bd
commit 6ffa867d6c
3 changed files with 56 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiters.java
View File

@ -25,9 +25,13 @@ public enum RateLimiters {
private static final Logger logger = LogManager.getLogger(RateLimiters.class); private static final Logger logger = LogManager.getLogger(RateLimiters.class);
public static synchronized RateLimiter createOrUpdate(final NBComponent parent, final RateLimiter extant, final SimRateSpec spec) { public static synchronized RateLimiter createOrUpdate(final NBComponent parent, final RateLimiter extant, final SimRateSpec spec) {
return createOrUpdate(parent, extant, spec, "cycle");
}
public static synchronized RateLimiter createOrUpdate(final NBComponent parent, final RateLimiter extant, final SimRateSpec spec,final String type) {
if (null == extant) { if (null == extant) {
final RateLimiter rateLimiter= new SimRate(parent, spec); final RateLimiter rateLimiter= new SimRate(parent, spec, type);
RateLimiters.logger.info(() -> "Using rate limiter: " + rateLimiter); RateLimiters.logger.info(() -> "Using rate limiter: " + rateLimiter);
return rateLimiter; return rateLimiter;

30
engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRate.java
View File

@ -79,13 +79,18 @@ public class SimRate extends NBBaseComponent implements RateLimiter, Thread.Unca
private long startTime; private long startTime;
public SimRate(NBComponent parent, SimRateSpec spec) { public SimRate(NBComponent parent, SimRateSpec spec) {
this(parent, spec, "cycle");
}
public SimRate(NBComponent parent, SimRateSpec spec, String type) {
super(parent, NBLabels.forKV()); super(parent, NBLabels.forKV());
this.spec = spec; this.spec = spec;
initMetrics(); initMetrics(type);
startFiller(); startFiller();
} }
private void initMetrics() { private void initMetrics(String type) {
if (type.equalsIgnoreCase("cycle")) {
create().gauge( create().gauge(
"cycles_waittime", "cycles_waittime",
() -> (double) getWaitTimeDuration().get(ChronoUnit.NANOS), () -> (double) getWaitTimeDuration().get(ChronoUnit.NANOS),
@ -105,6 +110,27 @@ public class SimRate extends NBBaseComponent implements RateLimiter, Thread.Unca
MetricCategory.Config, MetricCategory.Config,
"the configured burst rate as a multiplier to the configured cycle rate. ex: 1.05 means 5% faster is allowed." "the configured burst rate as a multiplier to the configured cycle rate. ex: 1.05 means 5% faster is allowed."
); );
} else {
create().gauge(
"stride_waittime",
() -> (double) getWaitTimeDuration().get(ChronoUnit.NANOS),
MetricCategory.Core,
"The cumulative scheduling delay which accrues when" +
" an activity is not able to execute operations as fast as requested."
);
create().gauge(
"config_striderate",
() -> spec.opsPerSec,
MetricCategory.Config,
"The configured stride rate in ops/s"
);
create().gauge(
"config_burstrate",
() -> spec.burstRatio,
MetricCategory.Config,
"the configured burst rate as a multiplier to the configured cycle rate. ex: 1.05 means 5% faster is allowed."
);
}
} }
public long refill() { public long refill() {

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

@ -89,6 +89,8 @@ public class SimpleActivity extends NBStatusComponent implements Activity, Invok
private ActivityMetricProgressMeter progressMeter; private ActivityMetricProgressMeter progressMeter;
private String workloadSource = "unspecified"; private String workloadSource = "unspecified";
private final RunStateTally tally = new RunStateTally(); private final RunStateTally tally = new RunStateTally();
public static final String STRIDE = "stride";
public static final String CYCLE = "cycle";
public SimpleActivity(NBComponent parent, ActivityDef activityDef) { public SimpleActivity(NBComponent parent, ActivityDef activityDef) {
super(parent, NBLabels.forKV("activity", activityDef.getAlias()).and(activityDef.auxLabels())); super(parent, NBLabels.forKV("activity", activityDef.getAlias()).and(activityDef.auxLabels()));
@ -315,11 +317,11 @@ public class SimpleActivity extends NBStatusComponent implements Activity, Invok
} }
public void createOrUpdateStrideLimiter(SimRateSpec spec) { public void createOrUpdateStrideLimiter(SimRateSpec spec) {
strideLimiter = RateLimiters.createOrUpdate(this, strideLimiter, spec); strideLimiter = RateLimiters.createOrUpdate(this, strideLimiter, spec, STRIDE);
} }
public void createOrUpdateCycleLimiter(SimRateSpec spec) { public void createOrUpdateCycleLimiter(SimRateSpec spec) {
cycleLimiter = RateLimiters.createOrUpdate(this, cycleLimiter, spec); cycleLimiter = RateLimiters.createOrUpdate(this, cycleLimiter, spec, CYCLE);
} }
/** /**