Fix: Neo4j permissions + stop-on-failure (scripts/ingest_epoch.py)

scripts/ingest_epoch.py

@@ -411,11 +411,15 @@ def run_etl(
                 print(f"  [WARN] Could not check target DB node count: {e}. Proceeding with merge flag as-is.")
 
         if merge_neo4j:
-            merge_neo4j_epoch_dump(epoch, neo4j_path, dry_run=dry_run)
+            ok = merge_neo4j_epoch_dump(epoch, neo4j_path, dry_run=dry_run)
+            if not ok:
+                print("  ❌ Neo4j merge failed. Aborting.")
+                sys.exit(1)
         else:
             ok = ingest_neo4j_dump(neo4j_path, database=NEO4J_TARGET_DB, dry_run=dry_run)
             if not ok:
-                print("  ❌ Neo4j dump load failed.")
+                print("  ❌ Neo4j dump load failed. Aborting.")
+                sys.exit(1)
     elif neo4j_path.exists() and skip_neo4j:
         print(f"\nℹ️  Neo4j dump found but skipped: {neo4j_path}")
 
@@ -495,6 +499,9 @@ def ingest_neo4j_dump(dump_path: Path, database: str = "neo4j", dry_run: bool =
                     print(f"  ❌ Failed to stop Neo4j: {stop_result.stderr.strip()}")
                     return False
             _ensure_neo4j_data_writable()
+            # Explicit chown to fix permission mismatch when Neo4j was started as root
+            if os.geteuid() == 0:
+                subprocess.run(["chown", "-R", "neo4j:neo4j", "/var/lib/neo4j/data"], check=False)
 
         if dry_run:
             print(f"  [DRY-RUN] {' '.join(cmd)}")
@@ -700,7 +707,7 @@ def _stream_merge(
     _bulk_merge_apoc(temp_session, target_session, match_query, merge_query, label, total)
 
 
-def merge_neo4j_epoch_dump(epoch: int, dump_path: Path, dry_run: bool = False) -> None:
+def merge_neo4j_epoch_dump(epoch: int, dump_path: Path, dry_run: bool = False) -> bool:
     """
     Merge relationships from an epoch dump into the target DB by keeping the oldest timestamp.
     Relationship uniqueness is enforced by (start, end, type) only.
@@ -792,6 +799,8 @@ def merge_neo4j_epoch_dump(epoch: int, dump_path: Path, dry_run: bool = False) -
             import subprocess
             try:
                 subprocess.run(["chown", "-R", "neo4j:adm", str(temp_root)], check=True)
+                # Also fix main Neo4j data dir permissions (lock file may be owned by root)
+                subprocess.run(["chown", "-R", "neo4j:neo4j", "/var/lib/neo4j/data"], check=False)
             except Exception:
                 pass
 
@@ -950,8 +959,13 @@ def merge_neo4j_epoch_dump(epoch: int, dump_path: Path, dry_run: bool = False) -
                 process_wallet_token_rel(rel_type)
 
         print("  ✅ Merge complete.")
+        return True
     except subprocess.CalledProcessError as e:
         print(f"  ❌ Failed to merge Neo4j dump: {e.stderr}")
+        return False
+    except Exception as e:
+        print(f"  ❌ Failed to merge Neo4j dump: {e}")
+        return False
     finally:
         if temp_driver:
             temp_driver.close()