From c4b38428fc3258e1d96943ac3a4b48d677d56dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Dematt=C3=A9?= Date: Mon, 27 Nov 2023 13:19:51 +0100 Subject: [PATCH 1/2] Revert non-semantic NodeInfo (#102636) --- docs/changelog/102636.yaml | 5 +++++ server/src/main/java/org/elasticsearch/node/NodeService.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 docs/changelog/102636.yaml diff --git a/docs/changelog/102636.yaml b/docs/changelog/102636.yaml new file mode 100644 index 0000000000000..8b32e0568b0fb --- /dev/null +++ b/docs/changelog/102636.yaml @@ -0,0 +1,5 @@ +pr: 102636 +summary: Revert non-semantic `NodeInfo` +area: Infra/Core +type: regression +issues: [] diff --git a/server/src/main/java/org/elasticsearch/node/NodeService.java b/server/src/main/java/org/elasticsearch/node/NodeService.java index 7f77bc2ab0e36..e2283ea9851d7 100644 --- a/server/src/main/java/org/elasticsearch/node/NodeService.java +++ b/server/src/main/java/org/elasticsearch/node/NodeService.java @@ -10,6 +10,7 @@ import org.elasticsearch.Build; import org.elasticsearch.TransportVersion; +import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.node.info.ComponentVersionNumber; import org.elasticsearch.action.admin.cluster.node.info.NodeInfo; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; @@ -117,7 +118,8 @@ public NodeInfo info( boolean indices ) { return new NodeInfo( - Build.current().version(), + // TODO: revert to Build.current().version() when Kibana is updated + Version.CURRENT.toString(), TransportVersion.current(), IndexVersion.current(), findComponentVersions(), From 37b7dd987b2dfb0931fbe5e14e1b5516283f8066 Mon Sep 17 00:00:00 2001 From: Iraklis Psaroudakis Date: Mon, 27 Nov 2023 14:45:57 +0200 Subject: [PATCH 2/2] Add warning on desired balancer heuristics (#102633) To avoid changing them. --- .../reference/modules/cluster/shards_allocation.asciidoc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/reference/modules/cluster/shards_allocation.asciidoc b/docs/reference/modules/cluster/shards_allocation.asciidoc index 1f7b83294651f..5a7aa43155c66 100644 --- a/docs/reference/modules/cluster/shards_allocation.asciidoc +++ b/docs/reference/modules/cluster/shards_allocation.asciidoc @@ -183,6 +183,13 @@ The minimum improvement in weight which triggers a rebalancing shard movement. Defaults to `1.0f`. Raising this value will cause {es} to stop rebalancing shards sooner, leaving the cluster in a more unbalanced state. -NOTE: Regardless of the result of the balancing algorithm, rebalancing might +[NOTE] +==== +* It is not recommended to adjust the values of the heuristics settings. The +default values are generally good, and although different values may improve +the current balance, it is possible that they create problems in the future +if the cluster or workload changes. +* Regardless of the result of the balancing algorithm, rebalancing might not be allowed due to allocation rules such as forced awareness and allocation filtering. +====