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

Fix calling GpuRays::Destroy more than once #860

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Jun 8, 2023

🦟 Bug fix

Summary

Fixes gz-sensors' INTEGRATION_dvl test with ogre on Harmonic

The test has been failing (crashing) on homebrew CI which runs test with ogre. I was able to reproduce the crash and found that the issue is due to the ogre node being destroyed twice on the rendering side. Added a check to make sure we return from the Destroy function if camera is null (indicates resources have been removed already). The same check exists in the ogre2 version.

To reproduce the test failure in Harmonic workspace:

RENDER_ENGINE_VALUES=ogre ./build/gz-sensors8/bin/INTEGRATION_dvl

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Jun 8, 2023
@codecov
Copy link

codecov bot commented Jun 8, 2023

Codecov Report

Merging #860 (93e7199) into main (5c78bd5) will not change coverage.
The diff coverage is n/a.

❗ Current head 93e7199 differs from pull request most recent head 65c739c. Consider uploading reports for the commit 65c739c to get more accurate results

@@           Coverage Diff           @@
##             main     #860   +/-   ##
=======================================
  Coverage   75.02%   75.02%           
=======================================
  Files         183      183           
  Lines       16311    16311           
=======================================
  Hits        12237    12237           
  Misses       4074     4074           

@iche033 iche033 merged commit 8e223d3 into main Jun 8, 2023
@iche033 iche033 deleted the ogre_gpurays_destroy branch June 8, 2023 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants