Skip to content

Revert "Add failing tests for #403: File Handle Resource Leak in SyncLock.acquire()" #410

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

Draft
gltanaka wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Revert "Add failing tests for #403: File Handle Resource Leak in SyncLock.acquire()" #410

Show file tree
Hide file tree
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
32 changes: 12 additions & 20 deletions pdd/sync_determine_operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,26 +181,18 @@ def acquire(self):
# Create lock file and acquire file descriptor lock
self.lock_file.touch()
self.fd = open(self.lock_file, 'w')

try:
# Critical section - must close file if anything fails
if HAS_FCNTL:
# POSIX systems
fcntl.flock(self.fd.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
elif HAS_MSVCRT:
# Windows systems
msvcrt.locking(self.fd.fileno(), msvcrt.LK_NBLCK, 1)

# Write current PID to lock file
self.fd.write(str(self.current_pid))
self.fd.flush()
except:
# Close file on ANY exception (not just IOError/OSError)
if self.fd:
self.fd.close()
self.fd = None
raise


if HAS_FCNTL:
# POSIX systems
fcntl.flock(self.fd.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
elif HAS_MSVCRT:
# Windows systems
msvcrt.locking(self.fd.fileno(), msvcrt.LK_NBLCK, 1)

# Write current PID to lock file
self.fd.write(str(self.current_pid))
self.fd.flush()

except (IOError, OSError) as e:
if self.fd:
self.fd.close()
Expand Down
Loading
Loading