From 2b7d8d9f1b2fa5881a08055550fabcd7f4909b16 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 27 Oct 2021 22:36:30 -0400 Subject: [PATCH 1/5] finch, raven, flyingpigeon: output under wps_output under their respective bird name --- birdhouse/config/finch/wps.cfg.template | 2 +- birdhouse/config/flyingpigeon/wps.cfg.template | 2 +- birdhouse/config/raven/wps.cfg.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/birdhouse/config/finch/wps.cfg.template b/birdhouse/config/finch/wps.cfg.template index a505a60c0..fcad840b6 100644 --- a/birdhouse/config/finch/wps.cfg.template +++ b/birdhouse/config/finch/wps.cfg.template @@ -1,6 +1,6 @@ [server] outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs -outputpath = /data/wpsoutputs +outputpath = /data/wpsoutputs/finch # default 3mb, fix "Broken pipe" between the proxy and the wps service maxrequestsize = 400mb diff --git a/birdhouse/config/flyingpigeon/wps.cfg.template b/birdhouse/config/flyingpigeon/wps.cfg.template index f2ce1c95d..a84922c29 100644 --- a/birdhouse/config/flyingpigeon/wps.cfg.template +++ b/birdhouse/config/flyingpigeon/wps.cfg.template @@ -1,6 +1,6 @@ [server] outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs -outputpath = /data/wpsoutputs +outputpath = /data/wpsoutputs/flyingpigeon maxsingleinputsize = 2097152000.0 [logging] diff --git a/birdhouse/config/raven/wps.cfg.template b/birdhouse/config/raven/wps.cfg.template index 982f1b962..9a1825bc9 100644 --- a/birdhouse/config/raven/wps.cfg.template +++ b/birdhouse/config/raven/wps.cfg.template @@ -1,6 +1,6 @@ [server] outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs -outputpath = /data/wpsoutputs +outputpath = /data/wpsoutputs/raven # default 3mb, fix "Broken pipe" between the proxy and the wps service maxrequestsize = 100mb From 073ba026ecb2313cfeb858ac974ac8cc70937c03 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 27 Oct 2021 22:49:32 -0400 Subject: [PATCH 2/5] finch, raven, flyingpigeon: create output dir under wps_output Fix this kind of error: ``` [2021-10-28 02:39:05 +0000] [1] [INFO] Starting gunicorn 20.1.0 [2021-10-28 02:39:05 +0000] [1] [INFO] Listening at: http://0.0.0.0:5000 (1) [2021-10-28 02:39:05 +0000] [1] [INFO] Using worker: sync [2021-10-28 02:39:05 +0000] [7] [INFO] Booting worker with pid: 7 server->outputpath configuration value /data/wpsoutputs/finch is not directory ``` --- birdhouse/pavics-compose.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/birdhouse/pavics-compose.sh b/birdhouse/pavics-compose.sh index 7d0916740..5bc40dc92 100755 --- a/birdhouse/pavics-compose.sh +++ b/birdhouse/pavics-compose.sh @@ -202,6 +202,11 @@ do docker exec ${postgres_id} /postgres-setup.sh fi + # because server.outputpath in wps.cfg do not create the dir + for bird in finch flyingpigeon raven; do + docker exec $bird mkdir -p /data/wpsoutputs/$bird + done + for adir in ${EXTRA_CONF_DIRS}; do COMPONENT_POST_COMPOSE_UP="$adir/post-docker-compose-up" if [ -x "$COMPONENT_POST_COMPOSE_UP" ]; then From 88cc8ee1c2c4f8240c02353dcce611101dd60837 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 27 Oct 2021 23:03:45 -0400 Subject: [PATCH 3/5] finch, raven, flyingpigeon: match outputurl with outputpath Otherwise, on disk the output files will be at the proper location but the advertized download url will be wrong. Wrong output url returned (missing "finch" after "/wpsoutputs/"): ``` print("Process status: ", resp.status) urls = resp.get() print("Link to process output: ", urls.output_netcdf) Process status: ProcessSucceeded Link to process output: https://lvupavics.ouranos.ca/wpsoutputs/fa9a7d15-379a-11ec-988f-d38848f08134/frost-days_SRES-A2-experiment_20460101-20650101.nc ``` --- birdhouse/config/finch/wps.cfg.template | 2 +- birdhouse/config/flyingpigeon/wps.cfg.template | 2 +- birdhouse/config/raven/wps.cfg.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/birdhouse/config/finch/wps.cfg.template b/birdhouse/config/finch/wps.cfg.template index fcad840b6..e61c8af86 100644 --- a/birdhouse/config/finch/wps.cfg.template +++ b/birdhouse/config/finch/wps.cfg.template @@ -1,5 +1,5 @@ [server] -outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs +outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs/finch outputpath = /data/wpsoutputs/finch # default 3mb, fix "Broken pipe" between the proxy and the wps service diff --git a/birdhouse/config/flyingpigeon/wps.cfg.template b/birdhouse/config/flyingpigeon/wps.cfg.template index a84922c29..b239b21e4 100644 --- a/birdhouse/config/flyingpigeon/wps.cfg.template +++ b/birdhouse/config/flyingpigeon/wps.cfg.template @@ -1,5 +1,5 @@ [server] -outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs +outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs/flyingpigeon outputpath = /data/wpsoutputs/flyingpigeon maxsingleinputsize = 2097152000.0 diff --git a/birdhouse/config/raven/wps.cfg.template b/birdhouse/config/raven/wps.cfg.template index 9a1825bc9..3ee21076c 100644 --- a/birdhouse/config/raven/wps.cfg.template +++ b/birdhouse/config/raven/wps.cfg.template @@ -1,5 +1,5 @@ [server] -outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs +outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs/raven outputpath = /data/wpsoutputs/raven # default 3mb, fix "Broken pipe" between the proxy and the wps service From dfc1d0dd7c33393b638a9720913b4aceff76c106 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 16 Feb 2023 13:56:18 -0500 Subject: [PATCH 4/5] CHANGES: Fix birds not creating their wps output under each bird name --- CHANGES.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 40f688776..fc0526c64 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,7 +14,26 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Fixes +- Fix birds not creating their wps output under each bird name + + Before this fix, finch, raven, flyingpigeon were dumping their output directly + under `https://PAVICS_HOST/wpsoutputs/`. + + With this fix, it will be under each bird name, ex: + `https://PAVICS_HOST/wpsoutputs/finch/` which is cleaner and follows what + malleefowl and hummingbird already does. + + Fixes https://github.com/bird-house/birdhouse-deploy/issues/11. + Fixes https://crim-ca.atlassian.net/browse/DAC-398 + + Requires PR https://github.com/Ouranosinc/pavics-sdi/pull/280, + https://github.com/bird-house/finch/pull/273 and + https://github.com/Ouranosinc/raven/pull/459. + + If `optional-components/secure-data-proxy` is enabled, might need some + additional permissions for each bird in + https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/optional-components/secure-data-proxy/config/magpie/config.yml.template. [1.23.1](https://github.com/bird-house/birdhouse-deploy/tree/1.23.1) (2023-02-13) ------------------------------------------------------------------------------------------------------------------ From dcbe4d84661621d76a6f741eebd961c888036042 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 16 Feb 2023 21:54:37 -0500 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=201.23.1=20=E2=86=92=201.23?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../config/canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6f5a15f80..dce02c3e2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.23.1 +current_version = 1.23.2 commit = True tag = False tag_name = {new_version} @@ -30,11 +30,11 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2023-02-13T18:31:02Z +search = {current_version} 2023-02-17T02:54:37Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-02-13T18:31:02Z +values = 2023-02-17T02:54:37Z [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index fc0526c64..264a5d686 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ +[//]: # (list changes here, using '-' for each new entry, remove this when items are added) + +[1.23.2](https://github.com/bird-house/birdhouse-deploy/tree/1.23.2) (2023-02-17) +------------------------------------------------------------------------------------------------------------------ + ## Fixes - Fix birds not creating their wps output under each bird name diff --git a/Makefile b/Makefile index d2eff3a01..128a277a5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.23.1 +override APP_VERSION := 1.23.2 # utility to remove comments after value of an option variable override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g") diff --git a/README.rst b/README.rst index 6187435e9..f59752abf 100644 --- a/README.rst +++ b/README.rst @@ -14,13 +14,13 @@ for a full-fledged production platform. * - releases - | |latest-version| |commits-since| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.23.1.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.23.2.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.23.1...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.23.2...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.23.1-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.23.2-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.23.1 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.23.2 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) diff --git a/RELEASE.txt b/RELEASE.txt index c8762aadc..8ad930217 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.23.1 2023-02-13T18:31:02Z +1.23.2 2023-02-17T02:54:37Z diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index f11284bb4..e8c9d4718 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/config/canarie-api/docker_configuration.py.template @@ -17,8 +17,8 @@ SERVICES = { 'info': { 'name': 'Node', 'synopsis': 'Nodes are data, compute and index endpoints accessed through the PAVICS platform or external clients. The Node service is the backend that allows: data storage, harvesting, indexation and discovery of local and federated data; authentication and authorization; server registration and management. Node service is therefore composed of several other services.', - 'version': '1.23.1', - 'releaseTime': '2023-02-13T18:31:02Z', + 'version': '1.23.2', + 'releaseTime': '2023-02-17T02:54:37Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', @@ -242,8 +242,8 @@ PLATFORMS = { 'info': { 'name': 'PAVICS', 'synopsis': 'The PAVICS (Power Analytics for Visualization of Climate Science) platform is a collection of climate analysis services served through Open Geospatial Consortium (OGC) protocols. These services include data access, processing and visualization. Both data and algorithms can be accessed either programmatically, through OGC-compliant clients such as QGIS or ArcGIS, or a custom web interface.', - 'version': '1.23.1', - 'releaseTime': '2023-02-13T18:31:02Z', + 'version': '1.23.2', + 'releaseTime': '2023-02-17T02:54:37Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 0c428bf0e..dcd12a8bb 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.23.1' +version = '1.23.2' # The full version, including alpha/beta/rc tags. -release = '1.23.1' +release = '1.23.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.