Skip to content

Commit 20c8060

Browse files
committed
Allow rollup job creation only if cluster is x-pack ready (#30963)
Otherwise we could end up with persistent tasks metadata in the cluster that some of the nodes might not understand in case where the cluster is during rolling upgrade from the default 6.2 to the default 6.3 distribution. Follow-up to #30743
1 parent db8aee8 commit 20c8060

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.elasticsearch.threadpool.ThreadPool;
4343
import org.elasticsearch.transport.TransportService;
4444
import org.elasticsearch.xpack.core.XPackField;
45+
import org.elasticsearch.xpack.core.XPackPlugin;
4546
import org.elasticsearch.xpack.core.rollup.RollupField;
4647
import org.elasticsearch.xpack.core.rollup.action.PutRollupJobAction;
4748
import org.elasticsearch.xpack.core.rollup.job.RollupJob;
@@ -91,6 +92,8 @@ protected void masterOperation(PutRollupJobAction.Request request, ClusterState
9192
return;
9293
}
9394

95+
XPackPlugin.checkReadyForXPackCustomMetadata(clusterState);
96+
9497
FieldCapabilitiesRequest fieldCapsRequest = new FieldCapabilitiesRequest()
9598
.indices(request.getConfig().getIndexPattern())
9699
.fields(request.getConfig().getAllFields().toArray(new String[0]));

0 commit comments

Comments
 (0)