Skip to content

Handle Database Cancelled Queries (a.k.a. DB Timeouts) #31

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
JVickery-TBS merged 3 commits into from
Jan 20, 2025
Merged

Handle Database Cancelled Queries (a.k.a. DB Timeouts) #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db49be6
fix(logic): catch db timeouts;
JVickery-TBS Jan 8, 2025
0630642
feat(misc): changelog;
JVickery-TBS Jan 8, 2025
730dfa4
fix(dev): misc;
JVickery-TBS Jan 17, 2025
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
1 change: 1 addition & 0 deletions changes/31.canada.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Handled database timeout exceptions to close temporary files.
18 changes: 16 additions & 2 deletions ckanext/xloader/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,12 @@ def tabulator_load():
# (canada fork only): adds in encoding argument to pass static/resource encoding
encoding=validation_options.get('encoding', None),
logger=logger)
except errors.QueryCanceled as e: # (canada fork only): handle db timeouts
# (canada fork only): always close tmp file on exceptions
#TODO: upstream contrib??
tmp_file.close()
logger.warning('XLoader job ran into a database query timeout')
raise JobError('XLoader job ran into a database query timeout')
except rq_timeouts.JobTimeoutException as e: # (canada fork only): handle rq timeouts
# (canada fork only): always close tmp file on exceptions
#TODO: upstream contrib??
Expand Down Expand Up @@ -286,6 +292,12 @@ def tabulator_load():
else:
try:
direct_load()
except errors.QueryCanceled as e: # (canada fork only): handle db timeouts
# (canada fork only): always close tmp file on exceptions
#TODO: upstream contrib??
tmp_file.close()
logger.warning('XLoader job ran into a database query timeout')
raise JobError('XLoader job ran into a database query timeout')
except rq_timeouts.JobTimeoutException as e: # (canada fork only): handle rq timeouts
# (canada fork only): always close tmp file on exceptions
#TODO: upstream contrib??
Expand Down Expand Up @@ -314,8 +326,10 @@ def tabulator_load():
logger.warning('Loading excerpt for this format not supported.')
logger.error('Loading file raised an error: %s', e)
raise JobError('Loading file raised an error: {}'.format(e))

tmp_file.close()
finally:
# (canada fork only): put close into finally
# TODO: upstream contribution??
tmp_file.close()

logger.info('Express Load completed')

Expand Down
Loading