change names and types

Author: DiannaHohensee

server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java

@@ -333,8 +333,8 @@ public void testNodeWriteLoadsArePresent() {
                 NodeWriteLoad nodeWriteLoad = nodeWriteLoads.get(node.getId());
                 assertThat(nodeWriteLoad.nodeId(), equalTo(node.getId()));
                 assertThat(nodeWriteLoad.totalWriteThreadPoolThreads(), greaterThanOrEqualTo(0));
-                assertThat(nodeWriteLoad.percentWriteThreadPoolUtilization(), greaterThanOrEqualTo(0));
-                assertThat(nodeWriteLoad.maxTaskTimeInWriteQueueMillis(), greaterThanOrEqualTo(0L));
+                assertThat(nodeWriteLoad.averageWriteThreadPoolUtilization(), greaterThanOrEqualTo(0.0f));
+                assertThat(nodeWriteLoad.averageWriteThreadPoolQueueLatencyMillis(), greaterThanOrEqualTo(0L));
             }
         } finally {
             updateClusterSettings(

server/src/main/java/org/elasticsearch/cluster/NodeWriteLoad.java

@@ -20,15 +20,15 @@
  *
  * @param nodeId Node ID.
  * @param totalWriteThreadPoolThreads Total number of threads in the write thread pool.
- * @param percentWriteThreadPoolUtilization Percent of write thread pool threads that are in use, averaged over some period of time.
- * @param maxTaskTimeInWriteQueueMillis How long the oldest task (next to be run) in the write thread pool queue has been queued. Zero if
- *                                      there is no write thread pool queue.
+ * @param averageWriteThreadPoolUtilization Percent of write thread pool threads that are in use, averaged over some period of time.
+ * @param averageWriteThreadPoolQueueLatencyMillis How much time tasks spend in the write thread pool queue. Zero if there is nothing being
+ *                                                 queued in the write thread pool.
  */
 public record NodeWriteLoad(
     String nodeId,
     int totalWriteThreadPoolThreads,
-    int percentWriteThreadPoolUtilization,
-    long maxTaskTimeInWriteQueueMillis
+    float averageWriteThreadPoolUtilization,
+    long averageWriteThreadPoolQueueLatencyMillis
 ) implements Writeable {
 
     public NodeWriteLoad(StreamInput in) throws IOException {
@@ -39,8 +39,8 @@ public NodeWriteLoad(StreamInput in) throws IOException {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(this.nodeId);
         out.writeVInt(this.totalWriteThreadPoolThreads);
-        out.writeVInt(this.percentWriteThreadPoolUtilization);
-        out.writeVLong(this.maxTaskTimeInWriteQueueMillis);
+        out.writeDouble(this.averageWriteThreadPoolUtilization);
+        out.writeVLong(this.averageWriteThreadPoolQueueLatencyMillis);
     }
 
     @Override
@@ -50,8 +50,8 @@ public boolean equals(Object o) {
         NodeWriteLoad other = (NodeWriteLoad) o;
         return nodeId.equals(other.nodeId)
             && totalWriteThreadPoolThreads == other.totalWriteThreadPoolThreads
-            && percentWriteThreadPoolUtilization == other.percentWriteThreadPoolUtilization
-            && maxTaskTimeInWriteQueueMillis == other.maxTaskTimeInWriteQueueMillis;
+            && averageWriteThreadPoolUtilization == other.averageWriteThreadPoolUtilization
+            && averageWriteThreadPoolQueueLatencyMillis == other.averageWriteThreadPoolQueueLatencyMillis;
     }
 
     @Override
@@ -61,10 +61,10 @@ public String toString() {
             + nodeId
             + "], totalWriteThreadPoolThreads=["
             + totalWriteThreadPoolThreads
-            + "], percentWriteThreadPoolUtilization=["
-            + percentWriteThreadPoolUtilization
-            + "], maxTaskTimeInWriteQueueMillis=["
-            + maxTaskTimeInWriteQueueMillis
+            + "], averageWriteThreadPoolUtilization=["
+            + averageWriteThreadPoolUtilization
+            + "], averageWriteThreadPoolQueueLatencyMillis=["
+            + averageWriteThreadPoolQueueLatencyMillis
             + "]}";
     }
 

server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java

@@ -70,8 +70,8 @@ private static Map<String, NodeWriteLoad> randomNodeWriteLoads() {
             String nodeIdKey = randomAlphaOfLength(32);
             final NodeWriteLoad nodeWriteLoad = new NodeWriteLoad(/* nodeId= */ nodeIdKey,
                 /* totalWriteThreadPoolThreads= */ randomIntBetween(1, 16),
-                /* percentWriteThreadPoolUtilization= */randomIntBetween(0, 100),
-                /* maxTaskTimeInWriteQueueMillis= */ randomLongBetween(0, 50000)
+                /* averageWriteThreadPoolUtilization= */randomIntBetween(0, 100),
+                /* averageWriteThreadPoolQueueLatencyMillis= */ randomLongBetween(0, 50000)
             );
             nodeWriteLoads.put(nodeIdKey, nodeWriteLoad);
         }