Skip to content

Commit 61998d5

Browse files
committed
more time for migrating
1 parent 0ee3a8b commit 61998d5

File tree

4 files changed

+8
-52
lines changed

4 files changed

+8
-52
lines changed

maintnotifications/e2e/scenario_endpoint_types_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
232232
// Wait for MIGRATING notification
233233
match, found = logCollector.WaitForLogMatchFunc(func(s string) bool {
234234
return strings.Contains(s, logs2.ProcessingNotificationMessage) && strings.Contains(s, "MIGRATING")
235-
}, 30*time.Second)
235+
}, 60*time.Second)
236236
if !found {
237237
ef("MIGRATING notification was not received for %s endpoint type", endpointTest.name)
238238
}

maintnotifications/e2e/scenario_push_notifications_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ func TestPushNotifications(t *testing.T) {
207207
go func() {
208208
match, found = logCollector.WaitForLogMatchFunc(func(s string) bool {
209209
return strings.Contains(s, logs2.ProcessingNotificationMessage) && strings.Contains(s, "MIGRATING")
210-
}, 20*time.Second)
210+
}, 60*time.Second)
211211
commandsRunner.Stop()
212212
}()
213213
commandsRunner.FireCommandsUntilStop(ctx)
214214
if !found {
215-
ef("MIGRATING notification for migrate action was not received within 20 seconds")
215+
ef("MIGRATING notification for migrate action was not received within 60 seconds")
216216
}
217217
migrateData := logs2.ExtractDataFromLogMessage(match)
218218
seqIDToObserve = int64(migrateData["seqID"].(float64))

maintnotifications/e2e/scenario_timeout_configs_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
195195
failoverResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
196196
Type: "failover",
197197
Parameters: map[string]interface{}{
198-
"bdb_id": endpointConfig.BdbID,
198+
"bdb_id": endpointConfig.BdbID,
199199
},
200200
})
201201
if err != nil {
@@ -243,7 +243,7 @@ func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
243243
migrateResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
244244
Type: "migrate",
245245
Parameters: map[string]interface{}{
246-
"bdb_id": endpointConfig.BdbID,
246+
"bdb_id": endpointConfig.BdbID,
247247
},
248248
})
249249
if err != nil {
@@ -253,7 +253,7 @@ func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
253253
// Wait for MIGRATING notification
254254
match, found = logCollector.WaitForLogMatchFunc(func(s string) bool {
255255
return strings.Contains(s, logs2.ProcessingNotificationMessage) && strings.Contains(s, "MIGRATING")
256-
}, 30*time.Second)
256+
}, 60*time.Second)
257257
if !found {
258258
ef("MIGRATING notification was not received for %s timeout config", timeoutTest.name)
259259
}
@@ -274,7 +274,7 @@ func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
274274
bindResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
275275
Type: "bind",
276276
Parameters: map[string]interface{}{
277-
"bdb_id": endpointConfig.BdbID,
277+
"bdb_id": endpointConfig.BdbID,
278278
},
279279
})
280280
if err != nil {

maintnotifications/e2e/scenario_tls_configs_test.go

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -192,50 +192,6 @@ func ТestTLSConfigurationsPushNotifications(t *testing.T) {
192192
commandsRunner.FireCommandsUntilStop(ctx)
193193
}()
194194

195-
// Test failover with this TLS configuration
196-
p("Testing failover with %s TLS configuration...", tlsTest.name)
197-
failoverResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
198-
Type: "failover",
199-
Parameters: map[string]interface{}{
200-
"bdb_id": endpointConfig.BdbID,
201-
},
202-
})
203-
if err != nil {
204-
ef("Failed to trigger failover action for %s: %v", tlsTest.name, err)
205-
}
206-
207-
// Wait for FAILING_OVER notification
208-
match, found := logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
209-
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "FAILING_OVER")
210-
}, 3*time.Minute)
211-
if !found {
212-
ef("FAILING_OVER notification was not received for %s TLS config", tlsTest.name)
213-
}
214-
failingOverData := logs2.ExtractDataFromLogMessage(match)
215-
p("FAILING_OVER notification received for %s. %v", tlsTest.name, failingOverData)
216-
217-
// Wait for FAILED_OVER notification
218-
seqIDToObserve := int64(failingOverData["seqID"].(float64))
219-
connIDToObserve := uint64(failingOverData["connID"].(float64))
220-
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
221-
return notificationType(s, "FAILED_OVER") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
222-
}, 3*time.Minute)
223-
if !found {
224-
ef("FAILED_OVER notification was not received for %s TLS config", tlsTest.name)
225-
}
226-
failedOverData := logs2.ExtractDataFromLogMessage(match)
227-
p("FAILED_OVER notification received for %s. %v", tlsTest.name, failedOverData)
228-
229-
// Wait for failover to complete
230-
status, err := faultInjector.WaitForAction(ctx, failoverResp.ActionID,
231-
WithMaxWaitTime(240*time.Second),
232-
WithPollInterval(2*time.Second),
233-
)
234-
if err != nil {
235-
ef("[FI] Failover action failed for %s: %v", tlsTest.name, err)
236-
}
237-
p("[FI] Failover action completed for %s: %s", tlsTest.name, status.Status)
238-
239195
// Test migration with this TLS configuration
240196
p("Testing migration with %s TLS configuration...", tlsTest.name)
241197
migrateResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
@@ -251,7 +207,7 @@ func ТestTLSConfigurationsPushNotifications(t *testing.T) {
251207
// Wait for MIGRATING notification
252208
match, found = logCollector.WaitForLogMatchFunc(func(s string) bool {
253209
return strings.Contains(s, logs2.ProcessingNotificationMessage) && strings.Contains(s, "MIGRATING")
254-
}, 30*time.Second)
210+
}, 60*time.Second)
255211
if !found {
256212
ef("MIGRATING notification was not received for %s TLS config", tlsTest.name)
257213
}

0 commit comments

Comments
 (0)