Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce IOManager configuration object #130

Merged
merged 4 commits into from
Oct 14, 2024
Merged

Introduce IOManager configuration object #130

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddddb41
Add ConnectivityService configuration objects
eflumerf Oct 11, 2024
8046461
Format ccm.data.xml
eflumerf Oct 11, 2024
b62741c
Update log file exclusions for regression tests.
eflumerf Oct 11, 2024
05a208b
Link ConnectivityService configurations to Session objects. Remove un…
eflumerf Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion config/daqsystemtest/ccm.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

<oks-data>

<info name="" type="" num-of-items="25" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T110859" last-modified-by="glehmann" last-modified-on="np04-srv-024.cern.ch" last-modification-time="20240923T065642"/>
<info name="" type="" num-of-items="28" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T110859" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20241011T131354"/>

<include>
<file path="schema/confmodel/dunedaq.schema.xml"/>
Expand Down Expand Up @@ -93,6 +93,18 @@
<rel name="opmon_conf" class="OpMonConf" id="slow-all-monitoring"/>
</obj>

<obj class="ConnectivityService" id="ehn1-connectivity-service-config">
<attr name="interval_ms" type="u32" val="2000"/>
<attr name="host" type="string" val="np04-srv-017"/>
<rel name="service" class="Service" id="ehn1-connectivity-service"/>
</obj>

<obj class="ConnectivityService" id="local-connectivity-service-config">
<attr name="interval_ms" type="u32" val="2000"/>
<attr name="host" type="string" val="localhost"/>
<rel name="service" class="Service" id="local-connectivity-service"/>
</obj>

<obj class="OpMonConf" id="fast-all-monitoring">
<attr name="level" type="u32" val="4294967295"/>
<attr name="interval_s" type="u32" val="2"/>
Expand Down Expand Up @@ -123,6 +135,11 @@
<rel name="fsm" class="FSMconfiguration" id="fsmConf-test"/>
</obj>

<obj class="Service" id="ehn1-connectivity-service">
<attr name="protocol" type="string" val="http"/>
<attr name="port" type="u16" val="30005"/>
</obj>

<obj class="Service" id="local-connectivity-service">
<attr name="protocol" type="string" val="http"/>
<attr name="port" type="u16" val="5000"/>
Expand Down
6 changes: 4 additions & 2 deletions integtest/3ru_1df_multirun_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@
}
ignored_logfile_problems = {
"-controller": [
"Propagating take_control to children",
"There is no broadcasting service",
'ERROR.*Broadcast:.*Propagating take_control to children',
'ERROR.*Broadcast:.*Propagating describe to children',
'WARNING.*Broadcast:.*There is no broadcasting service!',
"Could not understand the BroadcastHandler technology you want to use",
"Worker with pid \\d+ was terminated due to signal 1",
"Connection '.*' not found on the application registry",
],
"local-connection-server": [
"errorlog: -",
Expand Down
6 changes: 4 additions & 2 deletions integtest/3ru_3df_multirun_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@
}
ignored_logfile_problems = {
"-controller": [
"Propagating take_control to children",
"There is no broadcasting service",
'ERROR.*Broadcast:.*Propagating take_control to children',
'ERROR.*Broadcast:.*Propagating describe to children',
'WARNING.*Broadcast:.*There is no broadcasting service!',
"Could not understand the BroadcastHandler technology you want to use",
"Worker with pid \\d+ was terminated due to signal 1",
"Connection '.*' not found on the application registry",
],
"local-connection-server": [
"errorlog: -",
Expand Down
8 changes: 5 additions & 3 deletions integtest/example_system_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@
}
ignored_logfile_problems = {
"-controller": [
'ERROR "Broadcast": Propagating take_control to children',
'WARNING "Broadcast": There is no broadcasting service!',
'ERROR.*Broadcast:.*Propagating take_control to children',
'ERROR.*Broadcast:.*Propagating describe to children',
'WARNING.*Broadcast:.*There is no broadcasting service!',
"Worker with pid \\d+ was terminated due to signal",
'WARNING "BroadcastHandler": Could not understand the BroadcastHandler technology you want to use',
"Could not understand the BroadcastHandler technology you want to use",
"Connection '.*' not found on the application registry",
],
"local-connection-server": [
"errorlog: -",
Expand Down
6 changes: 4 additions & 2 deletions integtest/long_window_readout_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@
}
ignored_logfile_problems = {
"-controller": [
"Propagating take_control to children",
"There is no broadcasting service",
'ERROR.*Broadcast:.*Propagating take_control to children',
'ERROR.*Broadcast:.*Propagating describe to children',
'WARNING.*Broadcast:.*There is no broadcasting service!',
"Could not understand the BroadcastHandler technology you want to use",
"Worker with pid \\d+ was terminated due to signal 1",
"Connection '.*' not found on the application registry",
],
"local-connection-server": [
"errorlog: -",
Expand Down
8 changes: 5 additions & 3 deletions integtest/minimal_system_quick_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@
}
ignored_logfile_problems = {
"-controller": [
'ERROR "Broadcast": Propagating take_control to children',
'WARNING "Broadcast": There is no broadcasting service!',
'ERROR.*Broadcast:.*Propagating take_control to children',
'ERROR.*Broadcast:.*Propagating describe to children',
'WARNING.*Broadcast:.*There is no broadcasting service!',
"Worker with pid \\d+ was terminated due to signal",
'WARNING "BroadcastHandler": Could not understand the BroadcastHandler technology you want to use',
"Could not understand the BroadcastHandler technology you want to use",
"Connection '.*' not found on the application registry",
],
"local-connection-server": [
"errorlog: -",
Expand Down
6 changes: 4 additions & 2 deletions integtest/readout_type_scan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,12 @@
}
ignored_logfile_problems = {
"-controller": [
"Propagating take_control to children",
"There is no broadcasting service",
'ERROR.*Broadcast:.*Propagating take_control to children',
'ERROR.*Broadcast:.*Propagating describe to children',
'WARNING.*Broadcast:.*There is no broadcasting service!',
"Could not understand the BroadcastHandler technology you want to use",
"Worker with pid \\d+ was terminated due to signal 1",
"Connection '.*' not found on the application registry",
],
"local-connection-server": [
"errorlog: -",
Expand Down
6 changes: 4 additions & 2 deletions integtest/small_footprint_quick_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@
"Searching for connections matching uid_regex<errored_frames_q> and data_type Unknown"
],
"-controller": [
"Propagating take_control to children",
"There is no broadcasting service",
'ERROR.*Broadcast:.*Propagating take_control to children',
'ERROR.*Broadcast:.*Propagating describe to children',
'WARNING.*Broadcast:.*There is no broadcasting service!',
"Could not understand the BroadcastHandler technology you want to use",
"Worker with pid \\d+ was terminated due to signal 1",
"Connection '.*' not found on the application registry",
],
"local-connection-server": [
"errorlog: -",
Expand Down
6 changes: 4 additions & 2 deletions integtest/tpstream_writing_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@
}
ignored_logfile_problems = {
"-controller": [
"Propagating take_control to children",
"There is no broadcasting service",
'ERROR.*Broadcast:.*Propagating take_control to children',
'ERROR.*Broadcast:.*Propagating describe to children',
'WARNING.*Broadcast:.*There is no broadcasting service!',
"Could not understand the BroadcastHandler technology you want to use",
"Worker with pid \\d+ was terminated due to signal 1",
"Connection '.*' not found on the application registry",
],
"local-connection-server": [
"errorlog: -",
Expand Down
Loading