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

Return absolute path when finding a resource #1741

Merged
merged 2 commits into from
Sep 28, 2022

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Sep 27, 2022

Signed-off-by: Nate Koenig [email protected]

🦟 Bug fix

Summary

The /gazebo/resource_paths/resolve service would return a relative path to the gazebo server process. This is a problem when the requester is not executed at the same path as the gazebo server.

This fixes the issue by returning an absolute path.

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.

@mjcarroll
Copy link
Contributor

I believe I missed the original context for the resource service. Is the intention that service will always be executed from the same machine as the running gazebo instance?

@mabelzhang
Copy link
Contributor

The compiler errors about CubemapUri - do these need a sdformat release?

@mjcarroll
Copy link
Contributor

mjcarroll commented Sep 27, 2022

The compiler errors about CubemapUri - do these need a sdformat release?

It needs this: gazebosim/gz-msgs#306 Wrong see below

@nkoenig
Copy link
Contributor Author

nkoenig commented Sep 27, 2022

It acutally need sdf12.6 release: gazebosim/sdformat#1174

@mabelzhang mabelzhang added the needs upstream release Blocked by a release of an upstream library label Sep 27, 2022
@nkoenig
Copy link
Contributor Author

nkoenig commented Sep 27, 2022

@mabelzhang feel free to approve the sdformat 12.6 release PR so that I can merge and kick off the release.

@mabelzhang
Copy link
Contributor

Done!

