hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-18 15:33:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix db reconnect when user.db changes

Browse Source 
store id on outer User, rather than accessing orm_user.id, which seems to fail sometimes

this may fix the recent increase in intermittent test failures
This commit is contained in:
Min RK
2017-06-26 12:39:01 +02:00
parent bb417b98b8
commit 88040362b0
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
jupyterhub/user.py
View File

@@ -93,12 +93,20 @@ class User(HasTraits):
def _db_changed(self, change): def _db_changed(self, change):
"""Changing db session reacquires ORM User object""" """Changing db session reacquires ORM User object"""
# db session changed, re-get orm User # db session changed, re-get orm User
if self.orm_user: db = change.new
id = self.orm_user.id if self._user_id is not None:
self.orm_user = change['new'].query(orm.User).filter(orm.User.id == id).first() self.orm_user = db.query(orm.User).filter(orm.User.id == self._user_id).first()
self.spawner.db = self.db self.spawner.db = change.new
_user_id = None
orm_user = Any(allow_none=True)
@observe('orm_user')
def _orm_user_changed(self, change):
if change.new:
self._user_id = change.new.id
else:
self._user_id = None
orm_user = None
spawner = None spawner = None
spawn_pending = False spawn_pending = False
stop_pending = False stop_pending = False
@@ -113,8 +121,9 @@ class User(HasTraits):
return self.settings.get('spawner_class', LocalProcessSpawner) return self.settings.get('spawner_class', LocalProcessSpawner)
def __init__(self, orm_user, settings=None, **kwargs): def __init__(self, orm_user, settings=None, **kwargs):
self.orm_user = orm_user if settings:
self.settings = settings or {} kwargs['settings'] = settings
kwargs['orm_user'] = orm_user
super().__init__(**kwargs) super().__init__(**kwargs)
self.allow_named_servers = self.settings.get('allow_named_servers', False) self.allow_named_servers = self.settings.get('allow_named_servers', False)
@@ -139,7 +148,7 @@ class User(HasTraits):
raise AttributeError(attr) raise AttributeError(attr)
def __setattr__(self, attr, value): def __setattr__(self, attr, value):
if self.orm_user and hasattr(self.orm_user, attr): if not attr.startswith('_') and self.orm_user and hasattr(self.orm_user, attr):
setattr(self.orm_user, attr, value) setattr(self.orm_user, attr, value)
else: else:
super().__setattr__(attr, value) super().__setattr__(attr, value)