Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FIX (agent): Make E2E test for locking check more stable

Rostislav Duginf60f677351cf
diff --git a/agent/e2e/scripts/run-all.sh b/agent/e2e/scripts/run-all.sh
index 05894d7c..33cc86b6 100644
--- a/agent/e2e/scripts/run-all.sh
+++ b/agent/e2e/scripts/run-all.sh
@@ -5,6 +5,7 @@ MODE="${1:-host}"
SCRIPT_DIR="$(dirname "$0")"
PASSED=0
FAILED=0
+FAILED_NAMES=""
run_test() {
local name="$1"
@@ -21,6 +22,7 @@ run_test() {
else
echo " FAILED: $name"
FAILED=$((FAILED + 1))
+ FAILED_NAMES="${FAILED_NAMES}\n - ${name}"
fi
}
@@ -42,6 +44,11 @@ fi
echo ""
echo "========================================"
echo " Results: $PASSED passed, $FAILED failed"
+if [ "$FAILED" -gt 0 ]; then
+ echo ""
+ echo " Failed:"
+ echo -e "$FAILED_NAMES"
+fi
echo "========================================"
if [ "$FAILED" -gt 0 ]; then
diff --git a/agent/e2e/scripts/test-upgrade-skip.sh b/agent/e2e/scripts/test-upgrade-skip.sh
index 06feab24..6e368f06 100644
--- a/agent/e2e/scripts/test-upgrade-skip.sh
+++ b/agent/e2e/scripts/test-upgrade-skip.sh
@@ -59,3 +59,6 @@ if [ "$VERSION" != "v1.0.0" ]; then
fi
echo "Upgrade correctly skipped, version still $VERSION"
+
+# Cleanup daemon
+"$AGENT" stop || true
diff --git a/agent/e2e/scripts/test-upgrade-success.sh b/agent/e2e/scripts/test-upgrade-success.sh
index 722a4e1a..ea034b60 100644
--- a/agent/e2e/scripts/test-upgrade-success.sh
+++ b/agent/e2e/scripts/test-upgrade-success.sh
@@ -64,3 +64,6 @@ if [ "$VERSION" != "v2.0.0" ]; then
fi
echo "Binary upgraded successfully to $VERSION"
+
+# Cleanup daemon
+"$AGENT" stop || true
diff --git a/agent/internal/features/start/lock.go b/agent/internal/features/start/lock.go
index 02036dd6..f2753cf0 100644
--- a/agent/internal/features/start/lock.go
+++ b/agent/internal/features/start/lock.go
@@ -50,8 +50,23 @@ func AcquireLock(log *slog.Logger) (*os.File, error) {
func ReleaseLock(f *os.File) {
_ = syscall.Flock(int(f.Fd()), syscall.LOCK_UN)
+
+ lockedStat, lockedErr := f.Stat()
_ = f.Close()
- _ = os.Remove(lockFileName)
+
+ if lockedErr != nil {
+ _ = os.Remove(lockFileName)
+ return
+ }
+
+ diskStat, diskErr := os.Stat(lockFileName)
+ if diskErr != nil {
+ return
+ }
+
+ if os.SameFile(lockedStat, diskStat) {
+ _ = os.Remove(lockFileName)
+ }
}
func ReadLockFilePID() (int, error) {