-
Notifications
You must be signed in to change notification settings - Fork 9.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[3.5] chore(e2e): backport TestNoErrorLogsDuringNormalOperations test #18807
Merged
ahrtr
merged 1 commit into
etcd-io:release-3.5
from
ghouscht:backport-3.5-no-error-logs-test
Oct 30, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
// Copyright 2024 The etcd Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package e2e | ||
|
||
import ( | ||
"encoding/json" | ||
"testing" | ||
"time" | ||
|
||
"github.com/stretchr/testify/require" | ||
|
||
"go.etcd.io/etcd/tests/v3/framework/e2e" | ||
) | ||
|
||
func TestNoErrorLogsDuringNormalOperations(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
clusterSize int | ||
allowedErrors map[string]bool | ||
}{ | ||
{ | ||
name: "single node cluster", | ||
clusterSize: 1, | ||
allowedErrors: map[string]bool{}, | ||
}, | ||
{ | ||
name: "three node cluster", | ||
clusterSize: 3, | ||
allowedErrors: map[string]bool{}, | ||
}, | ||
} | ||
|
||
for _, tc := range tests { | ||
t.Run(tc.name, func(t *testing.T) { | ||
e2e.BeforeTest(t) | ||
|
||
epc, err := e2e.NewEtcdProcessCluster(t, | ||
&e2e.EtcdProcessClusterConfig{ | ||
LogLevel: "debug", | ||
ClusterSize: tc.clusterSize, | ||
}, | ||
) | ||
require.NoError(t, err) | ||
defer epc.Close() | ||
|
||
require.Lenf(t, epc.Procs, tc.clusterSize, "embedded etcd cluster process count is not as expected") | ||
|
||
// Collect the handle of logs before closing the processes. | ||
var logHandles []e2e.LogsExpect | ||
for i := range tc.clusterSize { | ||
logHandles = append(logHandles, epc.Procs[i].Logs()) | ||
} | ||
|
||
time.Sleep(time.Second) | ||
err = epc.Close() | ||
require.NoErrorf(t, err, "closing etcd processes") | ||
|
||
// Now that the processes are closed we can collect all log lines. This must happen after closing, else we | ||
// might not get all log lines. | ||
var lines []string | ||
for _, h := range logHandles { | ||
lines = append(lines, h.Lines()...) | ||
} | ||
require.NotEmptyf(t, lines, "expected at least one log line") | ||
|
||
var entry logEntry | ||
for _, line := range lines { | ||
err := json.Unmarshal([]byte(line), &entry) | ||
require.NoErrorf(t, err, "parse log line as json, line: %s", line) | ||
|
||
if tc.allowedErrors[entry.Message] { | ||
continue | ||
} | ||
|
||
require.NotEqualf(t, "error", entry.Level, "error level log message found: %s", line) | ||
} | ||
}) | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not get time to dig out why 3.5 doesn't see the error message as 3.6. Did you ever dig into it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3.5: https://github.com/ghouscht/etcd/blob/release-3.5/server/embed/etcd.go#L882-L892
main: https://github.com/ghouscht/etcd/blob/main/server/embed/etcd.go#L872-L885
Added with #14116
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks.