Skip to content

Commit

Permalink
Merge tag '2025-01-27_snapshot_prune_timeout' into develop
Browse files Browse the repository at this point in the history
Increase timeout for ES snapshot prune
  • Loading branch information
Steven-Eardley committed Jan 27, 2025
2 parents 88883be + 34ef730 commit 156cee4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion portality/lib/es_snapshot.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def delete_snapshot(self, snapshot: ESSnapshot):
:return: Tuple of the result as text & True / False for success / fail
"""
try:
resp = self.conn.snapshot.delete(self.repo, snapshot.name, master_timeout='600s')
resp = self.conn.snapshot.delete(self.repo, snapshot.name, master_timeout='600s', request_timeout=90)
except ElasticsearchException as e:
return str(e), False
return resp, resp['acknowledged']
Expand Down
2 changes: 1 addition & 1 deletion portality/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Application Version information
# ~~->API:Feature~~

DOAJ_VERSION = "8.0.5"
DOAJ_VERSION = "8.0.6"
API_VERSION = "4.0.0"

######################################
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name='doaj',
version='8.0.5',
version='8.0.6',
packages=find_packages(),
install_requires=[
"awscli==1.34.25",
Expand Down

0 comments on commit 156cee4

Please sign in to comment.