Zhuyifei1999 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401486 )
Change subject: worker.py: session close take a higher prio, ignore error 2013
in cur close
......................................................................
worker.py: session close take a higher prio, ignore error 2013 in cur close
This is an experiment for the hypothesis that the failure cursor
closing may have made the session stuck in an ongoing transaction.
Bug: T172143
Change-Id: Id4b4e32b7aa3f6d7fe2eb015c3ff40afb62b27eb
---
M quarry/web/worker.py
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/86/401486/1
diff --git a/quarry/web/worker.py b/quarry/web/worker.py
index 0227cba..5fc4409 100644
--- a/quarry/web/worker.py
+++ b/quarry/web/worker.py
@@ -100,11 +100,19 @@
except pymysql.OperationalError as e:
write_error(qrun, e[1])
finally:
+ conn.close_session()
+
if cur is not False:
# It is possible the cursor was never created,
# so check before we try to close it
- cur.close()
- conn.close_session()
+ try:
+ cur.close()
+ except pymysql.OperationalError as e:
+ if e[0] == 2013:
+ # Lost connection to MySQL server during query
+ pass
+ else:
+ raise
def write_error(qrun, error):
--
To view, visit https://gerrit.wikimedia.org/r/401486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4b4e32b7aa3f6d7fe2eb015c3ff40afb62b27eb
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Zhuyifei1999 <zhuyifei1...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
