Skip to content

Commit a233043

Browse files
authored
Refactor some small uses of DiscoveryNodes version methods (#101589)
1 parent 7609780 commit a233043

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

server/src/main/java/org/elasticsearch/snapshots/RestoreService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@ private static IndexMetadata convertLegacyIndex(
15891589
convertedIndexMetadataBuilder.settings(
15901590
Settings.builder()
15911591
.put(snapshotIndexMetadata.getSettings())
1592-
.put(IndexMetadata.SETTING_INDEX_VERSION_COMPATIBILITY.getKey(), clusterState.getNodes().getSmallestNonClientNodeVersion())
1592+
.put(IndexMetadata.SETTING_INDEX_VERSION_COMPATIBILITY.getKey(), clusterState.getNodes().getMinSupportedIndexVersion())
15931593
.put(IndexMetadata.SETTING_BLOCKS_WRITE, true)
15941594
);
15951595
snapshotIndexMetadata = convertedIndexMetadataBuilder.build();

x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/AbstractProfilingPersistenceManager.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import org.apache.logging.log4j.LogManager;
1111
import org.apache.logging.log4j.Logger;
12+
import org.elasticsearch.Version;
1213
import org.elasticsearch.action.ActionListener;
1314
import org.elasticsearch.action.ActionRequest;
1415
import org.elasticsearch.action.ActionResponse;
@@ -21,6 +22,7 @@
2122
import org.elasticsearch.cluster.ClusterChangedEvent;
2223
import org.elasticsearch.cluster.ClusterState;
2324
import org.elasticsearch.cluster.ClusterStateListener;
25+
import org.elasticsearch.cluster.node.DiscoveryNodes;
2426
import org.elasticsearch.cluster.service.ClusterService;
2527
import org.elasticsearch.common.settings.Settings;
2628
import org.elasticsearch.core.TimeValue;
@@ -71,6 +73,18 @@ public void setTemplatesEnabled(boolean templatesEnabled) {
7173
this.templatesEnabled = templatesEnabled;
7274
}
7375

76+
private static boolean isMixedVersionCluster(DiscoveryNodes nodes) {
77+
Version version = null;
78+
for (var n : nodes) {
79+
if (version == null) {
80+
version = n.getVersion();
81+
} else if (version.equals(n.getVersion()) == false) {
82+
return true;
83+
}
84+
}
85+
return false;
86+
}
87+
7488
@Override
7589
public final void clusterChanged(ClusterChangedEvent event) {
7690
if (templatesEnabled == false) {
@@ -86,7 +100,7 @@ public final void clusterChanged(ClusterChangedEvent event) {
86100
return;
87101
}
88102

89-
if (event.state().nodes().getMaxNodeVersion().after(event.state().nodes().getSmallestNonClientNodeVersion())) {
103+
if (isMixedVersionCluster(event.state().nodes())) {
90104
logger.debug("Skipping up-to-date check as cluster has mixed versions");
91105
return;
92106
}

0 commit comments

Comments
 (0)