Skip to content
Snippets Groups Projects
Commit 2177e2e1 authored by Bert Palm's avatar Bert Palm :bug:
Browse files

removed scheduler

parent 986c600a
No related branches found
No related tags found
1 merge request!215Qc as a service
......@@ -223,34 +223,8 @@ CONFIGDB_UPDATER_IMAGE_TAG=latest
# soon we will change that.
############################################################
DISPATCHER_IMAGE_TAG=latest
SCHEDULER=BasicScheduler
SCHED_HOST=http://basic-demo-scheduler:5000
# use only on stage/production
#SCHEDULER=SlurmScheduler
#SCHED_HOST=https://head3.eve.ufz.de/slurmrest
SCHED_SLURM_RESTAPI_VERSION=v0.0.38
SCHED_MQTT_BROKER=tsm.intranet.ufz.de:8883
SCHED_MQTT_USER=$MQTT_USER
SCHED_MQTT_PASSWORD=$MQTT_PASSWORD
SCHED_JOB_LOG_LEVEL=DEBUG
SCHED_SLURM_USER=
SCHED_SLURM_JWT_TOKEN=
TOMCAT_PROXY_URL=${PROXY_URL}/sta/
############################################################
# basic-demo-scheduler (python, flask)
############################################################
############################################################
# basic-demo-scheduler (python, flask)
############################################################
SCHEDULER_IMAGE_TAG=latest
# This is used in the Dockerfile of basic-demo-scheduler
EXTRACTOR_IMAGE_TAG=latest
############################################################
# cron-scheduler (debian, python)
############################################################
......
......@@ -46,22 +46,6 @@ services:
volumes:
- "${DEV_DISPATCHER_SRC_DIR:-../tsm-dispatcher/src}:/home/appuser/app/src"
tsm-extractor:
image: "registry.hzdr.de/ufz-tsm/tsm-extractor/extractor:${EXTRACTOR_IMAGE_TAG}"
build:
context: "../tsm-extractor"
basic-demo-scheduler:
volumes:
- "${DEV_EXTRACTOR_SRC_DIR:-../tsm-extractor/src}:/home/appuser/app/src"
- "${DEV_SCHEDULER_SRC_DIR:-../tsm-basic-demo-scheduler/src}:/home/appuser/app/basic_demo_scheduler"
ports:
- "127.0.0.1:5000:5000"
build:
context: "../tsm-basic-demo-scheduler"
args:
EXTRACTOR_IMAGE_TAG: "${EXTRACTOR_IMAGE_TAG}"
frontend:
environment:
- "DJANGO_HELMHOLTZ_CLIENT_ID=${DJANGO_HELMHOLTZ_CLIENT_ID:-timeIO-client}"
......
......@@ -693,8 +693,6 @@ services:
condition: service_healthy
object-storage:
condition: service_healthy
basic-demo-scheduler:
condition: service_healthy
environment:
LOG_LEVEL: "${LOG_LEVEL}"
TOPIC: object_storage_notification
......@@ -713,12 +711,6 @@ services:
${S3MAP_POSTGRES_PASS}@\
${S3MAP_POSTGRES_HOST}/\
${S3MAP_POSTGRES_DB}"
SCHEDULER: "${SCHEDULER}"
SCHED_HOST: "${SCHED_HOST}"
SCHED_MQTT_BROKER: "${SCHED_MQTT_BROKER}"
SCHED_MQTT_USER: "${SCHED_MQTT_USER}"
SCHED_MQTT_PASSWORD: "${SCHED_MQTT_PASSWORD}"
SCHED_JOB_LOG_LEVEL: "${SCHED_JOB_LOG_LEVEL}"
CONFIGDB_DSN: "postgresql://\
${CONFIGDB_USER}:\
${CONFIGDB_PASSWORD}@\
......@@ -844,37 +836,6 @@ services:
- create-grafana-user
basic-demo-scheduler:
image: "registry.hzdr.de/ufz-tsm/tsm-basic-demo-scheduler/basic_demo_scheduler:${SCHEDULER_IMAGE_TAG}"
restart: "${RESTART}"
# Prevent blocking/slowing-down of other services if many scheduler jobs occur at
# the same time. Cap the processing power to equivalent of one CPU of the system.
cpus: 0.5
mem_limit: 4g
healthcheck:
test: [ "CMD-SHELL", "curl --fail http://localhost:5000/health || exit 1" ]
interval: 10s
timeout: 2s
retries: 5
environment:
MQTT_BROKER: mqtt-broker:1883
MQTT_USER: "${MQTT_USER}"
MQTT_PASSWORD: "${MQTT_PASSWORD}"
MQTT_CLIENT_ID: basic-demo-scheduler
MQTT_QOS: "${MQTT_QOS}"
CONFIGDB_DSN: "postgresql://\
${CONFIGDB_USER}:\
${CONFIGDB_PASSWORD}@\
${CONFIGDB_HOST}:\
${CONFIGDB_PORT}/\
${CONFIGDB_DB}"
DB_API_BASE_URL: "${DB_API_BASE_URL}"
DATABASE_HOST: "${CREATEDB_POSTGRES_HOST}"
DATABASE_NAME: "${CREATEDB_POSTGRES_DATABASE}"
command:
- --verbose
cron-scheduler:
build:
context: cron
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment