Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
csst
Scalebox Apps
Commits
010bd9b3
Commit
010bd9b3
authored
Jul 11, 2023
by
Zhang Xiaoli
Browse files
Completed the joint debugging of mbi and phot.
parent
65422b8c
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
251 additions
and
10 deletions
+251
-10
L1/dockerfiles/csst-msc-l1-mbi/Dockerfile
L1/dockerfiles/csst-msc-l1-mbi/Dockerfile
+1
-0
L1/dockerfiles/csst-msc-l1-mbi/Makefile
L1/dockerfiles/csst-msc-l1-mbi/Makefile
+1
-1
L1/dockerfiles/csst-msc-l1-mbi/run.sh
L1/dockerfiles/csst-msc-l1-mbi/run.sh
+4
-0
L1/dockerfiles/csst-msc-l1-mbi/test/add_task.sh
L1/dockerfiles/csst-msc-l1-mbi/test/add_task.sh
+1
-1
L1/dockerfiles/csst-msc-l1-mbi/test/app.yaml
L1/dockerfiles/csst-msc-l1-mbi/test/app.yaml
+11
-4
L1/dockerfiles/csst-msc-l1-mbi/test/zjs-ztm.env
L1/dockerfiles/csst-msc-l1-mbi/test/zjs-ztm.env
+12
-0
L1/dockerfiles/csst-msc-l1-mbi/test/zjs.env
L1/dockerfiles/csst-msc-l1-mbi/test/zjs.env
+17
-4
L1/dockerfiles/csst-msc-l1-phot/Dockerfile
L1/dockerfiles/csst-msc-l1-phot/Dockerfile
+11
-0
L1/dockerfiles/csst-msc-l1-phot/Makefile
L1/dockerfiles/csst-msc-l1-phot/Makefile
+20
-0
L1/dockerfiles/csst-msc-l1-phot/run.sh
L1/dockerfiles/csst-msc-l1-phot/run.sh
+28
-0
L1/dockerfiles/csst-msc-l1-phot/test/Makefile
L1/dockerfiles/csst-msc-l1-phot/test/Makefile
+16
-0
L1/dockerfiles/csst-msc-l1-phot/test/add_task.sh
L1/dockerfiles/csst-msc-l1-phot/test/add_task.sh
+15
-0
L1/dockerfiles/csst-msc-l1-phot/test/add_task1.sh
L1/dockerfiles/csst-msc-l1-phot/test/add_task1.sh
+18
-0
L1/dockerfiles/csst-msc-l1-phot/test/app.yaml
L1/dockerfiles/csst-msc-l1-phot/test/app.yaml
+73
-0
L1/dockerfiles/csst-msc-l1-phot/test/tencent.env
L1/dockerfiles/csst-msc-l1-phot/test/tencent.env
+3
-0
L1/dockerfiles/csst-msc-l1-phot/test/zjs.env
L1/dockerfiles/csst-msc-l1-phot/test/zjs.env
+20
-0
No files found.
L1/dockerfiles/csst-msc-l1-mbi/Dockerfile
View file @
010bd9b3
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
...
...
L1/dockerfiles/csst-msc-l1-mbi/Makefile
View file @
010bd9b3
...
...
@@ -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
L1/dockerfiles/csst-msc-l1-mbi/run.sh
View file @
010bd9b3
...
...
@@ -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
L1/dockerfiles/csst-msc-l1-mbi/test/add_task.sh
View file @
010bd9b3
...
...
@@ -8,7 +8,7 @@ PGPORT=5432
job_id
=
$1
for
m
in
{
101600000
66
..10160000
068
}
;
do
for
m
in
{
101600000
00
..10160000
136
}
;
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
}
')"
...
...
L1/dockerfiles/csst-msc-l1-mbi/test/app.yaml
View file @
010bd9b3
...
...
@@ -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
-
${C
RDS_DIR}:/L1Pipeline/aux/C6.1_ref_crds
-
${D
F
S_ROOT}:/d
f
sroot
-
${
CSST_
AUX_DIR}:/pipeline/aux
-
${C
SST_DFS_ROOT}:/dfsroot
-
${
CSST_CR
DS_ROOT}:/
cr
dsroot
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
# sink_jobs:
hosts
:
#
- h0:1
-
h0:1
-
c0:1
-
c1:1
-
c2:1
...
...
L1/dockerfiles/csst-msc-l1-mbi/test/zjs-ztm.env
0 → 100644
View file @
010bd9b3
# 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
L1/dockerfiles/csst-msc-l1-mbi/test/zjs.env
View file @
010bd9b3
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
\ No newline at end of file
# 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
L1/dockerfiles/csst-msc-l1-phot/Dockerfile
0 → 100644
View file @
010bd9b3
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"]
L1/dockerfiles/csst-msc-l1-phot/Makefile
0 → 100644
View file @
010bd9b3
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
L1/dockerfiles/csst-msc-l1-phot/run.sh
0 → 100644
View file @
010bd9b3
#!/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
L1/dockerfiles/csst-msc-l1-phot/test/Makefile
0 → 100644
View file @
010bd9b3
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
L1/dockerfiles/csst-msc-l1-phot/test/add_task.sh
0 → 100644
View file @
010bd9b3
#!/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
L1/dockerfiles/csst-msc-l1-phot/test/add_task1.sh
0 → 100644
View file @
010bd9b3
#!/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
L1/dockerfiles/csst-msc-l1-phot/test/app.yaml
0 → 100644
View file @
010bd9b3
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
L1/dockerfiles/csst-msc-l1-phot/test/tencent.env
0 → 100644
View file @
010bd9b3
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
L1/dockerfiles/csst-msc-l1-phot/test/zjs.env
0 → 100644
View file @
010bd9b3
# 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment