Skip to content
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.

Sign up for GitHub

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

PBM tests. Set proper user on container re-creation, include pbmLockOp for lock check #908

Merged
merged 1 commit into from
Feb 21, 2024
+3 −1
Merged

PBM tests. Set proper user on container re-creation, include pbmLockOp for lock check #908

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion e2e-tests/functions
View file
Original file line number Diff line number Diff line change
@@ -112,12 +112,13 @@ wait_noop() {
set +o xtrace

retry=0
until [ "$(mongo_run 'db.getSiblingDB("admin").pbmLock.find().count()' cfg | tail -n 1 | tr -d '\r')" == 0 ]; do
until [ "$(mongo_run 'db.getSiblingDB("admin").pbmLock.find().count()' cfg | tail -n 1 | tr -d '\r')" == 0 ] && [ "$(mongo_run 'db.getSiblingDB("admin").pbmLockOp.find().count()' cfg | tail -n 1 | tr -d '\r')" == 0 ]; do
sleep 1
echo -n .
let retry+=1
if [ $retry -ge 120 ]; then
mongo_run 'db.getSiblingDB("admin").pbmLock.find()' "cfg"
mongo_run 'db.getSiblingDB("admin").pbmLockOp.find()' "cfg"
exit 1
fi
done
1 change: 1 addition & 0 deletions e2e-tests/pkg/pbm/clock_skew.go
View file
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@ func ClockSkew(rsName, ts, dockerHost string) error {
Env: envs,
Cmd: []string{"pbm-agent"},
Labels: containerOld.Config.Labels,
User: "1001",
},
containerOld.HostConfig,
&network.NetworkingConfig{

Unchanged files with check annotations Beta

View file
pbm/version/version.go
i.GoVersion,
)
case "json":
v, _ := json.MarshalIndent(i, "", " ") //nolint:errchkjson

Check failure on line 86 in pbm/version/version.go

GitHub Actions / runner / golangci-lint 

the given struct should be annotated with the `json` tag (musttag)
return string(v)
default:
return fmt.Sprintf("%#v", i)