From f200dd310eb988b4b00537292717d4c7398acb7d Mon Sep 17 00:00:00 2001 From: Denis Kirillov Date: Mon, 3 Apr 2023 17:33:17 +0300 Subject: [PATCH] [#74] Update docs Signed-off-by: Denis Kirillov --- CHANGELOG.md | 1 + config/config.env | 4 ++-- config/config.yaml | 6 ++++-- docs/configuration.md | 15 ++++++++++++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cc00a5..11e6e67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ This document outlines major changes between releases. - CompleteMultipartUpload handler now sends whitespace characters to keep alive client's connection (#60) - Support new system attributes (#64) - Changed values for `frostfs_s3_gw_state_health` metric (#91) +- Support multiple tree service endpoints (#74) ## [0.26.0] - 2022-12-28 diff --git a/config/config.env b/config/config.env index 23b5596..ba690f3 100644 --- a/config/config.env +++ b/config/config.env @@ -42,8 +42,8 @@ S3_GW_CONFIG=/path/to/config/yaml # Logger S3_GW_LOGGER_LEVEL=debug -# Endpoint of the tree service. Must be provided. Can be one of the node address (from the `peers` section). -S3_GW_TREE_SERVICE=grpc://s01.frostfs.devenv:8080 +# Endpoints of the tree service. At least one endpoint must be provided. Node addresses (from the `peers` section) can be used. +S3_GW_TREE_SERVICE=grpc://s01.frostfs.devenv:8080 grpc://s02.frostfs.devenv:8080 # RPC endpoint and order of resolving of bucket names S3_GW_RPC_ENDPOINT=http://morph-chain.frostfs.devenv:30333/ diff --git a/config/config.yaml b/config/config.yaml index afd4950..a4e292f 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -44,9 +44,11 @@ listen_domains: logger: level: debug -# Endpoint of the tree service. Must be provided. Can be one of the node address (from the `peers` section). +# Endpoints of the tree service. At least one endpoint must be provided. Node addresses (from the `peers` section) can be used. tree: - service: node1.frostfs:8080 + service: + - node1.frostfs:8080 + - node2.frostfs:8080 # RPC endpoint and order of resolving of bucket names rpc_endpoint: http://morph-chain.frostfs.devenv:30333 diff --git a/docs/configuration.md b/docs/configuration.md index 695109c..35d1852 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -337,14 +337,23 @@ logger: ### `tree` section +```yaml +tree: + service: + - s01.frostfs.devenv:8080 + - s02.frostfs.devenv:8080 +``` + +If you use only one endpoint, it can be provided as: + ```yaml tree: service: s01.frostfs.devenv:8080 ``` -| Parameter | Type | Default value | Description | -|-----------|----------|---------------|------------------------------------------------------------------------------------------------------------| -| `service` | `string` | | Endpoint of the tree service. Must be provided. Can be one of the node address (from the `peers` section). | +| Parameter | Type | Default value | Description | +|-----------|------------|---------------|-------------------------------------------------------------------------------------------------------------------------------| +| `service` | `[]string` | | Endpoints of the tree service. At least one endpoint must be provided. Node addresses (from the `peers` section) can be used. | ### `cache` section