Skip to content

[ML] [7.x] Only emit deprecation warning if there was actual change of a datafeed's job_id. #44755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2019
Merged

[ML] [7.x] Only emit deprecation warning if there was actual change of a datafeed's job_id. #44755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ac4c1
Only emit deprecation warning if there was actual change of a datafee…
przemekwitek Jul 23, 2019
9017476
Add @Deprecated annotation to DatafeedUpdate.Builder#setJobId method
przemekwitek Jul 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...nt/rest-high-level/src/main/java/org/elasticsearch/client/ml/datafeed/DatafeedUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ public Builder(DatafeedUpdate config) {
this.delayedDataCheckConfig = config.delayedDataCheckConfig;
}

@Deprecated
public Builder setJobId(String jobId) {
this.jobId = jobId;
return this;
Expand Down
5 changes: 5 additions & 0 deletions client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,11 @@ public void testUpdateDatafeed_UpdatingJobIdIsDeprecated() throws Exception {
DatafeedConfig datafeedConfig = DatafeedConfig.builder(datafeedId, jobId).setIndices("some_data_index").build();
execute(new PutDatafeedRequest(datafeedConfig), machineLearningClient::putDatafeed, machineLearningClient::putDatafeedAsync);

DatafeedUpdate datafeedUpdateWithUnchangedJobId = DatafeedUpdate.builder(datafeedId).setJobId(jobId).build();
execute(new UpdateDatafeedRequest(datafeedUpdateWithUnchangedJobId),
machineLearningClient::updateDatafeed,
machineLearningClient::updateDatafeedAsync);

DatafeedUpdate datafeedUpdateWithChangedJobId = DatafeedUpdate.builder(datafeedId).setJobId(anotherJobId).build();
WarningFailureException exception = expectThrows(
WarningFailureException.class,
Expand Down
6 changes: 3 additions & 3 deletions ...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ private DatafeedUpdate(String id, String jobId, TimeValue queryDelay, TimeValue
this.scrollSize = scrollSize;
this.chunkingConfig = chunkingConfig;
this.delayedDataCheckConfig = delayedDataCheckConfig;
if (jobId != null) {
deprecationLogger.deprecated(DEPRECATION_MESSAGE_ON_JOB_ID_UPDATE);
}
}

public DatafeedUpdate(StreamInput in) throws IOException {
Expand Down Expand Up @@ -304,6 +301,9 @@ public DatafeedConfig apply(DatafeedConfig datafeedConfig, Map<String, String> h

DatafeedConfig.Builder builder = new DatafeedConfig.Builder(datafeedConfig);
if (jobId != null) {
if (datafeedConfig.getJobId() != null && datafeedConfig.getJobId().equals(jobId) == false) {
deprecationLogger.deprecated(DEPRECATION_MESSAGE_ON_JOB_ID_UPDATE);
}
builder.setJobId(jobId);
}
if (queryDelay != null) {
Expand Down
10 changes: 10 additions & 0 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,16 @@ setup:
"indexes":["index-foo"],
"scroll_size": 2000
}
- match: { job_id: "datafeeds-crud-1" }

- do:
ml.update_datafeed:
datafeed_id: test-datafeed-1
body: >
{
"job_id": "datafeeds-crud-1"
}
- match: { job_id: "datafeeds-crud-1" }

- do:
warnings:
Expand Down