diff --git a/server/mergin/sync/storages/disk.py b/server/mergin/sync/storages/disk.py index 80715ed6..223b501c 100644 --- a/server/mergin/sync/storages/disk.py +++ b/server/mergin/sync/storages/disk.py @@ -407,13 +407,19 @@ def restore_versioned_file(self, file: str, version: int): if not (base_meta and diffs): return + diffs_size = sum(os.path.getsize(d.abs_path) for d in diffs) + logging.info( + f"restore_versioned_file: file={file} target_version={version} " + f"basefile={base_meta.abs_path} basefile_size={base_meta.size} " + f"diffs={len(diffs)} diffs_total_size={diffs_size}" + ) + start = time.time() with self.geodiff_copy(base_meta.abs_path) as restored_file: copy_time = time.time() - start logging.info( f"Restore file: {base_meta.abs_path} copied to {restored_file} in {copy_time} s" ) - logging.info(f"Restoring gpkg file with {len(diffs)} diffs") try: self.flush_geodiff_logger() # clean geodiff logger changeset = os.path.join( diff --git a/server/mergin/sync/tasks.py b/server/mergin/sync/tasks.py index 480222e6..1bbf708b 100644 --- a/server/mergin/sync/tasks.py +++ b/server/mergin/sync/tasks.py @@ -121,6 +121,12 @@ def create_project_version_zip(version_id: int): if not project_version: return + total_files = len(project_version.files) + logging.info( + f"create_project_version_zip: project_id={project_version.project_id} version={project_version.name} " + f"files={total_files} project_size={project_version.project_size}" + ) + zip_path = project_version.zip_path + ".partial" if os.path.exists(zip_path): mtime = datetime.fromtimestamp(os.path.getmtime(zip_path), tz=timezone.utc) @@ -151,6 +157,9 @@ def create_project_version_zip(version_id: int): ) # move zip file to final location os.rename(zip_path, project_version.zip_path) + logging.info( + f"create_project_version_zip: finished project_id={project_version.project_id} version={project_version.name}" + ) finally: # remove partial zip file if exists if os.path.exists(zip_path):