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.

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

There can be more than one network location for an instance ID #11542

Merged

Conversation

bjester
Copy link
Member

@bjester bjester commented Nov 17, 2023

Summary

  • Fixes issue where filtering by instance_id could encounter an error if there are multiple NetworkLocations with the same ID, which I forgot about when I wrote the original code

References

In logs from @marcellamaki

ERROR 2023-11-17 12:01:17,019 kolibri.core.content.utils.content_request get() returned more than one NetworkLocation -- it returned 2!
Traceback (most recent call last):
  File "/Users/marcellamaki/Documents/learning-equality/kolibri/kolibri/core/content/utils/content_request.py", line 769, in process_download_request
    for peer in chain(*peer_sets):
  File "/Users/marcellamaki/Documents/learning-equality/kolibri/kolibri/core/content/utils/content_request.py", line 286, in __iter__
    peer = self._get_and_validate_peer(instance_id)
  File "/Users/marcellamaki/Documents/learning-equality/kolibri/kolibri/core/content/utils/content_request.py", line 250, in _get_and_validate_peer
    peer = NetworkLocation.objects.get(
  File "/Users/marcellamaki/.pyenv/versions/3.9.9/envs/kolibri-develop/lib/python3.9/site-packages/django/db/models/manager.py", line 85, in manager_method
    return getattr(self.get_queryset(), name)(*args, **kwargs)
  File "/Users/marcellamaki/.pyenv/versions/3.9.9/envs/kolibri-develop/lib/python3.9/site-packages/django/db/models/query.py", line 382, in get
    raise self.model.MultipleObjectsReturned(
kolibri.core.discovery.models.MultipleObjectsReturned: get() returned more than one NetworkLocation -- it returned 2!

Reviewer guidance

I wrote a regression test for it, which failed, then fixed the issue and the test passed, as well as all others.


Testing checklist

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

PR process

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Reviewer checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@bjester bjester added the TODO: needs review Waiting for review label Nov 17, 2023
@github-actions github-actions bot added the DEV: backend Python, databases, networking, filesystem... label Nov 17, 2023
@bjester bjester merged commit 6986711 into learningequality:release-v0.16.x Nov 17, 2023
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DEV: backend Python, databases, networking, filesystem... SIZE: small TODO: needs review Waiting for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants