|
@@ -394,19 +394,6 @@ public class Node implements Closeable {
|
|
|
*/
|
|
|
this.environment = new Environment(settings, initialEnvironment.configFile());
|
|
|
Environment.assertEquivalent(initialEnvironment, this.environment);
|
|
|
- nodeEnvironment = new NodeEnvironment(tmpSettings, environment);
|
|
|
- logger.info(
|
|
|
- "node name [{}], node ID [{}], cluster name [{}], roles {}",
|
|
|
- NODE_NAME_SETTING.get(tmpSettings),
|
|
|
- nodeEnvironment.nodeId(),
|
|
|
- ClusterName.CLUSTER_NAME_SETTING.get(tmpSettings).value(),
|
|
|
- DiscoveryNode.getRolesFromSettings(settings)
|
|
|
- .stream()
|
|
|
- .map(DiscoveryNodeRole::roleName)
|
|
|
- .collect(Collectors.toCollection(LinkedHashSet::new))
|
|
|
- );
|
|
|
- resourcesToClose.add(nodeEnvironment);
|
|
|
- localNodeFactory = new LocalNodeFactory(settings, nodeEnvironment.nodeId());
|
|
|
|
|
|
final List<ExecutorBuilder<?>> executorBuilders = pluginsService.flatMap(p -> p.getExecutorBuilders(settings)).toList();
|
|
|
|
|
@@ -445,6 +432,23 @@ public class Node implements Closeable {
|
|
|
pluginsService.flatMap(Plugin::getSettingsFilter).toList(),
|
|
|
settingsUpgraders
|
|
|
);
|
|
|
+
|
|
|
+ // creating `NodeEnvironment` breaks the ability to rollback to 7.x on an 8.0 upgrade (`upgradeLegacyNodeFolders`) so do this
|
|
|
+ // after settings validation.
|
|
|
+ nodeEnvironment = new NodeEnvironment(tmpSettings, environment);
|
|
|
+ logger.info(
|
|
|
+ "node name [{}], node ID [{}], cluster name [{}], roles {}",
|
|
|
+ NODE_NAME_SETTING.get(tmpSettings),
|
|
|
+ nodeEnvironment.nodeId(),
|
|
|
+ ClusterName.CLUSTER_NAME_SETTING.get(tmpSettings).value(),
|
|
|
+ DiscoveryNode.getRolesFromSettings(settings)
|
|
|
+ .stream()
|
|
|
+ .map(DiscoveryNodeRole::roleName)
|
|
|
+ .collect(Collectors.toCollection(LinkedHashSet::new))
|
|
|
+ );
|
|
|
+ resourcesToClose.add(nodeEnvironment);
|
|
|
+ localNodeFactory = new LocalNodeFactory(settings, nodeEnvironment.nodeId());
|
|
|
+
|
|
|
ScriptModule.registerClusterSettingsListeners(scriptService, settingsModule.getClusterSettings());
|
|
|
final NetworkService networkService = new NetworkService(
|
|
|
getCustomNameResolvers(pluginsService.filterPlugins(DiscoveryPlugin.class))
|