From 9db485a681910763f63885569155656ceede3901 Mon Sep 17 00:00:00 2001
From: Yannick Welsch <yannick@welsch.lu>
Date: Wed, 30 May 2018 14:38:34 +0200
Subject: [PATCH] Allow rollup job creation only if cluster is x-pack ready

---
 .../xpack/rollup/action/TransportPutRollupJobAction.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java b/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java
index 0e674ba000bd0..24dcb323e3dc6 100644
--- a/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java
+++ b/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/TransportPutRollupJobAction.java
@@ -42,6 +42,7 @@
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.xpack.core.XPackField;
+import org.elasticsearch.xpack.core.XPackPlugin;
 import org.elasticsearch.xpack.core.rollup.RollupField;
 import org.elasticsearch.xpack.core.rollup.action.PutRollupJobAction;
 import org.elasticsearch.xpack.core.rollup.job.RollupJob;
@@ -91,6 +92,8 @@ protected void masterOperation(PutRollupJobAction.Request request, ClusterState
             return;
         }
 
+        XPackPlugin.checkReadyForXPackCustomMetadata(clusterState);
+
         FieldCapabilitiesRequest fieldCapsRequest = new FieldCapabilitiesRequest()
                 .indices(request.getConfig().getIndexPattern())
                 .fields(request.getConfig().getAllFields().toArray(new String[0]));