Commit e4f63d1
authored
fix: Memory-efficient sync and reconciliation for large tables (#76)
* fix: Use batched processing in sync daemon to prevent OOM and timeouts
The sync_table method was loading entire tables into memory before
processing, causing:
- 10GB+ memory usage for tables with millions of rows
- Connection timeouts when queries exceeded ELB idle timeouts
- Failed syncs with "connection closed" errors
Changes:
- Use existing batched reader (read_changes_batched + fetch_batch)
instead of loading all rows at once
- Process and write each batch immediately (memory = O(batch_size))
- Update sync state after each batch for resume capability
- Add progress logging every 10 batches
- Increase default batch_size from 1000 to 10000 for better throughput
- Check for xmin wraparound at start rather than during read
This reduces memory from O(total_rows) to O(batch_size), enabling
sync of tables with millions of rows without OOM or timeouts.
Closes #74
* feat: Auto-detect optimal batch size based on available memory
Add cross-platform memory detection and automatic batch size calculation
to prevent OOM on small instances while maximizing throughput on larger ones.
New functions in utils.rs:
- get_available_memory(): Cross-platform (Linux, macOS, Windows)
- Linux: Reads MemAvailable from /proc/meminfo
- macOS: Uses sysctl + vm_stat for free/inactive pages
- Windows: Uses GlobalMemoryStatusEx Win32 API
- calculate_optimal_batch_size(): Auto-calculates based on memory
- Uses 25% of available memory as working budget
- Assumes 2KB per row (conservative estimate)
- Clamps between 1,000 and 50,000 rows
Expected batch sizes by instance type:
- t3.nano (512MB): ~1,000 rows
- t3.small (2GB): ~10,000 rows
- t3.large (8GB+): 50,000 rows (capped)
Refs #74
* fix: Use batched reconciliation to prevent OOM on large tables
The reconciler was loading ALL primary keys from both source and target
tables into memory before comparing them. For tables with millions of
rows (e.g., 14M rows), this caused:
- 2-3 GB memory usage just for PKs
- Potential OOM on memory-constrained instances
- Connection timeouts during long-running PK fetch queries
Changes:
- Add reconcile_table_batched() using merge-join comparison
- Implement PkBatchReader with keyset pagination (WHERE pk > last_pk)
- Fetch PKs in sorted batches from both databases
- Compare using single-pass merge-join (both streams sorted)
- Delete orphans in batches as they're discovered
- Add progress logging every 100K comparisons
This reduces memory from O(total_rows) to O(batch_size), enabling
reconciliation of tables with millions of rows without OOM.
Closes #75
* style: Format code with cargo fmt
* fix: Address critical review findings for batched sync/reconciliation
This commit fixes critical correctness issues identified in PR #76 review:
## Critical Fix 1: xmin batching skipping rows with same xmin
The batched xmin reader was using `WHERE xmin > $1` which skips rows
when multiple rows share the same xmin (bulk inserts in single transaction).
Fix: Use (xmin, ctid) as compound pagination key. ctid provides a stable
tie-breaker for rows with identical xmin values.
- Add `last_ctid` field to BatchReader
- Use `WHERE (xmin, ctid) > ($1, $2::tid)` for subsequent batches
- Include `ctid::text` in SELECT and ORDER BY
## Critical Fix 2: Reconciler PK ordering mismatch
PKs were cast to ::text in SELECT but ORDER BY used native column types.
For numeric PKs: "10" < "2" lexicographically but 10 > 2 numerically.
This caused false orphan detection and data loss.
Fix: Use ::text cast in both SELECT and ORDER BY to ensure SQL stream
order matches Rust's lexicographic string comparison.
- Change ORDER BY from `"col"` to `"col"::text`
- Change WHERE from `"col" > $1` to `"col"::text > $1`
## Moderate Fix: macOS page size detection
Apple Silicon uses 16KB pages, not 4KB. Hardcoded 4KB underestimated
available memory by 4x, leading to unnecessarily small batch sizes.
Fix: Use `sysctl hw.pagesize` to get actual page size.1 parent 7676a7a commit e4f63d1
5 files changed
Lines changed: 829 additions & 80 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
700 | 700 | | |
701 | 701 | | |
702 | 702 | | |
703 | | - | |
704 | | - | |
705 | | - | |
706 | | - | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
707 | 707 | | |
708 | 708 | | |
709 | 709 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1318 | 1318 | | |
1319 | 1319 | | |
1320 | 1320 | | |
| 1321 | + | |
| 1322 | + | |
| 1323 | + | |
| 1324 | + | |
| 1325 | + | |
| 1326 | + | |
| 1327 | + | |
| 1328 | + | |
| 1329 | + | |
| 1330 | + | |
| 1331 | + | |
| 1332 | + | |
| 1333 | + | |
| 1334 | + | |
| 1335 | + | |
| 1336 | + | |
| 1337 | + | |
| 1338 | + | |
| 1339 | + | |
| 1340 | + | |
| 1341 | + | |
| 1342 | + | |
| 1343 | + | |
| 1344 | + | |
| 1345 | + | |
| 1346 | + | |
| 1347 | + | |
| 1348 | + | |
| 1349 | + | |
| 1350 | + | |
| 1351 | + | |
| 1352 | + | |
| 1353 | + | |
| 1354 | + | |
| 1355 | + | |
| 1356 | + | |
| 1357 | + | |
| 1358 | + | |
| 1359 | + | |
| 1360 | + | |
| 1361 | + | |
| 1362 | + | |
| 1363 | + | |
| 1364 | + | |
| 1365 | + | |
| 1366 | + | |
| 1367 | + | |
| 1368 | + | |
| 1369 | + | |
| 1370 | + | |
| 1371 | + | |
| 1372 | + | |
| 1373 | + | |
| 1374 | + | |
| 1375 | + | |
| 1376 | + | |
| 1377 | + | |
| 1378 | + | |
| 1379 | + | |
| 1380 | + | |
| 1381 | + | |
| 1382 | + | |
| 1383 | + | |
| 1384 | + | |
| 1385 | + | |
| 1386 | + | |
| 1387 | + | |
| 1388 | + | |
| 1389 | + | |
| 1390 | + | |
| 1391 | + | |
| 1392 | + | |
| 1393 | + | |
| 1394 | + | |
| 1395 | + | |
| 1396 | + | |
| 1397 | + | |
| 1398 | + | |
| 1399 | + | |
| 1400 | + | |
| 1401 | + | |
| 1402 | + | |
| 1403 | + | |
| 1404 | + | |
| 1405 | + | |
| 1406 | + | |
| 1407 | + | |
| 1408 | + | |
| 1409 | + | |
| 1410 | + | |
| 1411 | + | |
| 1412 | + | |
| 1413 | + | |
| 1414 | + | |
| 1415 | + | |
| 1416 | + | |
| 1417 | + | |
| 1418 | + | |
| 1419 | + | |
| 1420 | + | |
| 1421 | + | |
| 1422 | + | |
| 1423 | + | |
| 1424 | + | |
| 1425 | + | |
| 1426 | + | |
| 1427 | + | |
| 1428 | + | |
| 1429 | + | |
| 1430 | + | |
| 1431 | + | |
| 1432 | + | |
| 1433 | + | |
| 1434 | + | |
| 1435 | + | |
| 1436 | + | |
| 1437 | + | |
| 1438 | + | |
| 1439 | + | |
| 1440 | + | |
| 1441 | + | |
| 1442 | + | |
| 1443 | + | |
| 1444 | + | |
| 1445 | + | |
| 1446 | + | |
| 1447 | + | |
| 1448 | + | |
| 1449 | + | |
| 1450 | + | |
| 1451 | + | |
| 1452 | + | |
| 1453 | + | |
| 1454 | + | |
| 1455 | + | |
| 1456 | + | |
| 1457 | + | |
| 1458 | + | |
| 1459 | + | |
| 1460 | + | |
| 1461 | + | |
| 1462 | + | |
| 1463 | + | |
| 1464 | + | |
| 1465 | + | |
| 1466 | + | |
| 1467 | + | |
| 1468 | + | |
| 1469 | + | |
| 1470 | + | |
| 1471 | + | |
| 1472 | + | |
| 1473 | + | |
| 1474 | + | |
| 1475 | + | |
| 1476 | + | |
| 1477 | + | |
| 1478 | + | |
| 1479 | + | |
| 1480 | + | |
| 1481 | + | |
| 1482 | + | |
| 1483 | + | |
| 1484 | + | |
| 1485 | + | |
| 1486 | + | |
| 1487 | + | |
| 1488 | + | |
| 1489 | + | |
| 1490 | + | |
| 1491 | + | |
| 1492 | + | |
| 1493 | + | |
| 1494 | + | |
| 1495 | + | |
| 1496 | + | |
| 1497 | + | |
| 1498 | + | |
| 1499 | + | |
| 1500 | + | |
| 1501 | + | |
| 1502 | + | |
| 1503 | + | |
| 1504 | + | |
| 1505 | + | |
| 1506 | + | |
| 1507 | + | |
| 1508 | + | |
| 1509 | + | |
| 1510 | + | |
| 1511 | + | |
| 1512 | + | |
| 1513 | + | |
| 1514 | + | |
| 1515 | + | |
| 1516 | + | |
| 1517 | + | |
| 1518 | + | |
| 1519 | + | |
| 1520 | + | |
| 1521 | + | |
| 1522 | + | |
| 1523 | + | |
| 1524 | + | |
| 1525 | + | |
| 1526 | + | |
| 1527 | + | |
| 1528 | + | |
| 1529 | + | |
| 1530 | + | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
| 1535 | + | |
| 1536 | + | |
| 1537 | + | |
| 1538 | + | |
| 1539 | + | |
| 1540 | + | |
| 1541 | + | |
| 1542 | + | |
| 1543 | + | |
| 1544 | + | |
| 1545 | + | |
| 1546 | + | |
| 1547 | + | |
| 1548 | + | |
| 1549 | + | |
| 1550 | + | |
| 1551 | + | |
| 1552 | + | |
| 1553 | + | |
| 1554 | + | |
| 1555 | + | |
| 1556 | + | |
| 1557 | + | |
| 1558 | + | |
| 1559 | + | |
| 1560 | + | |
| 1561 | + | |
| 1562 | + | |
| 1563 | + | |
| 1564 | + | |
| 1565 | + | |
| 1566 | + | |
| 1567 | + | |
| 1568 | + | |
| 1569 | + | |
| 1570 | + | |
| 1571 | + | |
| 1572 | + | |
| 1573 | + | |
| 1574 | + | |
| 1575 | + | |
| 1576 | + | |
| 1577 | + | |
| 1578 | + | |
| 1579 | + | |
1321 | 1580 | | |
1322 | 1581 | | |
1323 | 1582 | | |
1324 | 1583 | | |
| 1584 | + | |
| 1585 | + | |
| 1586 | + | |
| 1587 | + | |
| 1588 | + | |
| 1589 | + | |
| 1590 | + | |
| 1591 | + | |
| 1592 | + | |
| 1593 | + | |
| 1594 | + | |
| 1595 | + | |
| 1596 | + | |
| 1597 | + | |
| 1598 | + | |
| 1599 | + | |
| 1600 | + | |
| 1601 | + | |
| 1602 | + | |
| 1603 | + | |
| 1604 | + | |
| 1605 | + | |
| 1606 | + | |
| 1607 | + | |
| 1608 | + | |
| 1609 | + | |
| 1610 | + | |
| 1611 | + | |
| 1612 | + | |
| 1613 | + | |
1325 | 1614 | | |
1326 | 1615 | | |
1327 | 1616 | | |
| |||
0 commit comments