From b12113e0f4086102ecd0ac418c90c146375d9012 Mon Sep 17 00:00:00 2001 From: Robert Muenzer Date: Mon, 26 Sep 2022 10:48:48 +0200 Subject: [PATCH 1/3] CCBD path as parameter for sac processing --- scripts/tpc-idc-sac-simple.sh | 8 ++++++-- tasks/tpc-sac-ccdb-populator.yaml | 2 +- workflows/tpc-sac.yaml | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/tpc-idc-sac-simple.sh b/scripts/tpc-idc-sac-simple.sh index c591ff36c..b680346c3 100755 --- a/scripts/tpc-idc-sac-simple.sh +++ b/scripts/tpc-idc-sac-simple.sh @@ -45,7 +45,8 @@ MERGER_C=epn024-ib PORT=47734 nTFs=1000 -ccdb="ccdb-test.cern.ch:8080" +#ccdb="ccdb-test.cern.ch:8080" +ccdb="http://o2-ccdb.internal" export DPL_CONDITION_BACKEND="http://127.0.0.1:8084" export DPL_CONDITION_QUERY_RATE="${GEN_TOPO_EPN_CCDB_QUERY_RATE:--1}" DPL_PROCESSING_CONFIG_KEY_VALUES="NameConf.mCCDBServer=http://127.0.0.1:8084;" @@ -107,7 +108,7 @@ o2-dpl-raw-proxy $ARGS_ALL \ --compression 2 \ | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 \ --configKeyValues "${DPL_PROCESSING_CONFIG_KEY_VALUES};keyval.output_dir=/dev/null" \ - | o2-calibration-ccdb-populator-workflow --ccdb-path ${ccdb} -b \ + | o2-calibration-ccdb-populator-workflow --ccdb-path {{ ccdb_oath }} -b \ | o2-dpl-output-proxy $ARGS_ALL \ --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' \ --dataspec "${OUTSPEC}" \ @@ -149,6 +150,9 @@ sed -i /defaults:/\ a\\\ \\\ "merger_node_c":\ "${MERGER_C}" workflows/${WF_NAME sed -i /defaults:/\ a\\\ \\\ "merger_port":\ "${PORT}" workflows/${WF_NAME_A}.yaml sed -i /defaults:/\ a\\\ \\\ "merger_port":\ "${PORT}" workflows/${WF_NAME_C}.yaml +sed -i /defaults:/\ a\\\ \\\ "ccdb_path":\ "${ccdb}" workflows/${WF_SAC}.yaml + + aside=" it == 'alio2-cr1-flp001'" cside=" it == 'alio2-cr1-flp073'" diff --git a/tasks/tpc-sac-ccdb-populator.yaml b/tasks/tpc-sac-ccdb-populator.yaml index e46e7ed6b..56fad2618 100644 --- a/tasks/tpc-sac-ccdb-populator.yaml +++ b/tasks/tpc-sac-ccdb-populator.yaml @@ -112,7 +112,7 @@ command: - "--workflow-suffix" - "''" - "--ccdb-path" - - "'ccdb-test.cern.ch:8080'" + - "'{{'" - "--sspec-max" - "-1" - "--sspec-min" diff --git a/workflows/tpc-sac.yaml b/workflows/tpc-sac.yaml index 3ae8855cd..5c699028d 100644 --- a/workflows/tpc-sac.yaml +++ b/workflows/tpc-sac.yaml @@ -1,8 +1,9 @@ name: tpc-sac vars: dpl_command: >- - o2-dpl-raw-proxy -b --session default --dataspec 'x:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0' --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://tmp/stf-builder-dpl-pipe-0,transport=shmem,rateLogging=1"' | o2-tpc-sac-processing --severity warning --condition-tf-per-query -1 | o2-tpc-sac-distribute --timeframes 1000 --output-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-tpc-sac-factorize --timeframes 1000 --nthreads-SAC-factorization 4 --input-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' --compression 2 | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-calibration-ccdb-populator-workflow --ccdb-path ccdb-test.cern.ch:8080 -b | o2-dpl-output-proxy -b --session default --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' --dataspec 'xout:TPC/RAWDATA;ddout:FLP/DISTSUBTIMEFRAME/0' --environment DPL_OUTPUT_PROXY_ORDERED=1 + o2-dpl-raw-proxy -b --session default --dataspec 'x:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0' --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://tmp/stf-builder-dpl-pipe-0,transport=shmem,rateLogging=1"' | o2-tpc-sac-processing --severity warning --condition-tf-per-query -1 | o2-tpc-sac-distribute --timeframes 1000 --output-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-tpc-sac-factorize --timeframes 1000 --nthreads-SAC-factorization 4 --input-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' --compression 2 | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-calibration-ccdb-populator-workflow --ccdb-path {{ ccdb_oath }} -b | o2-dpl-output-proxy -b --session default --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' --dataspec 'xout:TPC/RAWDATA;ddout:FLP/DISTSUBTIMEFRAME/0' --environment DPL_OUTPUT_PROXY_ORDERED=1 defaults: + ccdb_path: http://o2-ccdb.internal monitoring_dpl_url: "no-op://" user: "flp" fmq_rate_logging: 0 From e5c734bc11ba41a6694e94ffcebb8a8a1af3bca9 Mon Sep 17 00:00:00 2001 From: Robert Muenzer Date: Mon, 26 Sep 2022 11:03:41 +0200 Subject: [PATCH 2/3] CCBD path as parameter for sac processing --- scripts/tpc-idc-sac-simple.sh | 2 +- workflows/tpc-sac.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tpc-idc-sac-simple.sh b/scripts/tpc-idc-sac-simple.sh index b680346c3..7ccb6c2f2 100755 --- a/scripts/tpc-idc-sac-simple.sh +++ b/scripts/tpc-idc-sac-simple.sh @@ -108,7 +108,7 @@ o2-dpl-raw-proxy $ARGS_ALL \ --compression 2 \ | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 \ --configKeyValues "${DPL_PROCESSING_CONFIG_KEY_VALUES};keyval.output_dir=/dev/null" \ - | o2-calibration-ccdb-populator-workflow --ccdb-path {{ ccdb_oath }} -b \ + | o2-calibration-ccdb-populator-workflow --ccdb-path {{ ccdb_path }} -b \ | o2-dpl-output-proxy $ARGS_ALL \ --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' \ --dataspec "${OUTSPEC}" \ diff --git a/workflows/tpc-sac.yaml b/workflows/tpc-sac.yaml index 5c699028d..e4d94f67a 100644 --- a/workflows/tpc-sac.yaml +++ b/workflows/tpc-sac.yaml @@ -1,7 +1,7 @@ name: tpc-sac vars: dpl_command: >- - o2-dpl-raw-proxy -b --session default --dataspec 'x:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0' --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://tmp/stf-builder-dpl-pipe-0,transport=shmem,rateLogging=1"' | o2-tpc-sac-processing --severity warning --condition-tf-per-query -1 | o2-tpc-sac-distribute --timeframes 1000 --output-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-tpc-sac-factorize --timeframes 1000 --nthreads-SAC-factorization 4 --input-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' --compression 2 | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-calibration-ccdb-populator-workflow --ccdb-path {{ ccdb_oath }} -b | o2-dpl-output-proxy -b --session default --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' --dataspec 'xout:TPC/RAWDATA;ddout:FLP/DISTSUBTIMEFRAME/0' --environment DPL_OUTPUT_PROXY_ORDERED=1 + o2-dpl-raw-proxy -b --session default --dataspec 'x:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0' --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://tmp/stf-builder-dpl-pipe-0,transport=shmem,rateLogging=1"' | o2-tpc-sac-processing --severity warning --condition-tf-per-query -1 | o2-tpc-sac-distribute --timeframes 1000 --output-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-tpc-sac-factorize --timeframes 1000 --nthreads-SAC-factorization 4 --input-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' --compression 2 | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-calibration-ccdb-populator-workflow --ccdb-path {{ ccdb_path }} -b | o2-dpl-output-proxy -b --session default --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' --dataspec 'xout:TPC/RAWDATA;ddout:FLP/DISTSUBTIMEFRAME/0' --environment DPL_OUTPUT_PROXY_ORDERED=1 defaults: ccdb_path: http://o2-ccdb.internal monitoring_dpl_url: "no-op://" From f4a63e8a191e81cf842b737a890fdcb10f02240a Mon Sep 17 00:00:00 2001 From: Robert Muenzer Date: Mon, 26 Sep 2022 11:14:30 +0200 Subject: [PATCH 3/3] CCBD path as parameter for sac processing - correct parameter --- scripts/tpc-idc-sac-simple.sh | 2 +- tasks/tpc-sac-ccdb-populator.yaml | 2 +- workflows/tpc-sac.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/tpc-idc-sac-simple.sh b/scripts/tpc-idc-sac-simple.sh index 7ccb6c2f2..b30d2b60b 100755 --- a/scripts/tpc-idc-sac-simple.sh +++ b/scripts/tpc-idc-sac-simple.sh @@ -108,7 +108,7 @@ o2-dpl-raw-proxy $ARGS_ALL \ --compression 2 \ | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 \ --configKeyValues "${DPL_PROCESSING_CONFIG_KEY_VALUES};keyval.output_dir=/dev/null" \ - | o2-calibration-ccdb-populator-workflow --ccdb-path {{ ccdb_path }} -b \ + | o2-calibration-ccdb-populator-workflow --ccdb-path "{{ ccdb_path }}" -b \ | o2-dpl-output-proxy $ARGS_ALL \ --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' \ --dataspec "${OUTSPEC}" \ diff --git a/tasks/tpc-sac-ccdb-populator.yaml b/tasks/tpc-sac-ccdb-populator.yaml index 56fad2618..18fa76c4c 100644 --- a/tasks/tpc-sac-ccdb-populator.yaml +++ b/tasks/tpc-sac-ccdb-populator.yaml @@ -112,7 +112,7 @@ command: - "--workflow-suffix" - "''" - "--ccdb-path" - - "'{{'" + - "'{{ ccdb_path }}'" - "--sspec-max" - "-1" - "--sspec-min" diff --git a/workflows/tpc-sac.yaml b/workflows/tpc-sac.yaml index e4d94f67a..94fd54ae1 100644 --- a/workflows/tpc-sac.yaml +++ b/workflows/tpc-sac.yaml @@ -1,7 +1,7 @@ name: tpc-sac vars: dpl_command: >- - o2-dpl-raw-proxy -b --session default --dataspec 'x:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0' --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://tmp/stf-builder-dpl-pipe-0,transport=shmem,rateLogging=1"' | o2-tpc-sac-processing --severity warning --condition-tf-per-query -1 | o2-tpc-sac-distribute --timeframes 1000 --output-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-tpc-sac-factorize --timeframes 1000 --nthreads-SAC-factorization 4 --input-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' --compression 2 | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-calibration-ccdb-populator-workflow --ccdb-path {{ ccdb_path }} -b | o2-dpl-output-proxy -b --session default --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' --dataspec 'xout:TPC/RAWDATA;ddout:FLP/DISTSUBTIMEFRAME/0' --environment DPL_OUTPUT_PROXY_ORDERED=1 + o2-dpl-raw-proxy -b --session default --dataspec 'x:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0' --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://tmp/stf-builder-dpl-pipe-0,transport=shmem,rateLogging=1"' | o2-tpc-sac-processing --severity warning --condition-tf-per-query -1 | o2-tpc-sac-distribute --timeframes 1000 --output-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-tpc-sac-factorize --timeframes 1000 --nthreads-SAC-factorization 4 --input-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' --compression 2 | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-calibration-ccdb-populator-workflow --ccdb-path '{{ ccdb_path }}' -b | o2-dpl-output-proxy -b --session default --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' --dataspec 'xout:TPC/RAWDATA;ddout:FLP/DISTSUBTIMEFRAME/0' --environment DPL_OUTPUT_PROXY_ORDERED=1 defaults: ccdb_path: http://o2-ccdb.internal monitoring_dpl_url: "no-op://"