Skip to content

[DEV-16003] Promote staging to master for Hotfix #4733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sethstoudenmier merged 2 commits into from
Aug 13, 2026
Merged

[DEV-16003] Promote staging to master for Hotfix #4733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
556291e
[DEV-16003] remove psql process timeout
sethstoudenmier Aug 13, 2026
f2df3de
Merge pull request #4732 from fedspendingtransparency/fix/dev-16003-u…
sethstoudenmier Aug 13, 2026
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
10 changes: 6 additions & 4 deletions usaspending_api/download/helpers/psql_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def run_psql_to_file(
["psql", "-c", "SELECT 1;"],
env=env,
capture_output=True,
timeout=5
timeout=30
)
if test_process.returncode != 0:
logger.error(f"Database connection test failed: {test_process.stderr.decode()}")
Expand Down Expand Up @@ -103,13 +103,15 @@ def run_psql_to_file(

# Wait for both processes to complete with timeout
try:
psql_output, psql_error = psql_process.communicate(timeout=30) # 30 second timeout
cat_process.wait(timeout=5)
psql_output, psql_error = psql_process.communicate()
cat_process.wait(timeout=30)
except subprocess.TimeoutExpired:
logger.error("Process timed out! Killing processes...")
psql_process.kill()
cat_process.kill()
raise Exception("psql process timed out after 30 seconds") from None
raise Exception(
"psql process timed out by the server's process OR cat process timed out after 30 seconds"
) from None

logger.info(f"psql return code: {psql_process.returncode}")
logger.info(f"psql stdout: {psql_output.decode() if psql_output else 'empty'}")
Expand Down
Loading