diff --git a/docker/README.md b/docker/README.md --- a/docker/README.md +++ b/docker/README.md @@ -86,7 +86,7 @@ the code from the https://0xacab.org gitlab forge: ``` -~/swh-environment/docker$ docker-compose exec swh-scheduler-api \ +~/swh-environment/docker$ docker-compose exec swh-scheduler \ swh scheduler task add list-gitlab-full \ -p oneshot url=https://0xacab.org/api/v4 @@ -111,7 +111,7 @@ `swh-loader-git` workers: ``` -~/swh-environment/docker$ docker-compose exec swh-scheduler-api \ +~/swh-environment/docker$ docker-compose exec swh-scheduler \ celery status listers@50ac2185c6c9: OK loader@b164f9055637: OK @@ -119,11 +119,11 @@ vault@c9fef1bbfdc1: OK 4 nodes online. -~/swh-environment/docker$ docker-compose exec swh-scheduler-api \ +~/swh-environment/docker$ docker-compose exec swh-scheduler \ celery control pool_grow 3 -d loader@b164f9055637 -> loader@b164f9055637: OK pool will grow -~/swh-environment/docker$ docker-compose exec swh-scheduler-api \ +~/swh-environment/docker$ docker-compose exec swh-scheduler \ celery inspect -d loader@b164f9055637 stats | grep prefetch_count "prefetch_count": 4 ``` @@ -213,7 +213,7 @@ To run the same command from within a container: ``` -~/swh-environment/docker$ docker-compose exec swh-scheduler-api celery status +~/swh-environment/docker$ docker-compose exec swh-scheduler celery status loader@61704103668c: OK [...] ``` @@ -259,7 +259,7 @@ 0xacab.org gitlab instance, one can do (from this git repository): ``` -~/swh-environment/docker$ docker-compose exec swh-scheduler-api \ +~/swh-environment/docker$ docker-compose exec swh-scheduler \ swh scheduler task add list-gitlab-full \ -p oneshot url=https://0xacab.org/api/v4 @@ -279,7 +279,7 @@ given task type: ``` -~/swh-environment/docker$ docker-compose exec swh-scheduler-api \ +~/swh-environment/docker$ docker-compose exec swh-scheduler \ swh scheduler task list-pending list-gitlab-full Found 1 list-gitlab-full tasks @@ -297,7 +297,7 @@ To list all existing task types: ``` -~/swh-environment/docker$ docker-compose exec swh-scheduler-api \ +~/swh-environment/docker$ docker-compose exec swh-scheduler \ swh scheduler task-type list Known task types: diff --git a/docker/conf/deposit.yml b/docker/conf/deposit.yml --- a/docker/conf/deposit.yml +++ b/docker/conf/deposit.yml @@ -1,7 +1,7 @@ scheduler: cls: remote args: - url: http://swh-scheduler-api:5008 + url: http://swh-scheduler:5008 allowed_hosts: - swh-deposit diff --git a/docker/conf/indexer.yml b/docker/conf/indexer.yml --- a/docker/conf/indexer.yml +++ b/docker/conf/indexer.yml @@ -13,7 +13,7 @@ scheduler: cls: remote args: - url: http://swh-scheduler-api:5008/ + url: http://swh-scheduler:5008/ celery: task_broker: amqp://guest:guest@amqp// task_modules: diff --git a/docker/conf/indexer_journal_client.yml b/docker/conf/indexer_journal_client.yml --- a/docker/conf/indexer_journal_client.yml +++ b/docker/conf/indexer_journal_client.yml @@ -8,4 +8,4 @@ scheduler: cls: remote args: - url: http://swh-scheduler-api:5008/ + url: http://swh-scheduler:5008/ diff --git a/docker/conf/lister.yml b/docker/conf/lister.yml --- a/docker/conf/lister.yml +++ b/docker/conf/lister.yml @@ -6,7 +6,7 @@ scheduler: cls: remote args: - url: http://swh-scheduler-api:5008/ + url: http://swh-scheduler:5008/ lister: cls: local diff --git a/docker/conf/loader.yml b/docker/conf/loader.yml --- a/docker/conf/loader.yml +++ b/docker/conf/loader.yml @@ -17,7 +17,7 @@ scheduler: cls: remote args: - url: http://swh-scheduler-api:5008/ + url: http://swh-scheduler:5008/ celery: task_broker: amqp://guest:guest@amqp// diff --git a/docker/conf/nginx.conf b/docker/conf/nginx.conf --- a/docker/conf/nginx.conf +++ b/docker/conf/nginx.conf @@ -56,7 +56,7 @@ proxy_pass $upstream$uri; } location /scheduler { - set $upstream "http://swh-scheduler-api:5008"; + set $upstream "http://swh-scheduler:5008"; rewrite ^/scheduler/(.*)$ /$1 break; proxy_pass $upstream; diff --git a/docker/conf/vault-worker.yml b/docker/conf/vault-worker.yml --- a/docker/conf/vault-worker.yml +++ b/docker/conf/vault-worker.yml @@ -5,7 +5,7 @@ vault: cls: remote args: - url: http://swh-vault-api:5005/ + url: http://swh-vault:5005/ celery: task_broker: amqp://guest:guest@amqp// task_modules: diff --git a/docker/conf/vault-api.yml b/docker/conf/vault.yml rename from docker/conf/vault-api.yml rename to docker/conf/vault.yml --- a/docker/conf/vault-api.yml +++ b/docker/conf/vault.yml @@ -5,7 +5,7 @@ scheduler: cls: remote args: - url: http://swh-scheduler-api:5008/ + url: http://swh-scheduler:5008/ vault: cls: local args: diff --git a/docker/conf/web-replica.yml b/docker/conf/web-replica.yml --- a/docker/conf/web-replica.yml +++ b/docker/conf/web-replica.yml @@ -17,12 +17,12 @@ scheduler: cls: remote args: - url: http://swh-scheduler-api:5008/ + url: http://swh-scheduler:5008/ vault: cls: remote args: - url: http://swh-vault-api:5005/ + url: http://swh-vault:5005/ deposit: private_api_url: https://swh-deposit:5006/1/private/ diff --git a/docker/conf/web.yml b/docker/conf/web.yml --- a/docker/conf/web.yml +++ b/docker/conf/web.yml @@ -17,12 +17,12 @@ scheduler: cls: remote args: - url: http://swh-scheduler-api:5008/ + url: http://swh-scheduler:5008/ vault: cls: remote args: - url: http://swh-vault-api:5005/ + url: http://swh-vault:5005/ deposit: private_api_url: https://swh-deposit:5006/1/private/ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -84,7 +84,7 @@ # unset PGHOST as db service crashes otherwise PGHOST: - swh-scheduler-api: + swh-scheduler: image: swh/stack build: ./ env_file: @@ -100,7 +100,7 @@ - 5008:5008 volumes: - "./conf/scheduler.yml:/scheduler.yml:ro" - - "./services/swh-scheduler-api/entrypoint.sh:/entrypoint.sh:ro" + - "./services/swh-scheduler/entrypoint.sh:/entrypoint.sh:ro" swh-scheduler-listener: image: swh/stack @@ -114,7 +114,7 @@ entrypoint: /entrypoint.sh command: start-listener depends_on: - - swh-scheduler-api + - swh-scheduler - amqp volumes: - "./conf/scheduler.yml:/scheduler.yml:ro" @@ -132,7 +132,7 @@ entrypoint: /entrypoint.sh command: start-runner -p 10 depends_on: - - swh-scheduler-api + - swh-scheduler - amqp volumes: - "./conf/scheduler.yml:/scheduler.yml:ro" @@ -242,7 +242,7 @@ - 5006:5006 depends_on: - swh-deposit-db - - swh-scheduler-api + - swh-scheduler environment: VERBOSITY: 3 SWH_CONFIG_FILENAME: /deposit.yml @@ -262,13 +262,13 @@ # unset PGHOST as db service crashes otherwise PGHOST: - swh-vault-api: + swh-vault: image: swh/stack build: ./ env_file: - ./env/vault-db.env environment: - SWH_CONFIG_FILENAME: /vault-api.yml + SWH_CONFIG_FILENAME: /vault.yml command: server ports: - 5005:5005 @@ -276,10 +276,10 @@ - swh-vault-db - swh-objstorage - swh-storage - - swh-scheduler-api + - swh-scheduler entrypoint: /entrypoint.sh volumes: - - "./conf/vault-api.yml:/vault-api.yml:ro" + - "./conf/vault.yml:/vault.yml:ro" - "./services/swh-vault/entrypoint.sh:/entrypoint.sh:ro" swh-vault-worker: @@ -289,7 +289,7 @@ environment: SWH_CONFIG_FILENAME: /cooker.yml depends_on: - - swh-vault-api + - swh-vault - swh-storage entrypoint: /entrypoint.sh volumes: @@ -321,7 +321,7 @@ SWH_CONFIG_FILENAME: /lister.yml depends_on: - swh-listers-db - - swh-scheduler-api + - swh-scheduler - swh-scheduler-runner - swh-storage - amqp @@ -346,7 +346,7 @@ entrypoint: /entrypoint.sh depends_on: - swh-storage - - swh-scheduler-api + - swh-scheduler - amqp volumes: - "./conf/loader.yml:/loader.yml:ro" @@ -384,7 +384,7 @@ depends_on: - kafka - swh-storage - - swh-scheduler-api + - swh-scheduler volumes: - "./conf/indexer_journal_client.yml:/etc/softwareheritage/indexer/journal_client.yml:ro" - "./services/swh-indexer-journal-client/entrypoint.sh:/entrypoint.sh:ro" diff --git a/docker/services/swh-scheduler-api/entrypoint.sh b/docker/services/swh-scheduler/entrypoint.sh rename from docker/services/swh-scheduler-api/entrypoint.sh rename to docker/services/swh-scheduler/entrypoint.sh diff --git a/docker/tests/run_tests.sh b/docker/tests/run_tests.sh --- a/docker/tests/run_tests.sh +++ b/docker/tests/run_tests.sh @@ -170,10 +170,10 @@ docker-compose $DOCO_OPTIONS exec -T swh-storage wait-for-it localhost:5002 -s --timeout=0 docker-compose $DOCO_OPTIONS exec -T swh-objstorage wait-for-it localhost:5003 -s --timeout=0 docker-compose $DOCO_OPTIONS exec -T swh-web wait-for-it localhost:5004 -s --timeout=0 -docker-compose $DOCO_OPTIONS exec -T swh-vault-api wait-for-it localhost:5005 -s --timeout=0 +docker-compose $DOCO_OPTIONS exec -T swh-vault wait-for-it localhost:5005 -s --timeout=0 docker-compose $DOCO_OPTIONS exec -T swh-deposit wait-for-it localhost:5006 -s --timeout=0 docker-compose $DOCO_OPTIONS exec -T swh-idx-storage wait-for-it localhost:5007 -s --timeout=0 -docker-compose $DOCO_OPTIONS exec -T swh-scheduler-api wait-for-it localhost:5008 -s --timeout=0 +docker-compose $DOCO_OPTIONS exec -T swh-scheduler wait-for-it localhost:5008 -s --timeout=0 # Execute test scripts for test_script in $TEST_SCRIPTS_DIR/test_*; do diff --git a/docker/tests/test_01_loader_git.sh b/docker/tests/test_01_loader_git.sh old mode 100644 new mode 100755 --- a/docker/tests/test_01_loader_git.sh +++ b/docker/tests/test_01_loader_git.sh @@ -6,7 +6,7 @@ status_message "Scheduling the loading of the git repository located at ${TEST_GIT_REPO_URL}" -docker-compose $DOCO_OPTIONS exec -T swh-scheduler-api swh scheduler task add load-git repo_url=$TEST_GIT_REPO_URL +docker-compose $DOCO_OPTIONS exec -T swh-scheduler swh scheduler task add load-git repo_url=$TEST_GIT_REPO_URL status_message "Waiting for the git loading task to complete"