update

Author: drempapis

server/src/main/java/org/elasticsearch/cluster/coordination/SearchIndexTimeTrackingCleanupService.java

@@ -14,13 +14,27 @@
 import org.elasticsearch.common.util.concurrent.TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor;
 import org.elasticsearch.index.Index;
 
+/**
+ * Service responsible for cleaning up task execution time tracking for deleted indices.
+ * Implements the ClusterStateListener interface to listen for cluster state changes.
+ */
 public class SearchIndexTimeTrackingCleanupService implements ClusterStateListener {
     private TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor executor;
 
+    /**
+     * Constructs a new SearchIndexTimeTrackingCleanupService.
+     *
+     * @param executor the executor that tracks task execution times per index
+     */
     public SearchIndexTimeTrackingCleanupService(TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor executor) {
         this.executor = executor;
     }
 
+    /**
+     * Called when the cluster state changes. Stops tracking execution time for deleted indices.
+     *
+     * @param event the cluster changed event
+     */
     @Override
     public void clusterChanged(ClusterChangedEvent event) {
         for (Index index : event.indicesDeleted()) {

server/src/main/java/org/elasticsearch/common/util/concurrent/TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor.java

@@ -28,8 +28,8 @@
  */
 public class TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor extends TaskExecutionTimeTrackingEsThreadPoolExecutor {
     private static final Logger logger = LogManager.getLogger(TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor.class);
-    public final ConcurrentHashMap<String, Tuple<LongAdder, ExponentiallyWeightedMovingAverage>> indexExecutionTime;
-    public final ConcurrentHashMap<Runnable, String> runnableToIndexName;
+    private final ConcurrentHashMap<String, Tuple<LongAdder, ExponentiallyWeightedMovingAverage>> indexExecutionTime;
+    private final ConcurrentHashMap<Runnable, String> runnableToIndexName;
 
     TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor(
         String name,
@@ -118,4 +118,23 @@ protected void trackExecutionTime(Runnable r, long taskTime) {
             runnableToIndexName.remove(r);
         }
     }
+
+    //TODO Remove these methods once the NodeConstruction#searchLoadMetricsReporter is deleted
+    /**
+     * Gets the map of index execution times.
+     *
+     * @return the map of index execution times
+     */
+    public ConcurrentHashMap<String, Tuple<LongAdder, ExponentiallyWeightedMovingAverage>> getIndexExecutionTime() {
+        return indexExecutionTime;
+    }
+
+    /**
+     * Gets the map of runnable tasks to index names.
+     *
+     * @return the map of runnable tasks to index names
+     */
+    public ConcurrentHashMap<Runnable, String> getRunnableToIndexName() {
+        return runnableToIndexName;
+    }
 }

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -705,12 +705,9 @@ private void construct(
         ClusterService clusterService = createClusterService(settingsModule, threadPool, taskManager);
         clusterService.addStateApplier(scriptService);
 
-        // TODO DR - this is a bit of a hack to get the cluster service into the plugins
-        var executor = (TaskExecutionTimeTrackingEsThreadPoolExecutor) threadPool.executor(ThreadPool.Names.SEARCH);
-        TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor perIndexEsThreadPoolExecutor =
-            (TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor) executor;
-        searchLoadMetricsReporter(perIndexEsThreadPoolExecutor);
-        clusterService.addListener(new SearchIndexTimeTrackingCleanupService(perIndexEsThreadPoolExecutor));
+        var executor = (TaskExecutionTimeTrackingPerIndexEsThreadPoolExecutor) threadPool.executor(ThreadPool.Names.SEARCH);
+        clusterService.addListener(new SearchIndexTimeTrackingCleanupService(executor));
+        if(logger.isDebugEnabled()) searchLoadMetricsReporter(executor);
 
         modules.bindToInstance(DocumentParsingProvider.class, documentParsingProvider);
 
@@ -1270,18 +1267,19 @@ private void searchLoadMetricsReporter(TaskExecutionTimeTrackingPerIndexEsThread
         TimerTask task = new TimerTask() {
             @Override
             public void run() {
-                if (executor.indexExecutionTime.size() > 0) {
-                    logger.info("Number of reported indices: {}", executor.indexExecutionTime.size());
-                    logger.info("Number of runnables: {}", executor.runnableToIndexName.size());
-                    executor.indexExecutionTime.forEach((index, tuple) -> {
-                        logger.info("Index: {}, Total execution time: {}, EWMA: {}", index, tuple.v1().sum(), tuple.v2().getAverage());
+                if (executor.getIndexExecutionTime().size() > 0) {
+                    logger.debug("Number of reported indices: {}", executor.getIndexExecutionTime().size());
+                    logger.debug("Number of runnables: {}", executor.getRunnableToIndexName().size());
+                    executor.getIndexExecutionTime().forEach((index, tuple) -> {
+                        logger.debug("Index: {}, Total execution time: {}, EWMA: {}", index, tuple.v1().sum(), tuple.v2().getAverage());
                     });
-                    logger.info("Total task execution time: {}", executor.getTotalTaskExecutionTime());
-                    logger.info("----------------------------------------------------------------------------------");
+                    logger.debug("Total task execution time: {}", executor.getTotalTaskExecutionTime());
+                    logger.debug("----------------------------------------------------------------------------------");
                 }
             }
         };
 
+
         timer.scheduleAtFixedRate(task, 0, 4000);
     }