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.

Sign up for GitHub

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

Jump to bottom

weaver: bump version to 5.1.0 + debug notebook output #449

Merged
merged 2 commits into from
May 7, 2024
Merged

weaver: bump version to 5.1.0 + debug notebook output #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6021c8
fix weaver failing wps retry on unresolved network + fix weaver wps r…
fmigneault Apr 23, 2024
a4575da
Merge branch 'bump-weaver-5.1.0' into fix-weaver-retry
fmigneault May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@

## Fixes

- Weaver: WPS retry logic on post-compose step.
- Apply `--network birdhouse_default` to the Docker `curl` image to allow HTTP requests to properly resolve
against the running services (WPS bird providers, Weave and Magpie). In some cases, this network would not
be automatically resolved.
- Fix the index used during HTTP request retry to avoid going one step over the intended retry attempts.

- docs: Fix version of `sphinx-mdinclude` to address incompatible `docutils` operation under ReadTheDocs Sphinx build.

- See [docutils 0.21 changes](https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-21-2024-04-09).
Expand Down
4 changes: 2 additions & 2 deletions birdhouse/components/weaver/post-docker-compose-up
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ RANDOM_NUMBER=${RANDOM:-$(tr -dc 0-9 < /dev/urandom 2>/dev/null | head -c 5)}
# To know when a docker run was started in case it hangs.
DOCKER_RUN_TAG="weaver_post_curl_$(date -Isecond | sed 's/:/_/g' | sed 's/+/p/g')_${RANDOM_NUMBER}"
curl_cmd() {
docker run --rm --name "${DOCKER_RUN_TAG}" "${WEAVER_CURL_IMAGE}" "$@"
docker run --network birdhouse_default --rm --name "${DOCKER_RUN_TAG}" "${WEAVER_CURL_IMAGE}" "$@"
}

# pull image if missing to avoid mangling output messages on first call
Expand Down Expand Up @@ -317,7 +317,7 @@ for prov in ${WEAVER_WPS_PROVIDERS}; do
if [ ${ret} -ne 0 ] || [ "${code}" -ne 201 ]; then
printf "\n%s\n" "${WARN}Failed registration of remote WPS provider [${prov}] on [${prov_url}]${retry_msg}."
printf "Error:\n%s\n" "${body}"
if [ ${retry} -gt ${total} ]; then
if [ ${retry} -ge ${total} ]; then
echo "${ERROR}Maximum retry attempts ${total} reached for WPS provider [${prov}]. Aborting."
reset_state
exit 23
Expand Down
Loading