Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion leapp_functions/app/history.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@ def _atomic_write_json(path, data):
"""
path = Path(path)
path.parent.mkdir(parents=True, exist_ok=True)
temp_path = path.with_suffix(".tmp")
# Unique per process: concurrent runs sharing one temp path interleave their
# writes into it, which lands a concatenated document in the real file and
# makes the second os.replace fail because the first already moved it.
temp_path = path.with_suffix(f".tmp.{os.getpid()}")

try:
with open(temp_path, "w", encoding="utf-8") as f:
Expand Down Expand Up @@ -163,6 +166,15 @@ def _read_json(path, default=None):
except OSError as e:
logger.error("Failed to read history/settings file at %s: %s", path, e)
return default
except ValueError as e:
# Unreadable JSON here is a damaged convenience file, not a reason to stop
# parsing evidence. Keep a copy so the damage can be looked at later.
logger.error("History/settings file at %s is not valid JSON (%s); ignoring it", path, e)
try:
os.replace(path, f"{path}.corrupt.bak")
except OSError:
pass
return default


def _has_history_entries(history_data):
Expand Down
14 changes: 14 additions & 0 deletions scripts/lavafuncs.py
Original file line number Diff line number Diff line change
Expand Up @@ -698,5 +698,19 @@ def lava_finalize_output(output_path):
with open(os.path.join(output_path, lava_json_name), 'w', encoding='utf-8') as f:
json.dump(lava_data, f, indent=4)

# A database left in WAL mode cannot be opened from read-only media: SQLite
# must create a -shm file to read one, and the LAVA viewer opens the report
# database with OPEN_READONLY. Checkpointing and returning to the delete
# journal guarantees the delivered .db is complete and standalone, with no
# -wal/-shm sidecars to lose when the report folder is copied or zipped.
# This normalises whatever mode the connection ended up in; nothing here
# enables WAL.
try:
if lava_db.execute('PRAGMA journal_mode').fetchone()[0].lower() == 'wal':
lava_db.execute('PRAGMA wal_checkpoint(TRUNCATE)')
lava_db.execute('PRAGMA journal_mode=DELETE')
except sqlite3.Error:
pass

# Close the SQLite database
lava_db.close()
Loading