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

Remove ugly workaround for scheduler function. Now the current app_context is used, instead of creating a new app instance.

Browse Source
This commit is contained in:
Patrick Jentsch 2019-08-20 15:57:58 +02:00
parent 5ff2ef9301
commit 6975076fc3
2 changed files with 69 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/__init__.py
View File

@ -40,13 +40,3 @@ def create_app(config_name):
app.register_blueprint(admin_blueprint, url_prefix='/admin') app.register_blueprint(admin_blueprint, url_prefix='/admin')
return app return app
def create_minimal_app(config_name):
app = Flask(__name__)
app.config.from_object(config[config_name])
config[config_name].init_app(app)
db.init_app(app)
return app

17
app/scheduler_functions.py
View File

@ -1,5 +1,5 @@
from datetime import datetime from datetime import datetime
from . import create_minimal_app, db from . import db, scheduler
from .models import Job from .models import Job
import docker import docker
import json import json
@ -7,8 +7,7 @@ import os
def checkout_jobs(): def checkout_jobs():
app = create_minimal_app(os.getenv('FLASK_CONFIG') or 'default') with scheduler.app.app_context():
app.app_context().push()
client = docker.from_env() client = docker.from_env()
jobs = db.session.query(Job) jobs = db.session.query(Job)
submitted_jobs = jobs.filter_by(status='submitted').all() submitted_jobs = jobs.filter_by(status='submitted').all()
@ -39,8 +38,8 @@ def checkout_jobs():
' '
' While the cpu_reservation value has to be in nanos, the ' While the cpu_reservation value has to be in nanos, the
' mem_reservation value must be presented in an unscaled form ' mem_reservation value must be presented in an unscaled form
' (intuitive right?). Bacause the job object provides the memory value ' (intuitive right?). Bacause the job object provides the memory
' in megabytes, it is also necessary to convert the value. ' value in megabytes, it is also necessary to convert the value.
''' '''
_resources = docker.types.Resources( _resources = docker.types.Resources(
cpu_reservation=job.n_cores * (10 ** 9), cpu_reservation=job.n_cores * (10 ** 9),
@ -50,10 +49,10 @@ def checkout_jobs():
''' '''
' Create the service with the prepared values. ' Create the service with the prepared values.
' '
' Note: A service reserves hardware ressources. In case no worker node ' Note: A service reserves hardware ressources. In case no worker
' has the required ressources available (not reserved), the ' node has the required ressources available (not reserved),
' service gets queued by the Docker engine until a node is able ' the service gets queued by the Docker engine until a node
' to meet the requirements. ' is able to meet the requirements.
''' '''
service = client.services.create( service = client.services.create(
_image, _image,