Commit 010bd9b3 authored by Zhang Xiaoli's avatar Zhang Xiaoli
Browse files

Completed the joint debugging of mbi and phot.

parent 65422b8c
FROM csst/csst-msc-l1-mbi:latest
USER root
COPY run.sh /app/bin/
RUN chmod +x /app/bin/run.sh
COPY --from=hub.cstcloud.cn/scalebox/base:0.9 /usr/local/sbin /usr/local/sbin
......
......@@ -17,4 +17,4 @@ run:
down:
docker stop $(IMAGE_NAME)
scp:
scp -r ./ csst-zjs:/root/csst/mbi/
\ No newline at end of file
scp -r ./ csst-zjs:/root/csst/csst-msc-l1-mbi/
\ No newline at end of file
......@@ -40,4 +40,8 @@ rm -rf /pipeline/input/* /pipeline/output/*
echo finish mbi.
for i in 06 07 08 09 11 12 13 14 15 16 17 18 19 20 22 23 24 25 ; do
echo $1-$i >> /work/messages.txt
done
exit $exit_code
......@@ -8,7 +8,7 @@ PGPORT=5432
job_id=$1
for m in {10160000066..10160000068}; do
for m in {10160000000..10160000136}; do
echo $m
docker exec -t database psql -U ${POSTGRES_USER} -h ${POSTGRES_HOST} -d ${POSTGRES_DB} -p ${PGPORT} \
-c "INSERT INTO t_task(job,key_message) VALUES(${job_id},'${m}')"
......
......@@ -16,18 +16,25 @@ jobs:
output_text_size: 100000
text_tranc_mode: TAIL
locale_mode: NONE
# grpc_server: 172.24.23.6:50051
parameters:
# start_message: 10160000068
key_group_regex: ^(.{6})(.{3})$
key_group_seq: 1,2
environments:
- CSST_DFS_API_MODE=${CSST_DFS_API_MODE}
- CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY}
- CSST_DFS_APP_ID=${CSST_DFS_APP_ID}
- CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
- CRDS_SERVER_URL=${CRDS_SERVER_URL}
paths:
- ${AUX_DIR}:/pipeline/aux
- ${CRDS_DIR}:/L1Pipeline/aux/C6.1_ref_crds
- ${DFS_ROOT}:/dfsroot
- ${CSST_AUX_DIR}:/pipeline/aux
- ${CSST_DFS_ROOT}:/dfsroot
- ${CSST_CRDS_ROOT}:/crdsroot
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
# sink_jobs:
hosts:
# - h0:1
- h0:1
- c0:1
- c1:1
- c2:1
......
# DFS
CSST_DFS_API_MODE=cluster
CSST_DFS_GATEWAY=172.24.27.2:30880
CSST_DFS_APP_ID=test
CSST_DFS_APP_TOKEN=test
# CRDS
CRDS_SERVER_URL=http://172.24.27.2:29000
# VOLUMES ==================
CSST_DFS_ROOT=/share/dfs
CSST_CRDS_ROOT=/share/crdsdata/data
CSST_AUX_DIR=/share/pipeline/aux
AUX_DIR=/sharewcl/pipeline/aux
CRDS_DIR=/sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr
DFS_ROOT=/sharewcl/dfs
# AUX_DIR=/sharewcl/pipeline/aux
# CRDS_DIR=/sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr
# DFS_ROOT=/sharewcl/dfs
# AUX_DIR=/share/pipeline/aux
# CRDS_DIR=/share/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr
# DFS_ROOT=/share/dfs
# DFS
CSST_DFS_API_MODE=cluster
CSST_DFS_GATEWAY=172.24.27.2:30880
CSST_DFS_APP_ID=test
CSST_DFS_APP_TOKEN=test
# CRDS
CRDS_SERVER_URL=http://172.24.27.2:29000
# VOLUMES ==================
CSST_DFS_ROOT=/sharewcl/dfs
CSST_CRDS_ROOT=/sharewcl/crdsdata/data
CSST_AUX_DIR=/sharewcl/pipeline/aux
FROM csst/csst-msc-l1-phot:latest
USER root
COPY run.sh /app/bin/
RUN chmod +x /app/bin/run.sh
COPY --from=hub.cstcloud.cn/scalebox/base:0.9 /usr/local/sbin /usr/local/sbin
RUN mkdir /work/
WORKDIR /work/
ENTRYPOINT ["goagent"]
IMAGE_NAME:=cnic/csst-msc-l1-phot
build:
docker build --network=host -t $(IMAGE_NAME) .
dist:
#docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load'
docker save $(IMAGE_NAME) > /share/tmp/msc-l1-phot.tar
ssh c0 docker load -i /share/tmp/msc-l1-phot.tar
ssh c1 docker load -i /share/tmp/msc-l1-phot.tar
ssh c2 docker load -i /share/tmp/msc-l1-phot.tar
push:
docker push $(IMAGE_NAME)
run:
docker run -it --entrypoint bash $(IMAGE_NAME)
down:
docker stop $(IMAGE_NAME)
scp:
scp -r ./ csst-zjs:/root/csst/csst-msc-l1-phot/
\ No newline at end of file
#!/bin/bash
# obsid 10160000000 - 10160000136
arr=($(echo $1 | tr "-" " "))
obsid="${arr[0]}"
detector="${arr[1]}"
echo "obsid: "$obsid
echo "detector: "$detector
# obsid=$1
# detector=$2
# l1-mbi --obs-id=$obsid --device=cpu --n-jobs=18 --n-jobs-gpu=18 --clean-l0 --clean-l1 --cleanup --dfs-node=pml --ver-sim=C6.2 --no-photometry --no-astrometry
python /pipeline/src/run.py $obsid $detector
exit_code=$?
echo "=====pipeline.log====" > /work/user-file.txt
cat /pipeline/output/pipeline.log >> /work/user-file.txt
timefile=/pipeline/output/timestamps.txt
if test -f "$timefile"; then
echo "$timefile exist"
mv /pipeline/output/timestamps.txt /work/timestamps.txt
fi
rm -rf /pipeline/input/* /pipeline/output/*
echo finish csst-msc-l1-phot.
exit $exit_code
CLUSTER=csst
all: reset build
run:
scalebox app create --env-file zjs.env
reset:
cd ${HOME}/docker-scalebox/clusters/$(CLUSTER) && make && cd -
down:
make -C ${HOME}/docker-scalebox/clusters/$(CLUSTER) down
list:
make -C ${HOME}/docker-scalebox/clusters/$(CLUSTER) list
#!/bin/bash
POSTGRES_USER=scalebox
POSTGRES_HOST=localhost
POSTGRES_DB=scalebox
PGPORT=5432
job_id=$1
for m in {10160000000..10160000136}; do
echo $m
docker exec -t database psql -U ${POSTGRES_USER} -h ${POSTGRES_HOST} -d ${POSTGRES_DB} -p ${PGPORT} \
-c "INSERT INTO t_task(job,key_message) VALUES(${job_id},'${m}')"
done
#!/bin/bash
POSTGRES_USER=scalebox
POSTGRES_HOST=localhost
POSTGRES_DB=scalebox
PGPORT=5432
job_id=$1
for m in {10160000000..10160000001}; do
for n in 06 07 08 09 11 12 13 14 15 16 17 18 19 20 22 23 24 25 ; do
echo $m $n
msg=$m-$n
docker exec -t database psql -U ${POSTGRES_USER} -h ${POSTGRES_HOST} -d ${POSTGRES_DB} -p ${PGPORT} \
-c "INSERT INTO t_task(job,key_message) VALUES(${job_id},'${msg}')"
done
done
\ No newline at end of file
name: msc-l1-phot.app.process
label: 多色成像+测光
comment: 主巡天多色成像一级流水线
cluster: csst
parameters:
initial_status: RUNNING
jobs:
msc-l1-mbi:
label: 多色成像
base_image: cnic/csst-msc-l1-mbi
# schedule_mode: HEAD
variables:
# always_running: yes
# reserved_on_exit: yes
output_text_size: 100000
text_tranc_mode: TAIL
locale_mode: NONE
parameters:
# start_message: 10160000068
key_group_regex: ^(.{6})(.{3})$
key_group_seq: 1,2
environments:
- CSST_DFS_API_MODE=${CSST_DFS_API_MODE}
- CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY}
- CSST_DFS_APP_ID=${CSST_DFS_APP_ID}
- CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
- CRDS_SERVER_URL=${CRDS_SERVER_URL}
paths:
- ${CSST_AUX_DIR}:/pipeline/aux
- ${CSST_DFS_ROOT}:/dfsroot
- ${CSST_CRDS_ROOT}:/crdsroot
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
sink_jobs:
- msc-l1-phot
hosts:
- h0:1
- c0:1
- c1:1
# - c2:1
msc-l1-phot:
label: 测光
base_image: cnic/csst-msc-l1-phot
# schedule_mode: HEAD
variables:
# always_running: yes
# reserved_on_exit: yes
output_text_size: 100000
text_tranc_mode: TAIL
locale_mode: NONE
parameters:
# start_message: 10160000068
key_group_regex: ^(.{6})(.{3})$
key_group_seq: 1,2
environments:
- CSST_DFS_API_MODE=${CSST_DFS_API_MODE}
- CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY}
- CSST_DFS_APP_ID=${CSST_DFS_APP_ID}
- CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
- CRDS_SERVER_URL=${CRDS_SERVER_URL}
paths:
- ${CSST_AUX_DIR}:/pipeline/aux
- ${CSST_DFS_ROOT}:/dfsroot
- ${CSST_CRDS_ROOT}:/crdsroot
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
# sink_jobs:
hosts:
# - h0:1
# - c0:1
# - c1:1
- c2:1
AUX_DIR=/goosefsx/x_c60_o19xp6c1_proxy/L1Pipeline/aux
CRDS_DIR=/goosefsx/x_c60_o19xp6c1_proxy/L1Pipeline/aux/products_ref20_3hdr
DFS_ROOT=/goosefsx/x_c60_o19xp6c1_proxy/dfs_root
# AUX_DIR=/sharewcl/pipeline/aux
# CRDS_DIR=/sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr
# DFS_ROOT=/sharewcl/dfs
# AUX_DIR=/share/pipeline/aux
# CRDS_DIR=/share/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr
# DFS_ROOT=/share/dfs
# DFS
CSST_DFS_API_MODE=cluster
CSST_DFS_GATEWAY=172.24.27.2:30880
CSST_DFS_APP_ID=test
CSST_DFS_APP_TOKEN=test
# CRDS
CRDS_SERVER_URL=http://172.24.27.2:29000
# VOLUMES ==================
CSST_DFS_ROOT=/sharewcl/dfs
CSST_CRDS_ROOT=/sharewcl/crdsdata/data
CSST_AUX_DIR=/sharewcl/pipeline/aux
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment