Add x86_64 dev binaries and make Postgres setup idempotent#149
Add x86_64 dev binaries and make Postgres setup idempotent#149AnthonyRonning merged 1 commit intomasterfrom
Conversation
- flake.nix: Replace ephemeral mktemp Postgres with stable .pgdata/ directory, make setup idempotent (skip if already running, skip user/db creation if exists) - Add continuum-proxy-x86_64 binary (built via nix build, same as ARM version) - Add tinfoil-proxy/dist/tinfoil-proxy-x86_64 (built with same flags as ARM) - .gitignore: Add .pgdata/, .envrc, .direnv/, keep x86_64 binaries
✅ Actions performedReview triggered.
|
|
@coderabbitai review |
WalkthroughThis pull request modifies Git ignore patterns to exclude the local PostgreSQL data directory, updates the Nix build configuration to implement persistent PostgreSQL data storage with on-demand initialization and readiness checks, and enriches the runtime environment with additional binaries and shared libraries. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
✅ Actions performedReview triggered.
|
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
🧹 Nitpick comments (1)
flake.nix (1)
64-93: Well-structured idempotent Postgres setup.The rework correctly addresses the PR objectives: persistent
.pgdata/directory, skip-if-running logic, and conditional user/database creation. A few observations:
Redundant wait: Line 83's
-wflag already waits for startup completion, making theuntilloop on line 86 redundant (though harmless).Potential infinite loop: If
pg_ctl startfails (e.g., port conflict, disk full), line 86 will loop indefinitely. Consider adding a timeout or checkingpg_ctlexit status.💡 Optional: Add timeout and error handling
# Start Postgres - ${pkgs.postgresql}/bin/pg_ctl start -D "$PGDATA" -o "-h localhost -p $PGPORT -k $PGSOCKETS" -l "$PGDATA/logfile" -w + if ! ${pkgs.postgresql}/bin/pg_ctl start -D "$PGDATA" -o "-h localhost -p $PGPORT -k $PGSOCKETS" -l "$PGDATA/logfile" -w; then + echo "Failed to start Postgres. Check $PGDATA/logfile for details." + exit 1 + fi - # Wait for it to be ready - until ${pkgs.postgresql}/bin/pg_isready -h localhost -p $PGPORT >/dev/null 2>&1; do sleep 0.5; done + # The -w flag above already waits, but verify readiness with timeout + timeout=30 + while ! ${pkgs.postgresql}/bin/pg_isready -h localhost -p $PGPORT >/dev/null 2>&1; do + timeout=$((timeout - 1)) + if [ $timeout -le 0 ]; then + echo "Postgres failed to become ready. Check $PGDATA/logfile" + exit 1 + fi + sleep 1 + done🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@flake.nix` around lines 64 - 93, The setupPostgresScript currently starts Postgres with ${pkgs.postgresql}/bin/pg_ctl start -w but then unconditionally runs an until loop using ${pkgs.postgresql}/bin/pg_isready which can spin forever if pg_ctl failed; modify setupPostgresScript to detect pg_ctl's exit status and avoid an infinite loop by either (A) removing the redundant until when pg_ctl -w succeeds, or (B) keeping the until but add a max retry / timeout counter and exit non‑zero with an error message if ${pkgs.postgresql}/bin/pg_isready does not become ready within the timeout; reference the pg_ctl start invocation, the ${pkgs.postgresql}/bin/pg_isready check, and the PGDATA/PGPORT variables so the script logs failures and returns failure instead of looping forever.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@flake.nix`:
- Around line 64-93: The setupPostgresScript currently starts Postgres with
${pkgs.postgresql}/bin/pg_ctl start -w but then unconditionally runs an until
loop using ${pkgs.postgresql}/bin/pg_isready which can spin forever if pg_ctl
failed; modify setupPostgresScript to detect pg_ctl's exit status and avoid an
infinite loop by either (A) removing the redundant until when pg_ctl -w
succeeds, or (B) keeping the until but add a max retry / timeout counter and
exit non‑zero with an error message if ${pkgs.postgresql}/bin/pg_isready does
not become ready within the timeout; reference the pg_ctl start invocation, the
${pkgs.postgresql}/bin/pg_isready check, and the PGDATA/PGPORT variables so the
script logs failures and returns failure instead of looping forever.
ℹ️ Review info
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (1)
tinfoil-proxy/dist/tinfoil-proxy-x86_64is excluded by!**/dist/**
📒 Files selected for processing (3)
.gitignorecontinuum-proxy-x86_64flake.nix
There was a problem hiding this comment.
🧹 Nitpick comments (1)
flake.nix (1)
83-86: Consider adding a timeout to the readiness loop.If
pg_ctl startsucceeds but PostgreSQL crashes immediately after, theuntilloop on line 86 will spin indefinitely. Adding a timeout or iteration limit would prevent the shell from hanging.♻️ Suggested improvement with timeout
# Start Postgres - ${pkgs.postgresql}/bin/pg_ctl start -D "$PGDATA" -o "-h localhost -p $PGPORT -k $PGSOCKETS" -l "$PGDATA/logfile" -w + if ! ${pkgs.postgresql}/bin/pg_ctl start -D "$PGDATA" -o "-h localhost -p $PGPORT -k $PGSOCKETS" -l "$PGDATA/logfile" -w; then + echo "Failed to start PostgreSQL. Check $PGDATA/logfile for details." >&2 + exit 1 + fi # Wait for it to be ready - until ${pkgs.postgresql}/bin/pg_isready -h localhost -p $PGPORT >/dev/null 2>&1; do sleep 0.5; done + retries=10 + until ${pkgs.postgresql}/bin/pg_isready -h localhost -p $PGPORT >/dev/null 2>&1; do + retries=$((retries - 1)) + if [ $retries -le 0 ]; then + echo "PostgreSQL failed to become ready. Check $PGDATA/logfile for details." >&2 + exit 1 + fi + sleep 0.5 + done🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@flake.nix` around lines 83 - 86, The readiness loop using ${pkgs.postgresql}/bin/pg_isready (after ${pkgs.postgresql}/bin/pg_ctl start) may spin forever if Postgres crashes; modify the until loop to enforce a timeout by tracking elapsed time or a maximum number of attempts (e.g., MAX_WAIT_SECONDS or MAX_ATTEMPTS), break and exit non‑zero with a descriptive error if the timeout is reached, and keep referencing PGDATA and PGPORT variables and the pg_isready command so the new logic aborts cleanly when Postgres never becomes ready.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@flake.nix`:
- Around line 83-86: The readiness loop using ${pkgs.postgresql}/bin/pg_isready
(after ${pkgs.postgresql}/bin/pg_ctl start) may spin forever if Postgres
crashes; modify the until loop to enforce a timeout by tracking elapsed time or
a maximum number of attempts (e.g., MAX_WAIT_SECONDS or MAX_ATTEMPTS), break and
exit non‑zero with a descriptive error if the timeout is reached, and keep
referencing PGDATA and PGPORT variables and the pg_isready command so the new
logic aborts cleanly when Postgres never becomes ready.
ℹ️ Review info
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (1)
tinfoil-proxy/dist/tinfoil-proxy-x86_64is excluded by!**/dist/**
📒 Files selected for processing (3)
.gitignorecontinuum-proxy-x86_64flake.nix
1 participant
Changes
flake.nix - Idempotent Postgres setup
mktempPostgres data directory with stable.pgdata/in the repo rootsockets/subdirectory inside.pgdata/for Unix sockets (fixes/run/postgresqlnot found error)x86_64 dev binaries
continuum-proxy-x86_64: Built vianix build ./privatemode-public#privatemode-proxy.bin(same method as ARM version)tinfoil-proxy/dist/tinfoil-proxy-x86_64: Built withCGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -ldflags="-s -w" -trimpath(same flags as ARM Dockerfile).gitignore
.pgdata/,.envrc,.direnv/Testing
Please test locally on your ARM machine to verify the flake.nix Postgres changes work correctly with
nix develop/direnv.Summary by CodeRabbit