Skip to content

Commit 6af6b33

Browse files
Restore changes that shouldn't be ported
1 parent af15532 commit 6af6b33

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ public DataStream(
170170
this.name = name;
171171
this.generation = generation;
172172
this.metadata = metadata;
173-
// The following assert is commented out, because system data streams created before 8.1 are not hidden,
174-
// but should be updated to hidden by 8.18/8.19 (SystemIndexMetadataUpgradeService)
175-
// assert system == false || hidden; // system indices must be hidden
173+
assert system == false || hidden; // system indices must be hidden
176174
this.hidden = hidden;
177175
this.replicated = replicated;
178176
this.timeProvider = timeProvider;

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_transform_jobs_crud.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ setup:
9797
---
9898
"Get start, stop mixed cluster batch transform":
9999
# Simple and complex Mixed cluster transforms
100-
- skip:
101-
awaits_fix: "https://github.com/elastic/ml-team/issues/1522"
102-
reason: "Transform system index migration is broken"
103100
- do:
104101
transform.get_transform:
105102
transform_id: "mixed-simple-transform"
@@ -228,9 +225,6 @@ setup:
228225
transform_id: "old-simple-continuous-transform"
229226
---
230227
"Test GET, mixed continuous transforms":
231-
- skip:
232-
awaits_fix: "https://github.com/elastic/ml-team/issues/1522"
233-
reason: "Transform system index migration is broken"
234228
- do:
235229
transform.get_transform:
236230
transform_id: "mixed-simple-continuous-transform"
@@ -295,9 +289,6 @@ setup:
295289

296290
---
297291
"Test index mappings for latest internal index and audit index":
298-
- skip:
299-
awaits_fix: "https://github.com/elastic/ml-team/issues/1522"
300-
reason: "Transform system index migration is broken"
301292
- skip:
302293
features: warnings
303294
- requires:

0 commit comments

Comments
 (0)