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

Add handling for os.renames on different filesystems to avoid OSError #298

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Add handling for os.renames on different filesystems to avoid OSError #298

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743af34
Add handling for os.renames on different filesystems to avoid OSError
varmar05 Sep 26, 2024
c63cd62
Fix of the fix
varmar05 Sep 26, 2024
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
19 changes: 17 additions & 2 deletions server/mergin/sync/storages/disk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Copyright (C) Lutra Consulting Limited
#
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial

import os
import io
import tempfile
import time
import uuid
import logging
Expand Down Expand Up @@ -101,7 +101,22 @@ def move_to_tmp(src, dest=None):
temp_path = os.path.join(
current_app.config["TEMP_DIR"], dest, os.path.basename(src)
)
os.renames(src, temp_path)
try:
os.renames(src, temp_path)
except OSError as e:
# in the case of specific cross-device error [Errno 18] Invalid cross-device link
# just rename it within the same root with prefix 'delete-me' for easier custom cleanup
if e.errno == 18:
if src.startswith(current_app.config["LOCAL_PROJECTS"]):
root = current_app.config["LOCAL_PROJECTS"]
elif src.startswith(current_app.config["GEODIFF_WORKING_DIR"]):
root = current_app.config["GEODIFF_WORKING_DIR"]
else:
root = tempfile.gettempdir()
temp_path = os.path.join(root, "delete-me-" + dest, os.path.basename(src))
os.renames(src, temp_path)
else:
raise
return temp_path


Expand Down
Loading