sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-01-23 00:00:35 +00:00
Code Issues Projects Releases Wiki Activity

Remove job deletion workaround

Browse Source
This commit is contained in:
Patrick Jentsch 2019-11-18 15:55:19 +01:00
parent 6d807d897d
commit 9a475f2ad2
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/models.py
View File

@ -2,6 +2,7 @@ from datetime import datetime
from flask import current_app from flask import current_app
from flask_login import UserMixin, AnonymousUserMixin from flask_login import UserMixin, AnonymousUserMixin
from itsdangerous import BadSignature, TimedJSONWebSignatureSerializer from itsdangerous import BadSignature, TimedJSONWebSignatureSerializer
from time import sleep
from werkzeug.security import generate_password_hash, check_password_hash from werkzeug.security import generate_password_hash, check_password_hash
from . import db, logger, login_manager from . import db, logger, login_manager
import os import os
@ -330,23 +331,16 @@ class Job(db.Model):
self.status = 'stopping' self.status = 'stopping'
db.session.commit() db.session.commit()
while self.status != 'deleted': while self.status != 'deleted':
''' TODO: wait a second ''' sleep(1)
db.session.refresh(self) db.session.refresh(self)
path = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'], path = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'],
str(self.user_id), 'jobs', str(self.id)) str(self.user_id), 'jobs', str(self.id))
''' try:
' TODO: Remove this workaround by executing the following command shutil.rmtree(path)
' before service removal. except Exception as e:
' ''' TODO: Proper exception handling '''
' docker service update --mount-rm <service> logger.warning(e)
''' pass
while os.path.exists(path):
try:
shutil.rmtree(path)
except Exception as e:
''' TODO: Proper exception handling '''
logger.warning(e)
pass
db.session.delete(self) db.session.delete(self)
db.session.commit() db.session.commit()
@ -445,19 +439,12 @@ class Corpus(db.Model):
corpus_file.delete() corpus_file.delete()
path = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'], path = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'],
str(self.user_id), 'corpora', str(self.id)) str(self.user_id), 'corpora', str(self.id))
''' try:
' TODO: Remove this workaround by executing the following command shutil.rmtree(path)
' before service removal. except Exception as e:
' ''' TODO: Proper exception handling '''
' docker service update --mount-rm <service> logger.warning(e)
''' pass
while os.path.exists(path):
try:
shutil.rmtree(path)
except Exception as e:
''' TODO: Proper exception handling '''
logger.warning(e)
pass
db.session.delete(self) db.session.delete(self)
db.session.commit() db.session.commit()