Skip to content

datajoint/admin.py: add unsafe dj.kill option, expand display to include host #741

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
dimitri-yatsenko merged 3 commits into from
Mar 16, 2020
Merged

datajoint/admin.py: add unsafe dj.kill option, expand display to include host #741

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cba5ab0
datajoint/admin.py: add unsafe dj.kill option, expand display to incl…
Mar 4, 2020
ec78b5b
datajoint/admin.py: dj.kill() safemode handling fix
Mar 11, 2020
f1a5870
datajoint/admin.py: move non-prompting kill logic to new kill_quick f…
Mar 12, 2020
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
34 changes: 30 additions & 4 deletions datajoint/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def kill(restriction=None, connection=None): # pragma: no cover

Examples:
dj.kill('HOST LIKE "%compute%"') lists only connections from hosts containing "compute".
dj.kill('TIME > 600') lists only connections older than 10 minutes.
dj.kill('TIME > 600') lists only connections in their current state for more than 10 minutes
"""

if connection is None:
Expand All @@ -42,12 +42,12 @@ def kill(restriction=None, connection=None): # pragma: no cover
"" if restriction is None else ' AND (%s)' % restriction)

while True:
print(' ID USER STATE TIME INFO')
print('+--+ +----------+ +-----------+ +--+')
print(' ID USER HOST STATE TIME INFO')
print('+--+ +----------+ +-----------+ +-----------+ +-----+')
cur = connection.query(query, as_dict=True)
for process in cur:
try:
print('{ID:>4d} {USER:<12s} {STATE:<12s} {TIME:>5d} {INFO}'.format(**process))
print('{ID:>4d} {USER:<12s} {HOST:<12s} {STATE:<12s} {TIME:>7d} {INFO}'.format(**process))
except TypeError:
print(process)
response = input('process to kill or "q" to quit > ')
Expand All @@ -63,3 +63,29 @@ def kill(restriction=None, connection=None): # pragma: no cover
connection.query('kill %d' % pid)
except pymysql.err.InternalError:
print('Process not found')


def kill_quick(restriction=None, connection=None):
"""
Kill database connections without prompting. Returns number of terminated connections.
:param restriction: restriction to be applied to processlist
:param connection: a datajoint.Connection object. Default calls datajoint.conn()

Restrictions are specified as strings and can involve any of the attributes of
information_schema.processlist: ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO.

Examples:
dj.kill('HOST LIKE "%compute%"') terminates connections from hosts containing "compute".
"""
if connection is None:
connection = conn()

query = 'SELECT * FROM information_schema.processlist WHERE id <> CONNECTION_ID()' + (
"" if restriction is None else ' AND (%s)' % restriction)

cur = connection.query(query, as_dict=True)
nkill = 0
for process in cur:
connection.query('kill %d' % process['ID'])
nkill += 1
return nkill