From fd2559c03cc2bb8f5b384d379e45f59f8d8110a3 Mon Sep 17 00:00:00 2001 From: Andrea Jedele <a.jedele@gsi.de> Date: Wed, 20 Nov 2024 17:04:48 +0100 Subject: [PATCH 1/4] made timeorderer user-friendly with scripts similar to drasi set-up --- drasi_create_timeorderer.bash | 14 +++++++++ timeorderer_setup_start.bash | 59 +++++++++++++++++++++++++++++++++++ to_template.bash | 41 ++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100755 drasi_create_timeorderer.bash create mode 100755 timeorderer_setup_start.bash create mode 100644 to_template.bash diff --git a/drasi_create_timeorderer.bash b/drasi_create_timeorderer.bash new file mode 100755 index 0000000..e65da74 --- /dev/null +++ b/drasi_create_timeorderer.bash @@ -0,0 +1,14 @@ +#!/bin/bash + +set -e + +cd ../ + +source to.conf #|| { echo not found to.conf ; exit 1 } + +mkdir -v ${TO_DIR} + +cp -iv scripts/to_template.bash ${TO_DIR}/to.bash +chmod a+x ${TO_DIR}/to.bash +cp -iv scripts/serv.bash ${TO_DIR} +chmod a+x ${TO_DIR}/serv.bash diff --git a/timeorderer_setup_start.bash b/timeorderer_setup_start.bash new file mode 100755 index 0000000..45bbee9 --- /dev/null +++ b/timeorderer_setup_start.bash @@ -0,0 +1,59 @@ +#!/bin/bash + +cd $EXP_PATH + +pwd +source to.conf +scripts=${EXP_PATH}/scripts +cd $scripts/ +. drasi_common.bash to +cd ../ + +echo +echo "This will setup drasi Time-orderer and started it." +echo + +TO=TO_${EXP_NAME} + +screen -ls | grep -q $TO +if [ 0 -eq $? ] +then + ask_to_kill "Screen session $TO already running, kill?" + echo "Killing $TO..." + screen -S $TO -X quit + sleep 2 +fi + +echo "Starting TO..." +screen -dmS $TO +screen -S $TO -p 0 -X title tree +screen -S $TO -p tree -X stuff "ssh ${TO_PC} +explogin $EXP_NAME +cd $EXP_PATH +./drasi/bin/lwrocmon ${TO_PC}:${TO_PORT} --tree +" + +screen -S $TO -X screen -t to +screen -S $TO -p to -X stuff "ssh ${TO_PC} +explogin $EXP_NAME +cd $EXP_PATH +cd ${TO_DIR} +./to.bash +" + +screen -S $TO -X screen -t serv +screen -S $TO -p serv -X stuff "ssh ${TO_PC} +explogin $EXP_NAME +cd $EXP_PATH +cd ${TO_DIR} +./serv.bash +" + + +screen -S $TO -X screen -t misc + +echo Done. +echo +echo "To run screen, type screen -x $TO" +echo +echo "To kill and restart exectuables: enter ctrl+c and up and enter in screen" diff --git a/to_template.bash b/to_template.bash new file mode 100644 index 0000000..1e511a8 --- /dev/null +++ b/to_template.bash @@ -0,0 +1,41 @@ +#!/bin/bash + +source ../to.conf + +HOST=${TO_PC} +if [ $(hostname -s) != "$HOST" ] +then + echo "Must run on $HOST!" 1>&2 + exit 1 +fi + +TO_NAME=TO_${EXP_NAME} +trans= $((${TO_PORT}+1)) +stream=$((${TO_PORT}+2)) + +outbuf="bufsize=200Mi" + +# basic setup +TO="../drasi/bin/lwrocmerge" +TO+=" --label=${TO_NAME}" +TO+=" --port=${TO_PORT}" +TO+=" --merge-mode=wr" +TO+=" --server=$outbuf,trans:$trans,nohold" +TO+=" --server=$outbuf,stream:$stream" +TO+=" --file-writer=$outbuf" +TO+=" --buf=size=25Gi" +TO+=" --max-ev-size=130Mi" +TO+=" --merge-ts-analyse-ref=16" +TO+=" --merge-ts-analyse-sync-trig=3" + + +# event sources - add as become available +# TO= " --drasi=ts-disable=60s,inbufsize=2000Mi,eb_path" #det system +TO= " --drasi=ts-disable=60s,inbufsize=2000Mi,lxir133:7770" # Main + +echo -n "Running " +echo "$TO" | sed 's/ /\n /g' + +exec $TO + +exit -- GitLab From 868cf2f24f852f2897247afb449e241f970b95d4 Mon Sep 17 00:00:00 2001 From: A land user who did not set git config --local <land@gsi.de> Date: Thu, 21 Nov 2024 12:03:29 +0100 Subject: [PATCH 2/4] added /lynx/Lynx/land/usr/land/landexp/daqtest to a few places --- drasi_create_timeorderer.bash | 2 +- timeorderer_setup_start.bash | 6 ++++++ to_template.bash | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drasi_create_timeorderer.bash b/drasi_create_timeorderer.bash index e65da74..a8a7f4a 100755 --- a/drasi_create_timeorderer.bash +++ b/drasi_create_timeorderer.bash @@ -2,7 +2,7 @@ set -e -cd ../ +cd $EXP_PATH source to.conf #|| { echo not found to.conf ; exit 1 } diff --git a/timeorderer_setup_start.bash b/timeorderer_setup_start.bash index 45bbee9..8e10d37 100755 --- a/timeorderer_setup_start.bash +++ b/timeorderer_setup_start.bash @@ -48,6 +48,12 @@ cd $EXP_PATH cd ${TO_DIR} ./serv.bash " +screen -S $TO -p 0 -X screen -t log +screen -S $TO -p log -X stuff "ssh ${TO_PC} +explogin $EXP_NAME +cd $EXP_PATH +./drasi/bin/lwrocmon ${TO_PC}:${TO_PORT} --log +" screen -S $TO -X screen -t misc diff --git a/to_template.bash b/to_template.bash index 1e511a8..2c161d0 100644 --- a/to_template.bash +++ b/to_template.bash @@ -1,6 +1,6 @@ #!/bin/bash -source ../to.conf +source ${EXP_PATH}/to.conf HOST=${TO_PC} if [ $(hostname -s) != "$HOST" ] -- GitLab From ad3547f0a5a440e3c201cff918172c238664935a Mon Sep 17 00:00:00 2001 From: A land user who did not set git config --local <land@gsi.de> Date: Thu, 21 Nov 2024 12:05:16 +0100 Subject: [PATCH 3/4] added to.conf example --- to.conf | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 to.conf diff --git a/to.conf b/to.conf new file mode 100644 index 0000000..c1d5fa5 --- /dev/null +++ b/to.conf @@ -0,0 +1,4 @@ +TO_PC=lxlanddaq01 + +TO_DIR=lxlanddaq01 +TO_PORT=9000 -- GitLab From dbd205d63bde5a5753723668d18c9609f4585d8b Mon Sep 17 00:00:00 2001 From: A land user who did not set git config --local <land@gsi.de> Date: Thu, 21 Nov 2024 13:33:37 +0100 Subject: [PATCH 4/4] removed . Now : --- drasi_create_timeorderer.bash | 10 +++++----- timeorderer_setup_start.bash | 4 ++-- to.conf | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drasi_create_timeorderer.bash b/drasi_create_timeorderer.bash index a8a7f4a..06f4bb2 100755 --- a/drasi_create_timeorderer.bash +++ b/drasi_create_timeorderer.bash @@ -6,9 +6,9 @@ cd $EXP_PATH source to.conf #|| { echo not found to.conf ; exit 1 } -mkdir -v ${TO_DIR} +mkdir -v ${TO_PC}:${TO_PORT} -cp -iv scripts/to_template.bash ${TO_DIR}/to.bash -chmod a+x ${TO_DIR}/to.bash -cp -iv scripts/serv.bash ${TO_DIR} -chmod a+x ${TO_DIR}/serv.bash +cp -iv scripts/to_template.bash ${TO_PC}:${TO_PORT}/to.bash +chmod a+x ${TO_PC}:${TO_PORT}/to.bash +cp -iv scripts/serv.bash ${TO_PC}:${TO_PORT} +chmod a+x ${TO_PC}:${TO_PORT}/serv.bash diff --git a/timeorderer_setup_start.bash b/timeorderer_setup_start.bash index 8e10d37..011dceb 100755 --- a/timeorderer_setup_start.bash +++ b/timeorderer_setup_start.bash @@ -37,7 +37,7 @@ screen -S $TO -X screen -t to screen -S $TO -p to -X stuff "ssh ${TO_PC} explogin $EXP_NAME cd $EXP_PATH -cd ${TO_DIR} +cd ${TO_PC}:${TO_PORT} ./to.bash " @@ -45,7 +45,7 @@ screen -S $TO -X screen -t serv screen -S $TO -p serv -X stuff "ssh ${TO_PC} explogin $EXP_NAME cd $EXP_PATH -cd ${TO_DIR} +cd ${TO_PC}:${TO_PORT} ./serv.bash " screen -S $TO -p 0 -X screen -t log diff --git a/to.conf b/to.conf index c1d5fa5..d827709 100644 --- a/to.conf +++ b/to.conf @@ -1,4 +1,2 @@ TO_PC=lxlanddaq01 - -TO_DIR=lxlanddaq01 TO_PORT=9000 -- GitLab