ORC-2108: Add connection timeout to JIRA client to prevent hanging and enable retries

dongjoon-hyun · dongjoon-hyun · commit 9b0ba691dbe9 · 2026-02-23T13:07:23.000-08:00
diff --git a/dev/create_orc_jira.py b/dev/create_orc_jira.py
@@ -53,7 +53,8 @@ def run_cmd(cmd):
 def create_jira_issue(title, parent_jira_id=None, issue_type=None):
     asf_jira = jira.client.JIRA(
         {"server": JIRA_API_BASE},
-        token_auth=JIRA_ACCESS_TOKEN
+        token_auth=JIRA_ACCESS_TOKEN,
+        timeout=(3.05, 30)
     )
 
     versions = asf_jira.project_versions("ORC")
diff --git a/dev/merge_orc_pr.py b/dev/merge_orc_pr.py
@@ -249,7 +249,8 @@ def fix_version_from_branch(branch, versions):
 def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
     asf_jira = jira.client.JIRA(
         {"server": JIRA_API_BASE},
-        token_auth=JIRA_ACCESS_TOKEN
+        token_auth=JIRA_ACCESS_TOKEN,
+        timeout=(3.05, 30)
     )
 
     jira_id = input("Enter a JIRA id [%s]: " % default_jira_id)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ def run_cmd(cmd):`
`53`	`53`	`def create_jira_issue(title, parent_jira_id=None, issue_type=None):`
`54`	`54`	`asf_jira = jira.client.JIRA(`
`55`	`55`	`{"server": JIRA_API_BASE},`
`56`		`- token_auth=JIRA_ACCESS_TOKEN`
	`56`	`+ token_auth=JIRA_ACCESS_TOKEN,`
	`57`	`+ timeout=(3.05, 30)`
`57`	`58`	`)`
`58`	`59`
`59`	`60`	`versions = asf_jira.project_versions("ORC")`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,8 @@ def fix_version_from_branch(branch, versions):`
`249`	`249`	`def resolve_jira_issue(merge_branches, comment, default_jira_id=""):`
`250`	`250`	`asf_jira = jira.client.JIRA(`
`251`	`251`	`{"server": JIRA_API_BASE},`
`252`		`- token_auth=JIRA_ACCESS_TOKEN`
	`252`	`+ token_auth=JIRA_ACCESS_TOKEN,`
	`253`	`+ timeout=(3.05, 30)`
`253`	`254`	`)`
`254`	`255`
`255`	`256`	`jira_id = input("Enter a JIRA id [%s]: " % default_jira_id)`