PBM tests. Set proper user on container re-creation, include pbmLockO…

…p for lock check (#908)
percona · Feb 21, 2024 · 7e460e7 · 7e460e7
1 parent 0190573
commit 7e460e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -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

diff --git a/e2e-tests/pkg/pbm/clock_skew.go b/e2e-tests/pkg/pbm/clock_skew.go
@@ -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{