IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-12-22 15:13:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

improvements to many session testing

Browse Source
This commit is contained in:
Jonathan Shook 2024-11-20 16:06:20 -06:00
parent 55f11d5395
commit 36d12fb790
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
View File

@ -85,6 +85,7 @@ public class Cqld4Space extends BaseSpace<Cqld4Space> {
// stop insights for testing // stop insights for testing
OptionsMap defaults = new OptionsMap(); OptionsMap defaults = new OptionsMap();
defaults.put(TypedDriverOption.MONITOR_REPORTING_ENABLED, false); // We don't need to do this every time we run a test or sanity check defaults.put(TypedDriverOption.MONITOR_REPORTING_ENABLED, false); // We don't need to do this every time we run a test or sanity check
defaults.put(TypedDriverOption.SESSION_LEAK_THRESHOLD, 100000000);
DriverConfigLoader dcl = DriverConfigLoader.fromMap(defaults); DriverConfigLoader dcl = DriverConfigLoader.fromMap(defaults);
// add streamlined cql parameters // add streamlined cql parameters

21
nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java
View File

@ -31,10 +31,7 @@ import io.nosqlbench.nb.api.labels.NBLabeledElement;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import java.lang.management.ManagementFactory; import java.lang.management.*;
import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryManagerMXBean;
import java.lang.management.MemoryPoolMXBean;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -48,8 +45,9 @@ import java.util.function.Function;
*/ */
public class NBSession extends NBHeartbeatComponent implements Function<List<Cmd>, ExecutionResult>, NBTokenWords { public class NBSession extends NBHeartbeatComponent implements Function<List<Cmd>, ExecutionResult>, NBTokenWords {
private final static Logger logger = LogManager.getLogger(NBSession.class); private final static Logger logger = LogManager.getLogger(NBSession.class);
// private final ClientSystemMetricChecker clientMetricChecker; // private final ClientSystemMetricChecker clientMetricChecker;
private MemoryMXBean mbean = ManagementFactory.getMemoryMXBean(); private MemoryMXBean mbean = ManagementFactory.getMemoryMXBean();
private OperatingSystemMXBean osbean = ManagementFactory.getOperatingSystemMXBean();
private final Map<String, NBBufferedContainer> containers = new ConcurrentHashMap<>(); private final Map<String, NBBufferedContainer> containers = new ConcurrentHashMap<>();
@ -74,6 +72,17 @@ public class NBSession extends NBHeartbeatComponent implements Function<List<Cmd
new NBSessionSafetyMetrics(this); new NBSessionSafetyMetrics(this);
OperatingSystemMXBean osMxBean = ManagementFactory.getOperatingSystemMXBean();
if (osMxBean instanceof com.sun.management.UnixOperatingSystemMXBean osb) {
create().gauge(
"open_file_descriptors",
() -> (double) osb.getOpenFileDescriptorCount(),
MetricCategory.Internals,
"open file descriptors"
);
}
// on-heap // on-heap
create().gauge( create().gauge(
"on_heap_memory_used", "on_heap_memory_used",
@ -135,7 +144,7 @@ public class NBSession extends NBHeartbeatComponent implements Function<List<Cmd
try (ResultContext results = new ResultContext(collector).ok()) { try (ResultContext results = new ResultContext(collector).ok()) {
for (Cmd cmd : assembledCommands) { for (Cmd cmd : assembledCommands) {
String explanation = "in container '" + cmd.getTargetContext() + "', command '" + cmd.toString() + "'"; String explanation = "in container '" + cmd.getTargetContext() + "', command '" + cmd.toString() + "'";
try (NBInvokableCommand command = NBCommandAssembly.resolve(cmd,this::getContext)) { try (NBInvokableCommand command = NBCommandAssembly.resolve(cmd, this::getContext)) {
NBCommandParams params = NBCommandAssembly.paramsFor(cmd); NBCommandParams params = NBCommandAssembly.paramsFor(cmd);
NBBufferedContainer container = getContext(cmd.getTargetContext()); NBBufferedContainer container = getContext(cmd.getTargetContext());
NBCommandResult cmdResult = container.apply(command, params); NBCommandResult cmdResult = container.apply(command, params);