Skip to content

Commit ba84ec5

Browse files
authored
No longer require master node to install Watcher templates (#85287) (#85294)
The master node was required to install Watcher index templates in earlier versions of 7.x to ensure that the master node was aware of composable index templates. When upgrading to 8.x this is no longer an issue since all upgrade paths require elder version of Elasticsearch to be on a version that is aware of composable index templates. This should fix #85043 by ensuring that the watcher history index template is always in place prior to it's intended usage irregardless of the order of which nodes are upgraded.
1 parent e3a5d9a commit ba84ec5

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

docs/changelog/85287.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 85287
2+
summary: No longer require master node to install Watcher templates
3+
area: Watcher
4+
type: bug
5+
issues:
6+
- 85043

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,4 @@ public static boolean validate(ClusterState state) {
9494
.map(s -> Integer.valueOf(s.substring(s.lastIndexOf('-') + 1)))
9595
.anyMatch(version -> version >= 12);
9696
}
97-
98-
@Override
99-
protected boolean requiresMasterNode() {
100-
// These installs a composable index template which is only supported in early versions of 7.x
101-
// In mixed cluster without this set to true can result in errors in the logs during rolling upgrades.
102-
// If these template(s) are only installed via elected master node then composable templates are available.
103-
return true;
104-
}
10597
}

0 commit comments

Comments
 (0)