Skip to content

Commit d37e09b

Browse files
committed
Test/draft to see where and how issues in CI arise
This is not a draft or a PR for anyone to review
1 parent 0f8178a commit d37e09b

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,19 @@ public void onFailure(Exception e) {
223223
Consumer<Job> createDataExtractor = job -> {
224224
final List<String> remoteIndices = RemoteClusterLicenseChecker.remoteIndices(params.getDatafeedIndices());
225225
if (remoteIndices.isEmpty() == false) {
226+
if (remoteClusterClient == false) {
227+
responseHeaderPreservingListener.onFailure(
228+
ExceptionsHelper.badRequestException(
229+
Messages.getMessage(
230+
Messages.DATAFEED_NEEDS_REMOTE_CLUSTER_SEARCH,
231+
datafeedConfigHolder.get().getId(),
232+
RemoteClusterLicenseChecker.remoteIndices(datafeedConfigHolder.get().getIndices()),
233+
clusterService.getNodeName()
234+
)
235+
)
236+
);
237+
}
238+
226239
final RemoteClusterLicenseChecker remoteClusterLicenseChecker = new RemoteClusterLicenseChecker(
227240
client,
228241
MachineLearningField.ML_API_FEATURE
@@ -235,17 +248,6 @@ public void onFailure(Exception e) {
235248
ActionListener.wrap(response -> {
236249
if (response.isSuccess() == false) {
237250
responseHeaderPreservingListener.onFailure(createUnlicensedError(params.getDatafeedId(), response));
238-
} else if (remoteClusterClient == false) {
239-
responseHeaderPreservingListener.onFailure(
240-
ExceptionsHelper.badRequestException(
241-
Messages.getMessage(
242-
Messages.DATAFEED_NEEDS_REMOTE_CLUSTER_SEARCH,
243-
datafeedConfigHolder.get().getId(),
244-
RemoteClusterLicenseChecker.remoteIndices(datafeedConfigHolder.get().getIndices()),
245-
clusterService.getNodeName()
246-
)
247-
)
248-
);
249251
} else {
250252
final RemoteClusterService remoteClusterService = transportService.getRemoteClusterService();
251253
List<String> remoteAliases = RemoteClusterLicenseChecker.remoteClusterAliases(

0 commit comments

Comments
 (0)