From b8eeaacbcb89cfbe11bd07bf7f1e53587e763a18 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Wed, 5 Jun 2024 17:58:43 +0200 Subject: [PATCH] Ignore connection reset error when triggering a failpoint Signed-off-by: Marek Siarkowicz --- tests/robustness/failpoint/trigger.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/robustness/failpoint/trigger.go b/tests/robustness/failpoint/trigger.go index 3f8e2990a..a099ca312 100644 --- a/tests/robustness/failpoint/trigger.go +++ b/tests/robustness/failpoint/trigger.go @@ -41,7 +41,7 @@ func (t triggerDefrag) Trigger(ctx context.Context, _ *testing.T, member e2e.Etc } defer cc.Close() _, err = cc.Defragment(ctx) - if err != nil && !strings.Contains(err.Error(), "error reading from server: EOF") { + if err != nil && !connectionError(err) { return nil, err } return nil, nil @@ -77,7 +77,7 @@ func (t triggerCompact) Trigger(ctx context.Context, _ *testing.T, member e2e.Et time.Sleep(50 * time.Millisecond) } _, err = cc.Compact(ctx, rev) - if err != nil && !strings.Contains(err.Error(), "error reading from server: EOF") { + if err != nil && !connectionError(err) { return nil, err } return []report.ClientReport{cc.Report()}, nil @@ -86,3 +86,7 @@ func (t triggerCompact) Trigger(ctx context.Context, _ *testing.T, member e2e.Et func (t triggerCompact) Available(e2e.EtcdProcessClusterConfig, e2e.EtcdProcess) bool { return true } + +func connectionError(err error) bool { + return strings.Contains(err.Error(), "error reading from server: EOF") || strings.HasSuffix(err.Error(), "read: connection reset by peer") +}