This is an automated email from the ASF dual-hosted git repository. skperez pushed a commit to branch apidocs-improvements in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 1e8cc4e9d31d295e172c0db4bba61a5776642bea Author: Riley Kuttruff <[email protected]> AuthorDate: Mon Nov 27 15:44:38 2023 -0800 Update helm cassandra dependency (#289) * Update helm cassandra dependency * Bump default cassandra PV to 4 * Bump default cassandra PV to 4 in tools * Changelog * Fixed small documentation issue --------- Co-authored-by: rileykk <[email protected]> --- CHANGELOG.md | 1 + analysis/webservice/algorithms/doms/ResultsStorage.py | 3 +++ analysis/webservice/algorithms/doms/domsconfig.ini.default | 2 +- data-access/nexustiles/config/datastores.ini.default | 2 +- helm/requirements.yaml | 2 +- helm/values.yaml | 3 +-- tools/deletebyquery/deletebyquery.py | 2 +- tools/doms-data-tools/update_doms_data_pk.py | 2 +- tools/domspurge/README.md | 2 +- tools/domspurge/purge.py | 2 +- 10 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ffff5d..5e36c0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Status code for results endpoint if execution id is not found fixed to be `404` instead of `500`. - Ensured links in the `/job` endpoint are https - SDAP-488: Workaround to build issue on Apple Silicon (M1/M2). Image build installs nexusproto through PyPI instead of building from source. A build arg `BUILD_NEXUSPROTO` was defined to allow building from source if desired +- SDAP-496: Fix `solr-cloud-init` image failing to run. ### Security ## [1.1.0] - 2023-04-26 diff --git a/analysis/webservice/algorithms/doms/ResultsStorage.py b/analysis/webservice/algorithms/doms/ResultsStorage.py index 48b2122..1dea161 100644 --- a/analysis/webservice/algorithms/doms/ResultsStorage.py +++ b/analysis/webservice/algorithms/doms/ResultsStorage.py @@ -65,6 +65,9 @@ class AbstractResultsContainer: dc_policy = DCAwareRoundRobinPolicy(cassDatacenter) token_policy = TokenAwarePolicy(dc_policy) + logger.info(f'Connecting to Cassandra cluster @ {[host for host in cassHost.split(",")]}; datacenter: ' + f'{cassDatacenter}; protocol version: {cassVersion}') + self._cluster = Cluster([host for host in cassHost.split(',')], load_balancing_policy=token_policy, protocol_version=cassVersion, auth_provider=auth_provider) diff --git a/analysis/webservice/algorithms/doms/domsconfig.ini.default b/analysis/webservice/algorithms/doms/domsconfig.ini.default index 55f9b16..f4e4496 100644 --- a/analysis/webservice/algorithms/doms/domsconfig.ini.default +++ b/analysis/webservice/algorithms/doms/domsconfig.ini.default @@ -18,7 +18,7 @@ host=localhost port=9042 keyspace=doms local_datacenter=datacenter1 -protocol_version=3 +protocol_version=4 dc_policy=DCAwareRoundRobinPolicy username= password= diff --git a/data-access/nexustiles/config/datastores.ini.default b/data-access/nexustiles/config/datastores.ini.default index d8db190..51455a3 100644 --- a/data-access/nexustiles/config/datastores.ini.default +++ b/data-access/nexustiles/config/datastores.ini.default @@ -18,7 +18,7 @@ host=localhost port=9042 keyspace=nexustiles local_datacenter=datacenter1 -protocol_version=3 +protocol_version=4 dc_policy=DCAwareRoundRobinPolicy username= password= diff --git a/helm/requirements.yaml b/helm/requirements.yaml index a999658..1de8cf0 100644 --- a/helm/requirements.yaml +++ b/helm/requirements.yaml @@ -12,7 +12,7 @@ dependencies: repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami condition: solr.enabled - name: cassandra - version: 5.5.3 + version: 9.1.7 repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami condition: cassandra.enabled diff --git a/helm/values.yaml b/helm/values.yaml index 4105362..fe2481e 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -195,8 +195,7 @@ cassandra: dbUser: user: cassandra password: cassandra - cluster: - replicaCount: 1 + replicaCount: 1 persistence: storageClass: hostpath size: 8Gi diff --git a/tools/deletebyquery/deletebyquery.py b/tools/deletebyquery/deletebyquery.py index 4fb7bd6..8b98111 100644 --- a/tools/deletebyquery/deletebyquery.py +++ b/tools/deletebyquery/deletebyquery.py @@ -262,7 +262,7 @@ def parse_args(): help='The version of the Cassandra protocol the driver should use.', required=False, choices=['1', '2', '3', '4', '5'], - default='3') + default='4') parser.add_argument('--solr-rows', help='Number of rows to fetch with each Solr query to build the list of tiles to delete', diff --git a/tools/doms-data-tools/update_doms_data_pk.py b/tools/doms-data-tools/update_doms_data_pk.py index ed8dbe5..749995d 100644 --- a/tools/doms-data-tools/update_doms_data_pk.py +++ b/tools/doms-data-tools/update_doms_data_pk.py @@ -114,7 +114,7 @@ def main(): request_timeout=60.0, ) }, - protocol_version=3, + protocol_version=4, auth_provider=auth_provider) as cluster: session = cluster.connect('doms') diff --git a/tools/domspurge/README.md b/tools/domspurge/README.md index 92f7cfb..e88b62f 100644 --- a/tools/domspurge/README.md +++ b/tools/domspurge/README.md @@ -33,5 +33,5 @@ You can build an image for this script to run it in a Kubernetes CronJob. ```shell cd /incubator-sdap-nexus -docker build . -f Dockerfile -t sdap-local/DomsPurge:<tag> +docker build . -f tools/domspurge/Dockerfile -t sdap-local/DomsPurge:<tag> ``` diff --git a/tools/domspurge/purge.py b/tools/domspurge/purge.py index 4fb2fc3..d4bb15a 100644 --- a/tools/domspurge/purge.py +++ b/tools/domspurge/purge.py @@ -270,7 +270,7 @@ def parse_args(): required=False, dest='pv', choices=['1', '2', '3', '4', '5'], - default='3') + default='4') time_before = purge_options.add_mutually_exclusive_group(required=True)
