Skip to content

Commit 9b0c738

Browse files
Update runtime settings (#24)
* Update package to fix build issue - Change PostgreSQL volume path - Change MongoDB volume path - Change Redis port and volume path - Change API data volume path - Change Celery data volume path - Update Redis host URL in API - Update Redis host URL in Celery - Update database connection parameters - Update dataflow requirements for packages * fix(docker): update RAY_LOG_DIR path - Change RAY_LOG_DIR for dataflow-api - Change RAY_LOG_DIR for celery-work * Add environment variable scripts - Add run_api_server.sh for API server setup - Update run_celery_linux.sh for consistency - Change default DATABASE_PORT to 5432 --------- Co-authored-by: Haihui.Wang <wanghh2000@163.com>
1 parent ccc0503 commit 9b0c738

3 files changed

Lines changed: 40 additions & 2 deletions

File tree

data_server/database/session.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def sqlalchemy_database_uri() -> URL:
3434
db_user_pwd = os.getenv('DATABASE_PASSWORD', "postgres")
3535
db_host_name = os.getenv('DATABASE_HOSTNAME', "127.0.0.1")
3636
db_host_port = os.getenv('DATABASE_PORT', 5433)
37-
3837
db_name = os.getenv('DATABASE_DB', "data_flow")
38+
3939
print(f"connect to {db_user_name}:{db_user_pwd}@{db_host_name}:{db_host_port}/{db_name}")
4040
return URL.create(
4141
# drivername="postgresql+asyncpg",

run_api_server.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
3+
export DATABASE_HOSTNAME=127.0.0.1
4+
export DATABASE_PORT=5433
5+
export DATABASE_USERNAME=postgres
6+
export DATABASE_PASSWORD=postgres
7+
export DATABASE_DB=data_flow
8+
9+
export DATA_DIR=/tmp/data_flow/data
10+
export CSGHUB_ENDPOINT=https://hub.opencsg-stg.com
11+
export REDIS_HOST_URL=redis://127.0.0.1:16379
12+
export MONG_HOST_URL=mongodb://root:example@net-power.9free.com.cn:18123
13+
14+
export STUDIO_JUMP_URL=https://opencsg.com
15+
16+
export MAX_WORKERS=99
17+
18+
uvicorn data_server.main:app --reload

run_celery_linux.sh

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
#!/bin/sh
2+
3+
export DATABASE_HOSTNAME=127.0.0.1
4+
export DATABASE_PORT=5433
5+
export DATABASE_USERNAME=postgres
6+
export DATABASE_PASSWORD=postgres
7+
export DATABASE_DB=data_flow
8+
9+
export DATA_DIR=/tmp/data_flow/data
10+
export CSGHUB_ENDPOINT=https://hub.opencsg-stg.com
11+
export REDIS_HOST_URL=redis://127.0.0.1:16379
12+
export MONG_HOST_URL=mongodb://root:example@net-power.9free.com.cn:18123
13+
14+
export STUDIO_JUMP_URL=https://opencsg.com
15+
16+
export MAX_WORKERS=99
17+
218
MILLISECOND_TIMESTAMP=$(date +%s%3N)
319
HOSTNAME=$(hostname -f)
420
NODENAME="worker_${MILLISECOND_TIMESTAMP}_${HOSTNAME}"
5-
celery -A data_celery.main:celery_app worker --loglevel=info --pool=eventlet -n "$NODENAME"
21+
22+
# celery -A data_celery.main:celery_app worker --loglevel=info --pool=eventlet -n $NODENAME
23+
24+
NODENAME=$HOSTNAME
25+
celery -A data_celery.main:celery_app worker --loglevel=info --pool=gevent -n $NODENAME

0 commit comments

Comments
 (0)