From 36d12fb790cdd84168efc663ce81af7e0e826f9f Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 20 Nov 2024 16:06:20 -0600
Subject: [PATCH] improvements to many session testing

---
 .../nosqlbench/adapter/cqld4/Cqld4Space.java  |  1 +
 .../core/lifecycle/session/NBSession.java     | 21 +++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
index dc0343437..d640c5d29 100644
--- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
+++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
@@ -85,6 +85,7 @@ public class Cqld4Space extends BaseSpace<Cqld4Space> {
         // stop insights for testing
         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.SESSION_LEAK_THRESHOLD, 100000000);
         DriverConfigLoader dcl = DriverConfigLoader.fromMap(defaults);
 
         // add streamlined cql parameters
diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java
index 4113251d2..4a5180d20 100644
--- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java
+++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java
@@ -31,10 +31,7 @@ import io.nosqlbench.nb.api.labels.NBLabeledElement;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryManagerMXBean;
-import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.*;
 import java.util.List;
 import java.util.Map;
 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 {
     private final static Logger logger = LogManager.getLogger(NBSession.class);
-//    private final ClientSystemMetricChecker clientMetricChecker;
+    //    private final ClientSystemMetricChecker clientMetricChecker;
     private MemoryMXBean mbean = ManagementFactory.getMemoryMXBean();
+    private OperatingSystemMXBean osbean = ManagementFactory.getOperatingSystemMXBean();
 
     private final Map<String, NBBufferedContainer> containers = new ConcurrentHashMap<>();
 
@@ -74,6 +72,17 @@ public class NBSession extends NBHeartbeatComponent implements Function<List<Cmd
 
         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
         create().gauge(
             "on_heap_memory_used",
@@ -135,7 +144,7 @@ public class NBSession extends NBHeartbeatComponent implements Function<List<Cmd
         try (ResultContext results = new ResultContext(collector).ok()) {
             for (Cmd cmd : assembledCommands) {
                 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);
                     NBBufferedContainer container = getContext(cmd.getTargetContext());
                     NBCommandResult cmdResult = container.apply(command, params);