Skip to content

Commit 43d92f3

Browse files
committed
Fix rollover being mistaken to happen twice
This is not the case because we upgrade from 7.17 to 8.19, which contains the change to the template already. So when we upgrade again to 9.1, it will not rollover. See elastic/elasticsearch#119995.
1 parent 63f97c9 commit 43d92f3

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

functionaltests/9_x_test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,12 @@ func managedThenUpgrade789Runner(fromVersion7, toVersion8, toVersion9 ecclient.S
124124
"metrics-apm.transaction.1m-%s": checkILM,
125125
}
126126

127-
checkILMRolloverTwice := asserts.CheckDataStreamIndividualWant{
128-
PreferIlm: true,
129-
DSManagedBy: managedByILM,
130-
IndicesManagedBy: []string{managedByILM, managedByILM, managedByILM},
131-
}
132-
133127
check9 := map[string]asserts.CheckDataStreamIndividualWant{
134-
// These data streams are rolled over in 8.x, so with the 9.x rollover
135-
// there will be 3 indices per DS.
136-
"traces-apm-%s": checkILMRolloverTwice,
137-
"metrics-apm.app.opbeans_python-%s": checkILMRolloverTwice,
138-
"metrics-apm.internal-%s": checkILMRolloverTwice,
139-
"logs-apm.error-%s": checkILMRolloverTwice,
128+
// These data streams are already rolled over in 8.x.
129+
"traces-apm-%s": checkILMRollover,
130+
"metrics-apm.app.opbeans_python-%s": checkILMRollover,
131+
"metrics-apm.internal-%s": checkILMRollover,
132+
"logs-apm.error-%s": checkILMRollover,
140133
// These data streams are only created in 8.x, so they will only be
141134
// rolled over once.
142135
"metrics-apm.service_destination.1m-%s": checkILMRollover,

0 commit comments

Comments
 (0)