Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
ff2e1d77
Commit
ff2e1d77
authored
4 years ago
by
Jorrit Schaap
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-573
: fixed feedback handling for the weird old and almost obsolete qpid messages
parent
5f6dea60
No related branches found
No related tags found
1 merge request
!343
Resolve TMSS-557 and TMSS-307
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
SAS/TMSS/backend/services/feedback_handling/lib/feedback_handling.py
+6
-3
6 additions, 3 deletions
...ckend/services/feedback_handling/lib/feedback_handling.py
with
6 additions
and
3 deletions
SAS/TMSS/backend/services/feedback_handling/lib/feedback_handling.py
+
6
−
3
View file @
ff2e1d77
...
@@ -76,16 +76,19 @@ class TMSSFeedbackListener:
...
@@ -76,16 +76,19 @@ class TMSSFeedbackListener:
msg
=
fbus
.
get
(
1
)
msg
=
fbus
.
get
(
1
)
if
msg
is
not
None
:
if
msg
is
not
None
:
content
=
msg
.
content
()
logger
.
info
(
"
received feedback from bus=
'
%s
'
%s
"
,
ex
,
tmss_subtask_id
,
content
)
# note: cobalt/rtcp creates feedback and assumes that the observationID has its origin in OTDB.
# note: cobalt/rtcp creates feedback and assumes that the observationID has its origin in OTDB.
# hence, it stores this id in the 'sasid' property of the message.
# hence, it stores this id in the 'sasid' property of the message.
# We know that TMSS sets its subtask_id in the parset in the Observation.ObsID field,
# We know that TMSS sets its subtask_id in the parset in the Observation.ObsID field,
# so we can fetch the TMSS subtask_id from the msg's sasid.
# so we can fetch the TMSS subtask_id from the msg's sasid.
tmss_subtask_id
=
msg
.
sasid
tmss_subtask_id
=
content
.
sasid
logger
.
info
(
"
received feedback from bus=
'
%s
'
for TMSS subtask id=%s payload=%s
"
,
ex
,
tmss_subtask_id
,
msg
.
payload
)
logger
.
info
(
"
feedback
for TMSS subtask id=%s payload=%s
"
,
ex
,
tmss_subtask_id
,
content
.
payload
)
# add contained feedback to TMSS
# add contained feedback to TMSS
self
.
append_feedback_to_tmss_subtask_raw_feedback
(
tmss_subtask_id
,
msg
.
payload
)
self
.
append_feedback_to_tmss_subtask_raw_feedback
(
tmss_subtask_id
,
content
.
payload
)
# try processing it, which will will fail until feedback of the subtask is complete.
# try processing it, which will will fail until feedback of the subtask is complete.
self
.
process_subtask_feedback_and_set_finished
(
tmss_subtask_id
)
self
.
process_subtask_feedback_and_set_finished
(
tmss_subtask_id
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment