Skip to content
Snippets Groups Projects

Resolve SW-816

Merged Resolve SW-816
SW-816 into LOFAR-Release-4_0
2 unresolved threads
Merged Jorrit Schaap requested to merge SW-816 into LOFAR-Release-4_0
2 unresolved threads

Closes SW-816

Merge request reports

Approval is optional

Merged by Jorrit SchaapJorrit Schaap 5 years ago (Sep 19, 2019 12:36pm UTC)

Merge details

  • Changes merged into LOFAR-Release-4_0 with 4462b56f.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
SAS/ResourceAssignment/Common/lib/specification.py
166 168 :param input_dict: Serialized version of a Specification and any predecessors.
167 169 """
168 170 self.otdb_id = input_dict["otdb_id"]
169 self.mom_id = input_dict["mom_id"]
171 self.mom_id = input_dict.get("mom_id")
  • Auke Klazema
    Auke Klazema @klazema ·
    Contributor

    Are we getting key errors? Now we get None or a different default. Is this what we want / can we cope with it? And why did you introduced it, what was the need for it?

  • Jorrit Schaap
    Jorrit Schaap @schaap ·
    Author Maintainer

    We got key errors in several tests now that I replaced some mocks by actual class instances. In practice code can/should be able to handle this, cause we can handle mom_id==None for otdb-only-jobs.

  • Please register or sign in to reply
  • Auke Klazema
    Auke Klazema @klazema ·
    Contributor

    Overall code looks good but it was a big diff because of the radbrpc -> radb and some other refactorings. I will quickly run a build with tests.

  • Jorrit Schaap added 2 commits

    added 2 commits

    Compare with previous version

  • Jorrit Schaap
    Jorrit Schaap @schaap ·
    Author Maintainer

    Your build will probably fail. These two commits fix it again.

  • Jorrit Schaap
    Jorrit Schaap @schaap ·
    Author Maintainer

    I started a similar build: https://support.astron.nl/jenkins/view/LOFAR%20Subsystems/view/Subsystems%20builds/job/Subsystems_CentOS7/2933/console

  • Jorrit Schaap added 6 commits

    added 6 commits

    Compare with previous version

    Toggle commit list
  • Jorrit Schaap added 3 commits

    added 3 commits

    Compare with previous version

  • Jorrit Schaap
    Jorrit Schaap @schaap ·
    Author Maintainer

    I've build RA_Services and LTAIngest and ran all tests: https://support.astron.nl/jenkins/view/LOFAR%20Subsystems/view/Subsystems%20builds/job/Subsystems_CentOS7/2966/ https://support.astron.nl/jenkins/view/LOFAR%20Subsystems/view/Subsystems%20builds/job/Subsystems_CentOS7/2967/

    Two green lights! I'll deploy RA_Services on the test system and:

    • schedule some observations/pipelines
    • submit a trigger

    Upon success, I'll merge.

  • Jorrit Schaap
    Jorrit Schaap @schaap ·
    Author Maintainer

    deployed RA_services on test scu199: https://support.astron.nl/jenkins/view/LOFAR%20Install/job/Systemwide%20LOFAR%20Deployment/235/console

  • Jorrit Schaap added 3 commits

    added 3 commits

    Compare with previous version

  • Jorrit Schaap
    Jorrit Schaap @schaap ·
    Author Maintainer

    tested it on the test system, found some minor issue which were fixed in the commits above.

  • Jorrit Schaap merged

    merged

  • Jorrit Schaap mentioned in commit 4462b56f

    mentioned in commit 4462b56f

  • Auke Klazema
    Auke Klazema @klazema started a thread on the diff
    • MAC/Services/src/ObservationControl2.py
    36 36 class ObservationControlHandler(ServiceMessageHandler):
    37 37 def __init__(self):
    38 38 super(ObservationControlHandler, self).__init__()
    39 self.register_service_method("AbortObservation", self.abort_observation)
    Please register or sign in to reply