File tree 3 files changed +7
-21
lines changed
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config
3 files changed +7
-21
lines changed Original file line number Diff line number Diff line change @@ -170,9 +170,9 @@ tasks.register("verifyVersions") {
170
170
* after the backport of the backcompat code is complete.
171
171
*/
172
172
173
- boolean bwc_tests_enabled = false
173
+ boolean bwc_tests_enabled = true
174
174
// place a PR link here when committing bwc changes:
175
- String bwc_tests_disabled_issue = " https://github.com/elastic/elasticsearch/pull/74093 "
175
+ String bwc_tests_disabled_issue = " "
176
176
/*
177
177
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
178
178
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable
Original file line number Diff line number Diff line change @@ -245,11 +245,7 @@ public Job(StreamInput in) throws IOException {
245
245
resultsIndexName = in .readString ();
246
246
deleting = in .readBoolean ();
247
247
allowLazyOpen = in .readBoolean ();
248
- if (in .getVersion ().onOrAfter (Version .V_8_0_0 )) {
249
- blocked = new Blocked (in );
250
- } else {
251
- blocked = deleting ? new Blocked (Blocked .Reason .DELETE , null ) : Blocked .none ();
252
- }
248
+ blocked = new Blocked (in );
253
249
}
254
250
255
251
/**
@@ -526,9 +522,7 @@ public void writeTo(StreamOutput out) throws IOException {
526
522
out .writeString (resultsIndexName );
527
523
out .writeBoolean (deleting );
528
524
out .writeBoolean (allowLazyOpen );
529
- if (out .getVersion ().onOrAfter (Version .V_8_0_0 )) {
530
- blocked .writeTo (out );
531
- }
525
+ blocked .writeTo (out );
532
526
}
533
527
534
528
@ Override
@@ -972,9 +966,7 @@ public void writeTo(StreamOutput out) throws IOException {
972
966
out .writeOptionalString (resultsIndexName );
973
967
out .writeBoolean (deleting );
974
968
out .writeBoolean (allowLazyOpen );
975
- if (out .getVersion ().onOrAfter (Version .V_8_0_0 )) {
976
- blocked .writeTo (out );
977
- }
969
+ blocked .writeTo (out );
978
970
}
979
971
980
972
public boolean equals (Object o ) {
Original file line number Diff line number Diff line change @@ -159,11 +159,7 @@ public JobUpdate(StreamInput in) throws IOException {
159
159
modelSnapshotMinVersion = null ;
160
160
}
161
161
allowLazyOpen = in .readOptionalBoolean ();
162
- if (in .getVersion ().onOrAfter (Version .V_8_0_0 )) {
163
- blocked = in .readOptionalWriteable (Blocked ::new );
164
- } else {
165
- blocked = null ;
166
- }
162
+ blocked = in .readOptionalWriteable (Blocked ::new );
167
163
}
168
164
169
165
@ Override
@@ -204,9 +200,7 @@ public void writeTo(StreamOutput out) throws IOException {
204
200
out .writeBoolean (false );
205
201
}
206
202
out .writeOptionalBoolean (allowLazyOpen );
207
- if (out .getVersion ().onOrAfter (Version .V_8_0_0 )) {
208
- out .writeOptionalWriteable (blocked );
209
- }
203
+ out .writeOptionalWriteable (blocked );
210
204
}
211
205
212
206
public String getJobId () {
You can’t perform that action at this time.
0 commit comments