From 5160e6416ea1d8962ef3e9700bd0310d36338699 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Mon, 23 Jun 2025 11:30:31 +0200 Subject: [PATCH 1/5] changes for the new readout path --- workflows/readout-dataflow.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workflows/readout-dataflow.yaml b/workflows/readout-dataflow.yaml index d640936da..44d8e5816 100755 --- a/workflows/readout-dataflow.yaml +++ b/workflows/readout-dataflow.yaml @@ -1358,8 +1358,8 @@ roles: enabled: "{{ ctp_readout_enabled == 'true' }}" vars: detector: "{{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}" - readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/readout-standalone-' + ctp_readout_host)}}" - readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'any', 'readout-stfb-' + ctp_readout_host)}}" + readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/standalone/readout-standalone-' + ctp_readout_host)}}" + readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'stfb', 'readout-stfb-' + ctp_readout_host)}}" dd_discovery_ib_hostname: "{{ ctp_readout_host }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to ctp_dpl_workflow dpl_workflow: "{{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}" @@ -1490,8 +1490,8 @@ roles: var: it vars: detector: "{{ inventory.DetectorForHost( it ) }}" - readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/readout-standalone-' + it)}}" - readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'any', 'readout-stfb-' + it)}}" + readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/standalone/readout-standalone-' + it)}}" + readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'stfb', 'readout-stfb-' + it)}}" dd_discovery_ib_hostname: "{{ it }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to _dpl_workflow if such an override exists dpl_workflow: "{{ util.PrefixedOverride( 'dpl_workflow', strings.ToLower( inventory.DetectorForHost( it ) ) ) }}" From cedd34b4eabcd215eb5b56da81f744f9469acd4a Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Mon, 23 Jun 2025 13:38:36 +0200 Subject: [PATCH 2/5] changes to move SYNTH readout configs in CONSUL --- workflows/readout-dataflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflows/readout-dataflow.yaml b/workflows/readout-dataflow.yaml index 44d8e5816..085f2c14b 100755 --- a/workflows/readout-dataflow.yaml +++ b/workflows/readout-dataflow.yaml @@ -1359,7 +1359,7 @@ roles: vars: detector: "{{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}" readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/standalone/readout-standalone-' + ctp_readout_host)}}" - readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'stfb', 'readout-stfb-' + ctp_readout_host)}}" + readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder, 'readout-stfb-' + ctp_readout_host)}}" dd_discovery_ib_hostname: "{{ ctp_readout_host }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to ctp_dpl_workflow dpl_workflow: "{{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}" @@ -1491,7 +1491,7 @@ roles: vars: detector: "{{ inventory.DetectorForHost( it ) }}" readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/standalone/readout-standalone-' + it)}}" - readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'stfb', 'readout-stfb-' + it)}}" + readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder, 'readout-stfb-' + it)}}" dd_discovery_ib_hostname: "{{ it }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to _dpl_workflow if such an override exists dpl_workflow: "{{ util.PrefixedOverride( 'dpl_workflow', strings.ToLower( inventory.DetectorForHost( it ) ) ) }}" From 0295c6d0d0e09b1fd58e82be3633f3f2c9192c9f Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Wed, 9 Jul 2025 14:32:18 +0200 Subject: [PATCH 3/5] modification in the readout config path --- workflows/readout-dataflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflows/readout-dataflow.yaml b/workflows/readout-dataflow.yaml index a35c2ecf8..7ef7b62c3 100755 --- a/workflows/readout-dataflow.yaml +++ b/workflows/readout-dataflow.yaml @@ -1359,7 +1359,7 @@ roles: enabled: "{{ ctp_readout_enabled == 'true' }}" vars: detector: "{{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}" - readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/standalone/readout-standalone-' + ctp_readout_host)}}" + readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout', run_type, 'standalone', 'readout-standalone-' + ctp_readout_host)}}" readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder, 'readout-stfb-' + ctp_readout_host)}}" dd_discovery_ib_hostname: "{{ ctp_readout_host }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to ctp_dpl_workflow @@ -1491,7 +1491,7 @@ roles: var: it vars: detector: "{{ inventory.DetectorForHost( it ) }}" - readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/standalone/readout-standalone-' + it)}}" + readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout', run_type, 'standalone', 'readout-standalone-' + it)}}" readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder, 'readout-stfb-' + it)}}" dd_discovery_ib_hostname: "{{ it }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to _dpl_workflow if such an override exists From 32e4a572d0f42a437e921074f8a2e15f87c0032e Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Wed, 9 Jul 2025 14:44:57 +0200 Subject: [PATCH 4/5] fixed standalone path --- workflows/readout-dataflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflows/readout-dataflow.yaml b/workflows/readout-dataflow.yaml index 7ef7b62c3..a6b938011 100755 --- a/workflows/readout-dataflow.yaml +++ b/workflows/readout-dataflow.yaml @@ -1359,7 +1359,7 @@ roles: enabled: "{{ ctp_readout_enabled == 'true' }}" vars: detector: "{{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}" - readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout', run_type, 'standalone', 'readout-standalone-' + ctp_readout_host)}}" + readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'standalone', 'readout-standalone-' + ctp_readout_host)}}" readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder, 'readout-stfb-' + ctp_readout_host)}}" dd_discovery_ib_hostname: "{{ ctp_readout_host }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to ctp_dpl_workflow @@ -1491,7 +1491,7 @@ roles: var: it vars: detector: "{{ inventory.DetectorForHost( it ) }}" - readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout', run_type, 'standalone', 'readout-standalone-' + it)}}" + readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'standalone', 'readout-standalone-' + it)}}" readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder, 'readout-stfb-' + it)}}" dd_discovery_ib_hostname: "{{ it }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to _dpl_workflow if such an override exists From 98645be9497dccc5c0c5d1ec2e4a57f1d8fa7f35 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Wed, 9 Jul 2025 16:19:38 +0200 Subject: [PATCH 5/5] added readout_folder default value --- workflows/readout-dataflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/workflows/readout-dataflow.yaml b/workflows/readout-dataflow.yaml index a6b938011..26a35374a 100755 --- a/workflows/readout-dataflow.yaml +++ b/workflows/readout-dataflow.yaml @@ -1346,6 +1346,7 @@ defaults: qc_remote_jit_enabled: "true" user: flp extra_env_vars: "" + readout_folder: "any" vars: auto_stop_enabled: "{{ !strings.IsFalsy(auto_stop_timeout) }}" ddsched_enabled: "{{ epn_enabled == 'true' && dd_enabled == 'true' }}"