Base automatically changed from fortress-sky-cubemap-header to ign-gazebo6 September 28, 2022 15:50
@nkoenig nkoenig merged commit aff9249 into ign-gazebo6 Sep 28, 2022
@nkoenig nkoenig deleted the resource-finder-abs-path branch September 28, 2022 15:50
nkoenig added a commit that referenced this pull request Nov 2, 2022
* Add topic parameter to thrust plugin (#1681)

* Add topic parameter.

Signed-off-by: Carlos Agüero <[email protected]>

* 🎈 6.12.0: bumped minor and updated changelog (#1682)

* bumped minor and updated changelog

Signed-off-by: Dharini Dutia <[email protected]>

* fixed changelog as per feedback and updated migration guide

Signed-off-by: Dharini Dutia <[email protected]>

Signed-off-by: Dharini Dutia <[email protected]>

* Fix reference link in ackermann steering (#1683)

Signed-off-by: Kenji Brameld <[email protected]>

* Fix installation instructions on Ubuntu 22.04 (#1686)

Signed-off-by: Silvio Traversaro <[email protected]>

* Add a service to trigger functionality (#1611)

* initial commit to allow plugin to call a service

Signed-off-by: Liam Han <[email protected]>

* adding tutorial and modifying the world sdf

Signed-off-by: Liam Han <[email protected]>

* added test for single input and single service output

Signed-off-by: Liam Han <[email protected]>

* added test for single input and multiple service output

Signed-off-by: Liam Han <[email protected]>

* added test for invalid matching service name => timeout

Signed-off-by: Liam Han <[email protected]>

* modified variables the camelCase

Signed-off-by: Liam Han <[email protected]>

* fixed typo, indentation, grammar, lines that exceeded 80 char

Signed-off-by: Liam Han <[email protected]>

* fixing ubuntu bionic ci issue

Signed-off-by: Liam Han <[email protected]>

* silly syntax mistake on expect_eq

Signed-off-by: Liam Han <[email protected]>

* added three more test cases that addesses incorrect response type, incorrect request type and false result

Signed-off-by: Liam Han <[email protected]>

* WIP: major restructuring and currently working. Requires more cleanup and test

Signed-off-by: Liam Han <[email protected]>

* WIP: fixed preprocessor define bug

Signed-off-by: Liam Han <[email protected]>

* WIP: working but extremely convoluted

Signed-off-by: Liam Han <[email protected]>

* WIP major modification but a lot of errors and tests failed

Signed-off-by: Liam Han <[email protected]>

* stable version: had to revert back to previous work. all tests passed

Signed-off-by: Liam Han <[email protected]>

* modified to use blocking Request method as well as reduce a service worker thread to just one thread with the publisher. all tests passed

Signed-off-by: Liam Han <[email protected]>

* stable version: had to revert back to previous work. all tests passed

Signed-off-by: Liam Han <[email protected]>

* successfully reverted and tested

Signed-off-by: Liam Han <[email protected]>

* fixing PR suggestions

Signed-off-by: Liam Han <[email protected]>

* changed string with 'serv' to 'srv' and included <mutex> to the header

Signed-off-by: Liam Han <[email protected]>

* fixed indentation and removed rep.set_data since it's unused on the client service

Signed-off-by: Liam Han <[email protected]>

* getting rid of the id

Signed-off-by: Liam Han <[email protected]>

* fixed race condition resulting seldom test failure

Signed-off-by: Liam Han <[email protected]>

* changed from triggerSrv to serviceCount. This compensates for the two threads running at different rate

Signed-off-by: Liam Han <[email protected]>

* braces indentation

Signed-off-by: Mabel Zhang <[email protected]>

* addressing gnu c compiler (gcc) warnings

Signed-off-by: Liam Han <[email protected]>

Signed-off-by: Liam Han <[email protected]>
Signed-off-by: Mabel Zhang <[email protected]>
Co-authored-by: Mabel Zhang <[email protected]>

* Fix loading render engine plugins in GUI  (#1694)

Signed-off-by: Ian Chen <[email protected]>

* Enable inherited model topic name. (#1689)

Allows for inheriting model name for robotNamespace when SDF element is not set and provides a debug message showing the topics it subscribes to.

Signed-off-by: Benjamin Perseghetti <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Add ResourceSpawner example file (#1701)

Add an example file for the ResourceSpawner plugin. I'm using this to link from https://github.com/gazebosim/docs/blob/master/garden/Model_insertion_fuel.md. To improve gazebosim/garden-tutorial-party#1991.

Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>

* Update triggered_publisher.sdf (#1737)

found a silly typo that was pushed back in PR (#1611)

* Adds sky cubemap URI to the sky.proto's header (#1739)

* Adds sky cubemap URI to the sky.proto's header

Signed-off-by: Nate Koenig <[email protected]>

* require sdf 12.6

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Return absolute path when finding a resource (#1741)

* Adds sky cubemap URI to the sky.proto's header

Signed-off-by: Nate Koenig <[email protected]>

* Return absolute path when finding a resource

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Restore Add System GUI plugin (#1685)

* cherry pick aef3020

Signed-off-by: Ian Chen <[email protected]>

* Adding thrust coefficient calculation (#1652)

* adding thrust coefficient calculation

Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* Update src/systems/thruster/Thruster.hh

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>

* thrust coefficient test and behavior updates

Signed-off-by: Marco A. Gutierrez <[email protected]>

* making float comparision more robust

Signed-off-by: Marco A. Gutierrez <[email protected]>

* fix float comparision and lint

Signed-off-by: Marco A. Gutierrez <[email protected]>

Signed-off-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>

* Enable/Disable individual hydrodynamic components. (#1692)

This commit enables and disables individual components of the hydrodynamics. This is often useful for debugging odd behaviours of a hydrodynamic model.

* Fortress: Removed warnings (#1754)

* Fortress: Removed warnings

* Removed unused speedlimit file (#1761)

Signed-off-by: ahcorde <[email protected]>

* Enable use of ign gazebo -s on Windows (take two) (#1764)

* Enable use of ign gazebo -s on Windows

Signed-off-by: Silvio <[email protected]>

* Update src/CMakeLists.txt

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Silvio <[email protected]>

* Fix cmdmodel6.rb and cmdgazebo6.rb contining the same code

Signed-off-by: Silvio <[email protected]>

Signed-off-by: Silvio <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>

* Script and tutorial for generating procedural datasets with Blender (#1412)

Signed-off-by: Andrej Orsula <[email protected]>

* Fix scene_broadcaster_system test (#1766)

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Lint

Signed-off-by: Michael Carroll <[email protected]>

* Clean build and update test

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Dharini Dutia <[email protected]>
Signed-off-by: Kenji Brameld <[email protected]>
Signed-off-by: Silvio Traversaro <[email protected]>
Signed-off-by: Liam Han <[email protected]>
Signed-off-by: Mabel Zhang <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Benjamin Perseghetti <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Silvio <[email protected]>
Signed-off-by: Andrej Orsula <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Carlos Agüero <[email protected]>
Co-authored-by: Dharini Dutia <[email protected]>
Co-authored-by: Kenji Brameld <[email protected]>
Co-authored-by: Silvio Traversaro <[email protected]>
Co-authored-by: Liam Han <[email protected]>
Co-authored-by: Mabel Zhang <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Benjamin Perseghetti <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Andrej Orsula <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs upstream release Blocked by a release of an upstream library
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants