From 409cfce50a4d429794e8d036fab39273ef1f2c5f Mon Sep 17 00:00:00 2001 From: ccamel Date: Tue, 5 Sep 2023 13:56:32 +0200 Subject: [PATCH 1/5] build(project): add batch size configuration --- .env | 3 ++- docker-compose.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 910ffa2..4bc8441 100644 --- a/.env +++ b/.env @@ -11,4 +11,5 @@ DB_METABASE_USER=metabase DB_METABASE_PASSWORD=metabase # set "test" to run tests -SUB_COMMAND= \ No newline at end of file +SUB_COMMAND= +SUB_BATCH_SIZE=100 diff --git a/docker-compose.yml b/docker-compose.yml index 51bb086..7e87cf2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,6 +39,7 @@ services: command: - ${SUB_COMMAND} - -f=/app + - --batch-size=${SUB_BATCH_SIZE} - --db-schema=app healthcheck: test: ["CMD", "curl", "-f", "http://subquery-node:3000/ready"] From be7c51156b2f1ce8af6e43b4676de2a1587b3b1d Mon Sep 17 00:00:00 2001 From: ccamel Date: Tue, 5 Sep 2023 13:57:52 +0200 Subject: [PATCH 2/5] build(project): add query limit configuration --- .env | 1 + docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.env b/.env index 4bc8441..bad5fa5 100644 --- a/.env +++ b/.env @@ -13,3 +13,4 @@ DB_METABASE_PASSWORD=metabase # set "test" to run tests SUB_COMMAND= SUB_BATCH_SIZE=100 +SUB_QUERY_LIMIT=25 diff --git a/docker-compose.yml b/docker-compose.yml index 7e87cf2..57d2013 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,6 +40,7 @@ services: - ${SUB_COMMAND} - -f=/app - --batch-size=${SUB_BATCH_SIZE} + - --query-limit=${SUB_QUERY_LIMIT} - --db-schema=app healthcheck: test: ["CMD", "curl", "-f", "http://subquery-node:3000/ready"] From 52fcee025845c500f20614c009a69c76e9d5f2c0 Mon Sep 17 00:00:00 2001 From: ccamel Date: Tue, 5 Sep 2023 14:02:29 +0200 Subject: [PATCH 3/5] build(project): add subql debug configuration --- .env | 2 ++ docker-compose.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.env b/.env index bad5fa5..487d02c 100644 --- a/.env +++ b/.env @@ -14,3 +14,5 @@ DB_METABASE_PASSWORD=metabase SUB_COMMAND= SUB_BATCH_SIZE=100 SUB_QUERY_LIMIT=25 +SUB_DEBUG=false +SUB_LOG_LEVEL=info diff --git a/docker-compose.yml b/docker-compose.yml index 57d2013..65458aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,6 +41,8 @@ services: - -f=/app - --batch-size=${SUB_BATCH_SIZE} - --query-limit=${SUB_QUERY_LIMIT} + - --debug=${SUB_DEBUG} + - --log-level=${SUB_LOG_LEVEL} - --db-schema=app healthcheck: test: ["CMD", "curl", "-f", "http://subquery-node:3000/ready"] From 5537397028b7de40c7ec2e6528ae250c9e697c45 Mon Sep 17 00:00:00 2001 From: ccamel Date: Tue, 5 Sep 2023 18:57:11 +0200 Subject: [PATCH 4/5] build(project): fix incorrect database variable name --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 65458aa..b0f79ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,7 +63,7 @@ services: environment: DB_HOST: postgres DB_PORT: ${DB_POSTGRES_PORT} - DB_DATABASE: ${DB_POSTGRES_NAME} + DB_DATABASE: ${DB_SUBQL_NAME} DB_USER: ${DB_SUBQL_USER} DB_PASS: ${DB_SUBQL_PASSWORD} command: From 1412cba6638d830ff9517fd9dd8d159ef42b0e61 Mon Sep 17 00:00:00 2001 From: ccamel Date: Tue, 5 Sep 2023 19:00:55 +0200 Subject: [PATCH 5/5] build(project): make environment variables mandatory --- docker-compose.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b0f79ca..326f542 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,15 +9,15 @@ services: COPY docker/initialize-db.sh /docker-entrypoint-initdb.d/ ports: - - ${DB_POSTGRES_PORT}:5432 + - ${DB_POSTGRES_PORT?}:5432 environment: - POSTGRES_USER: ${DB_POSTGRES_USER} - POSTGRES_PASSWORD: ${DB_POSTGRES_PASSWORD} - DB_SUBQL_NAME: ${DB_SUBQL_NAME} + POSTGRES_USER: ${DB_POSTGRES_USER?} + POSTGRES_PASSWORD: ${DB_POSTGRES_PASSWORD?} + DB_SUBQL_NAME: ${DB_SUBQL_NAME?} volumes: - postgres-data:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${DB_POSTGRES_USER}"] + test: ["CMD-SHELL", "pg_isready -U ${DB_POSTGRES_USER?}"] interval: 5s timeout: 5s retries: 5 @@ -30,19 +30,19 @@ services: restart: always environment: DB_HOST: postgres - DB_PORT: ${DB_POSTGRES_PORT} - DB_DATABASE: ${DB_SUBQL_NAME} - DB_USER: ${DB_SUBQL_USER} - DB_PASS: ${DB_SUBQL_PASSWORD} + DB_PORT: ${DB_POSTGRES_PORT?} + DB_DATABASE: ${DB_SUBQL_NAME?} + DB_USER: ${DB_SUBQL_USER?} + DB_PASS: ${DB_SUBQL_PASSWORD?} volumes: - .:/app command: - - ${SUB_COMMAND} + - ${SUB_COMMAND?} - -f=/app - - --batch-size=${SUB_BATCH_SIZE} - - --query-limit=${SUB_QUERY_LIMIT} - - --debug=${SUB_DEBUG} - - --log-level=${SUB_LOG_LEVEL} + - --batch-size=${SUB_BATCH_SIZE?} + - --query-limit=${SUB_QUERY_LIMIT?} + - --debug=${SUB_DEBUG?} + - --log-level=${SUB_LOG_LEVEL?} - --db-schema=app healthcheck: test: ["CMD", "curl", "-f", "http://subquery-node:3000/ready"] @@ -62,10 +62,10 @@ services: restart: always environment: DB_HOST: postgres - DB_PORT: ${DB_POSTGRES_PORT} - DB_DATABASE: ${DB_SUBQL_NAME} - DB_USER: ${DB_SUBQL_USER} - DB_PASS: ${DB_SUBQL_PASSWORD} + DB_PORT: ${DB_POSTGRES_PORT?} + DB_DATABASE: ${DB_SUBQL_NAME?} + DB_USER: ${DB_SUBQL_USER?} + DB_PASS: ${DB_SUBQL_PASSWORD?} command: - --name=app - --playground @@ -80,11 +80,11 @@ services: restart: unless-stopped environment: MB_DB_HOST: postgres - MB_DB_PORT: ${DB_POSTGRES_PORT} - MB_DB_DBNAME: ${DB_METABASE_NAME} + MB_DB_PORT: ${DB_POSTGRES_PORT?} + MB_DB_DBNAME: ${DB_METABASE_NAME?} MB_DB_TYPE: postgres - MB_DB_USER: ${DB_METABASE_USER} - MB_DB_PASS: ${DB_METABASE_PASSWORD} + MB_DB_USER: ${DB_METABASE_USER?} + MB_DB_PASS: ${DB_METABASE_PASSWORD?} JAVA_TOOL_OPTIONS: "-Xmx4g" ports: - 3001:3000