From cb54889285c9623f96852a4e449a9ff30b49d600 Mon Sep 17 00:00:00 2001 From: William Brafford Date: Wed, 11 Mar 2020 21:28:37 -0400 Subject: [PATCH 1/2] Use camel case for metric names The REST API uses "thread_pool" as the name of the thread pool metric. If we use this name internally when we serialize nodes stats and info requests, we won't need to do any fancy logic to check for and switch out "threadPool", which was the previous internal name. --- build.gradle | 2 +- .../action/admin/cluster/node/info/NodesInfoRequest.java | 2 +- .../action/admin/cluster/node/stats/NodesStatsRequest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2dbf94ae7dabb..849e2de4e2903 100644 --- a/build.gradle +++ b/build.gradle @@ -221,7 +221,7 @@ task verifyVersions { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = true +boolean bwc_tests_enabled = false final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ if (bwc_tests_enabled == false) { if (bwc_tests_disabled_issue.isEmpty()) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java index 4ea78a17fd0e9..6f33f75692294 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java @@ -286,7 +286,7 @@ enum Metrics { OS("os"), PROCESS("process"), JVM("jvm"), - THREAD_POOL("threadPool"), + THREAD_POOL("thread_pool"), TRANSPORT("transport"), HTTP("http"), PLUGINS("plugins"), diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java index 875af87793cf2..4524a2c082c65 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java @@ -319,7 +319,7 @@ private enum Metric { OS("os"), PROCESS("process"), JVM("jvm"), - THREAD_POOL("threadPool"), + THREAD_POOL("thread_pool"), FS("fs"), TRANSPORT("transport"), HTTP("http"), From b5d745f5346db31bde92ba7b3b7fa954b2e3cfca Mon Sep 17 00:00:00 2001 From: William Brafford Date: Wed, 11 Mar 2020 21:39:55 -0400 Subject: [PATCH 2/2] Add issue link for bwc disabling --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 849e2de4e2903..2b6039c282682 100644 --- a/build.gradle +++ b/build.gradle @@ -222,7 +222,7 @@ task verifyVersions { */ boolean bwc_tests_enabled = false -final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ +final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/53446" /* place a PR link here when committing bwc changes */ if (bwc_tests_enabled == false) { if (bwc_tests_disabled_issue.isEmpty()) { throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")