Skip to content

Commit 7e460e7

Browse files
PBM tests. Set proper user on container re-creation, include pbmLockOp for lock check (#908)
1 parent 0190573 commit 7e460e7

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

e2e-tests/functions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,13 @@ wait_noop() {
112112
set +o xtrace
113113

114114
retry=0
115-
until [ "$(mongo_run 'db.getSiblingDB("admin").pbmLock.find().count()' cfg | tail -n 1 | tr -d '\r')" == 0 ]; do
115+
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
116116
sleep 1
117117
echo -n .
118118
let retry+=1
119119
if [ $retry -ge 120 ]; then
120120
mongo_run 'db.getSiblingDB("admin").pbmLock.find()' "cfg"
121+
mongo_run 'db.getSiblingDB("admin").pbmLockOp.find()' "cfg"
121122
exit 1
122123
fi
123124
done

e2e-tests/pkg/pbm/clock_skew.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func ClockSkew(rsName, ts, dockerHost string) error {
5555
Env: envs,
5656
Cmd: []string{"pbm-agent"},
5757
Labels: containerOld.Config.Labels,
58+
User: "1001",
5859
},
5960
containerOld.HostConfig,
6061
&network.NetworkingConfig{

0 commit comments

Comments
 (0)