From 8243b204e0153ae556034dc54e5da785ce16088d Mon Sep 17 00:00:00 2001 From: Tanuja Shinde Date: Mon, 22 Aug 2022 09:07:26 +0530 Subject: [PATCH] CORTX-33499: update rgw gc parameters in gconf sample files (#6402) * CORTX-33499: update rgw gc parameters in gconf sample files Signed-off-by: Tanuja Shinde * CORTX-33499: update rgw gc parameters in gconf sample files Signed-off-by: Tanuja Shinde * CORTX-33499: update rgw gc parameters in gconf sample files Signed-off-by: Tanuja Shinde Signed-off-by: Tanuja Shinde --- conf/gconf/cluster.conf.sample | 505 +++++++++++++++---------------- conf/solution/config.yaml.sample | 13 +- test/setup/config.yaml | 35 ++- 3 files changed, 272 insertions(+), 281 deletions(-) diff --git a/conf/gconf/cluster.conf.sample b/conf/gconf/cluster.conf.sample index ddc4aa9df..daee14312 100644 --- a/conf/gconf/cluster.conf.sample +++ b/conf/gconf/cluster.conf.sample @@ -7,237 +7,231 @@ cortx: consul: admin: admin endpoints: - - tcp://consul-server.default.svc.cluster.local:8301 + - tcp://cortx-consul-server:8301 - http://cortx-consul-server:8500 num_endpoints: 2 - secret: !!binary | - MG12NU5BVjBVeWpBSWJuSV9uVjV5UzUxN3lTSVNkNUk1YkRzbjd2QkE9PQ== + secret: gAAAAABi_w-5lmv3sGSkA4xgHQpp8t11mUIXGOXtpxZAasuFYut_kejtdqbCIkllULg5wpQDwGuTwMdIuzLWSNCSWm11OzETOw== kafka: admin: admin endpoints: - tcp://kafka.default.svc.cluster.local:9092 num_endpoints: 1 - secret: !!binary | - TmRPNThMSm5GOVl5RHgwTVFfaTRJZ3k3YUUwMldmNkdxRE1KYVIxc0E9PQ== + secret: gAAAAABi_w-5EOTuaNs0xUctkXDo7ZXCcwyM2Apc9H8d2w0p-8Bm2g_A3zzcZ_HQQ8a25jEO8mr6v0SYBYmaMEUlr1LWy07Stw== common: release: name: CORTX - version: 2.0.0-5072 + version: 2.0.0-7528 security: device_certificate: /etc/cortx/solution/ssl/stx.pem domain_certificate: /etc/cortx/solution/ssl/stx.pem - ssl_certificate: /opt/seagate/cortx/s3/install/haproxy/ssl/s3.seagate.com.pem + ssl_certificate: /etc/cortx/solution/ssl/s3.seagate.com.pem service: admin: admin - secret: !!binary | - Z0FBQUFBQmhVY1dCdzJ6RkRXT3FSVjJXTWtUM0paZlB1LXFRRW0xNy1rRGhJLVpHUjcxMkVOeDZ6 - MG9KWmpsM21yTmprZTJkYTBHUU1OWVl4dnZSaVRTeEs4UEdReHhkR1E9PQ== + secret: gAAAAABi_w-5MSD7neJ542v7JmBasjV_K-GuIPSsMGxiAeQzquAPfKhoDlww5D_S1zwQd80epol1oXBfP03gEXyLMUDeBG8fVQ== storage: config: /etc/cortx local: /etc/cortx log: /var/log/cortx/ - utils: - message_bus_backend: kafka csm: agent: - num_endpoints: 1 endpoints: - - https://:23256 - public: # Public Control Endpoint + - https://:8081 num_endpoints: 1 - endpoints: - - https://control-svc:8081 - email_address: cortx@seagate.com # Optional - mgmt_admin: cortxadmin - mgmt_secret: !!binary | - UlU1U0NrYklraS0ta3BOamN5X2J1VmUwRnJXTUFlb2JDdkItY1B3ZEE9PQ== - limits: - num_services: 1 - services: - - name: agent - memory: - min: 128Mi - max: 256Mi - cpu: - min: 250m - max: 500m - ha: - service: - endpoints: - - http://cortx-ha-svc:23501 # HA service endpoint - limits: - num_services: 3 + email_address: cortx@seagate.com + limits: + num_services: 1 services: - - name: fault_tolerance - memory: - min: 128Mi - max: 1Gi - cpu: - min: 250m + - cpu: max: 500m - - name: health_monitor - memory: - min: 128Mi - max: 1Gi - cpu: min: 250m - max: 500m - - name: k8s_monitor memory: + max: 256Mi min: 128Mi - max: 1Gi - cpu: - min: 250m - max: 500m - health: # TBD: Future. Do not use for now + name: agent + mgmt_admin: cortxadmin + mgmt_secret: gAAAAABi_w-5X6Piz_twNNfID4ZeWPsN6nAtg1SMXGhn3w4dRGoAym4qkeKOiwmW5fzxiLHydCSxJY9vRN93YlRaJE7fFzpTZw== + public: + endpoints: + - https://control-svc:8081 num_endpoints: 1 + external: + consul: + admin: admin endpoints: - - http://server1-node1.com:22000 - rgw: - auth_user: user_name - auth_admin: sgiamadmin - auth_secret: s3_auth_admin_secret - - thread_pool_size: 10 # To be tuned as we go - data_path: /var/cortx/radosgw/$clusterid # Needs to be under Local PVC - init_timeout: 300 # In seconds - gc_max_objs: 32 # In seconds - gc_obj_min_wait: 1800 # In seconds - gc_processor_max_time: 3600 # In seconds - gc_processor_period: 3600 # In seconds - - motr_layout_id: 9 - motr_unit_size: 1048576 - motr_max_units_per_request: 8 - motr_max_idx_fetch_count: 30 - motr_max_rpc_msg_size: 524288 # In bytes - motr_reconnect_interval: 10 # Wait for Seconds before reconnect - motr_reconnect_retry_count: 10 # Give up after these many retries - - public: # NOTE: was s3 earlier - num_endpoints: 2 - endpoints: # S3 IO K8s service endpoint - - http://s3-rgw-svc:80 # Optional (if http needs to be enabled) - - https://s3-rgw-svc:443 # There will be one endpoint (http/https) - service: + - tcp://cortx-consul-server:8301 + - http://cortx-consul-server:8500 num_endpoints: 2 - endpoints: # RGW Service Endpoint - - http://:22751 # S ports. S = # of RGW Instances - - https://:23001 - io_max_units: 8 - max_start_timeout: <<.Values.cortx.max_start_timeout>> + secret: gAAAAABi_w-5lmv3sGSkA4xgHQpp8t11mUIXGOXtpxZAasuFYut_kejtdqbCIkllULg5wpQDwGuTwMdIuzLWSNCSWm11OzETOw== + kafka: + admin: admin + endpoints: + - tcp://kafka.default.svc.cluster.local:9092 + num_endpoints: 1 + secret: gAAAAABi_w-5EOTuaNs0xUctkXDo7ZXCcwyM2Apc9H8d2w0p-8Bm2g_A3zzcZ_HQQ8a25jEO8mr6v0SYBYmaMEUlr1LWy07Stw== + ha: limits: + num_services: 3 services: - - name: rgw + - cpu: + max: 500m + min: 250m memory: + max: 1Gi min: 128Mi + name: fault_tolerance + - cpu: + max: 500m + min: 250m + memory: max: 1Gi - cpu: + min: 128Mi + name: health_monitor + - cpu: + max: 500m min: 250m - max: 1000m + memory: + max: 1Gi + min: 128Mi + name: k8s_monitor + service: + endpoints: + - http://cortx-ha-svc:23501 + num_endpoints: 1 hare: hax: - num_endpoints: 13 endpoints: - - https://motr-hax-svc:22003 # Control endpoint - - tcp://data1-node1:22001 # For motr and Hax communication + - https://motr-hax-svc:22003 + - tcp://data1-node1:22001 - tcp://data2-node1:22001 - - tcp://data1-node2:22001 # For motr and Hax communication + - tcp://data1-node2:22001 - tcp://data2-node2:22001 - - tcp://data1-node3:22001 # For motr and Hax communication - - tcp://data2-node3:22001 - - tcp://server-node1:22001 # if s3 client is configured - - tcp://server-node2:22001 # if s3 client is configured - - tcp://server-node3:22001 # if s3 client is configured - - tcp://client-node1:22001 # Only if motr_client is configured - - tcp://client-node2:22001 # Only if motr_client is configured - - tcp://client-node3:22001 # Only if motr_client is configured + - tcp://data1-node3:22001 + - tcp://data2-node3:22001 + - tcp://server-node1:22001 + - tcp://server-node2:22001 + - tcp://server-node3:22001 + - tcp://client-node1:22001 + - tcp://client-node2:22001 + - tcp://client-node3:22001 + num_endpoints: 13 limits: num_services: 1 services: - - name: hax + - cpu: + max: 500m + min: 250m memory: - min: 128Mi max: 1Gi - cpu: - min: 250m - max: 500m + min: 128Mi + name: hax motr: - interface_family: inet # Optional: inet (default) | inet6 - transport_type: libfab # libfab | lnet (libfab==inet) - md_size: 10 # % MD size w.r.t. total capacity - ios: - group_size: 1 # Number of services to be started in a group - # N = Total CVG / group_size. N must be <=24. + clients: + - endpoints: + - tcp://server-node1:22501 + - tcp://server-node2:22501 + - tcp://server-node3:22501 + name: rgw_s3 + num_endpoints: 3 + num_instances: 1 + - endpoints: + - tcp://client1-node1:21501 + name: motr_client + num_endpoints: 1 + num_instances: 0 + num_subscriptions: 1 + subscriptions: + - fdmi + confd: + endpoints: + - tcp://data1-node1:21001 + - tcp://data2-node1:21001 + - tcp://data1-node2:21001 + - tcp://data2-node2:21001 + - tcp://data1-node3:21001 + - tcp://data2-node3:21001 num_endpoints: 6 + interface_family: inet + ios: endpoints: - - tcp://data1-node1:21002 # Format: ://: - # N endpoints one for each Pod, first mentioned here - # N == Number of CVGs in the Pod - # Ports: 21002 - (21002 + Number of CVGs) - - tcp://data2-node1:21002 # Same thing for the second pod - - tcp://data1-node2:21002 # of for Pods on the other nodes + - tcp://data1-node1:21002 + - tcp://data2-node1:21002 + - tcp://data1-node2:21002 - tcp://data2-node2:21002 - tcp://data1-node3:21002 - - tcp://data2-node3:21002 - confd: + - tcp://data2-node3:21002 + group_size: 1 num_endpoints: 6 - endpoints: - - tcp://data1-node1:21001 # Format: ://:21001 - - tcp://data1-node2:21001 - - tcp://data1-node3:21001 - - tcp://data2-node1:21001 - - tcp://data2-node2:21001 - - tcp://data2-node3:21001 limits: num_services: 2 services: - - name: ios + - cpu: + max: 1500m + min: 1000m memory: - min: 1Gi # Needs to compute this dynamically - # min = Max. of (K * 0.5 /N, ((M/N) * 5% * (K/N)) Gi) - # where K= Num CVGs, N=Num Containers - max: 0 # max = 1.1 * min. For now set to 0. - cpu: - min: 1000m # 1000m * N where N = Num of "ios" Containers - max: 1500m # 1500m * N where N = Num of "ios" Containers - - name: confd - memory: - min: 128Mi - max: 512Mi - cpu: - min: 250m + max: 0 + min: 1Gi + name: ios + - cpu: max: 500m + min: 250m + memory: + max: 512Mi + min: 128Mi + name: confd + md_size: 10 num_clients: 2 - clients: # Motr Client Settings - - name: rgw_s3 # rgw|s3|motr_client (Motr Clients) - num_instances: 1 # Client instances per node (pod) - num_endpoints: 2 - endpoints: - - tcp://server-node1:22501 # Format: ://:22501 - - tcp://server-node2:22501 # This is for client>type == "s3" - # This is a starting endpoint and num of s3 - # endpoints will be equal to num of s3 instances - # in this pod. Port range would be - # 22501 to (22501 + "motr>client>{rgw_s3}>num_instances") - - tcp://server-node3:22501 - - name: motr_client - num_instances: 0 # Optional client. Only for Dev. - num_subscriptions: 1 - subscriptions: # NEW: Optional: Services subscribed for client - - fdmi - num_endpoints: 2 - endpoints: - - tcp://client1-node1:21501 # Port range would be - # 21501 to (21501 + "motr>client>{motr_client}>num_instances") - + transport_type: libfab + rgw: + auth_admin: sgiamadmin + auth_secret: gAAAAABi_w-5bWJuzg2hE8hwKJlnmEvxK8gpEMBEzENBEsEuOWKumMLMymXDPBVHXspj2VjgguppmNCItTN0es31QCbiHSkfUA== + auth_user: user_name + data_path: /var/cortx/radosgw/$clusterid + enable_gc_threads: true + gc_max_concurrent_io: 1 + gc_max_objs: 64 + gc_max_trim_chunk: 256 + gc_obj_min_wait: 7200 + gc_processor_max_time: 3600 + gc_processor_period: 3600 + init_timeout: 300 + io_max_units: 8 + limits: + num_services: 1 + services: + - cpu: + max: 1000m + min: 250m + memory: + max: 1Gi + min: 128Mi + name: rgw + max_start_timeout: <<.Values.cortx.max_start_timeout>> + motr_layout_id: 9 + motr_max_idx_fetch_count: 30 + motr_max_rpc_msg_size: 524288 + motr_max_units_per_request: 8 + motr_reconnect_interval: 10 + motr_reconnect_retry_count: 10 + motr_unit_size: 1048576 + public: + endpoints: + - http://s3-rgw-svc:80 + - https://s3-rgw-svc:443 + num_endpoints: 2 + service: + endpoints: + - http://:22751 + - https://:23001 + num_endpoints: 2 + thread_pool_size: 10 + utils: + message_bus_backend: kafka cluster: id: 0007ec45379e36d9fa089a3d615c32a3 name: cortx-cluster - storage_set_count: 1 + num_storage_set: 1 storage_set: - - name: storage-set-1 - durability: + - durability: dix: data: '1' parity: '0' @@ -246,42 +240,62 @@ cluster: data: '1' parity: '0' spare: '0' + name: storage-set-1 nodes: - - 11dfe4bc7d43c202b28a2a1d8bcaa0f6 - - 26f752930474c28d64c09b4c198c0fea + - 0bd11a2b7939b68f3c2f62567bea647f - 309ff7f0a7c4dfc22171b75c174bb70c - - 380fb4a039ffc67865bc5b1d51a38811 - - 4eb5285f0ec23864604123b79de13e38 - - 5a230afb7355d23155bcc58328bbe03a - - 8581ff0c598abccbd020e3b72f2cd334 - a41d31a905d3892ba80bc0604041d4af - - aab7732613c4483da0784d14e5ad917d - - b5e8544fd1b3ec3764fff509652a8d07 + - 11dfe4bc7d43c202b28a2a1d8bcaa0f6 + - 380fb4a039ffc67865bc5b1d51a38811 - c4a32f1a4a3a43c1c65563511d9536b0 + - 26f752930474c28d64c09b4c198c0fea + - b5e8544fd1b3ec3764fff509652a8d07 + - aab7732613c4483da0784d14e5ad917d + - 8581ff0c598abccbd020e3b72f2cd334 + - 5a230afb7355d23155bcc58328bbe03a + num_nodes: 11 node: + 0bd11a2b7939b68f3c2f62567bea647f: + cluster_id: 0007ec45379e36d9fa089a3d615c32a3 + components: + - name: utils + version: 2.0.0-7528 + - name: csm + num_services: 1 + services: + - agent + version: 2.0.0-7528 + hostname: control-node + name: control-node + node_id: 9995f539f4f770e2a3fe9e2e615c32a8 + num_components: 2 + provisioning: + phase: deployment + status: success + version: 2.0.0-7528 + time: 1660882878 + storage_set: storage-set-1 + type: control_node 11dfe4bc7d43c202b28a2a1d8bcaa0f6: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: motr - version: 2.0.0-5060 num_services: 1 services: - io - name: hare - version: 2.0.0-5072 cvg: - devices: data: - /dev/sdc - /dev/sdd - metadata: - - /dev/sdb log: - /dev/sdh - num_log: 1 + metadata: + - /dev/sdb num_data: 2 + num_log: 1 num_metadata: 1 name: cvg-01 type: ios @@ -289,36 +303,34 @@ node: name: data1-node2 node_id: bbb340f79047df9bb52fa460615c32a5 num_components: 3 - num_cvg: 1 - storage_set: storage-set-1 - type: data_node/1 provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 + num_cvg: 1 + storage_set: storage-set-1 + type: data_node/1 26f752930474c28d64c09b4c198c0fea: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: motr - version: 2.0.0-5060 num_services: 1 services: - io - name: hare - version: 2.0.0-5072 cvg: - devices: data: - /dev/sdf - /dev/sdg - metadata: - - /dev/sde log: - /dev/sdi - num_log: 1 + metadata: + - /dev/sde num_data: 2 + num_log: 1 num_metadata: 1 name: cvg-02 type: ios @@ -326,53 +338,50 @@ node: name: data2-node2 node_id: bba340f79047df9bb52fa460615c32a5 num_components: 3 - num_cvg: 1 - storage_set: storage-set-1 - type: data_node/2 provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 + num_cvg: 1 + storage_set: storage-set-1 + type: data_node/2 309ff7f0a7c4dfc22171b75c174bb70c: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: ha - version: 2.0.0-5070 hostname: ha-node name: ha-node node_id: 1115f539f4f770e2a3fe9e2e615c32a8 num_components: 2 - storage_set: storage-set-1 - type: ha_node provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 + storage_set: storage-set-1 + type: ha_node 380fb4a039ffc67865bc5b1d51a38811: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: motr - version: 2.0.0-5060 num_services: 1 services: - io - name: hare - version: 2.0.0-5072 cvg: - devices: data: - /dev/sdc - /dev/sdd - metadata: - - /dev/sdb log: - /dev/sdh - num_log: 1 + metadata: + - /dev/sdb num_data: 2 + num_log: 1 num_metadata: 1 name: cvg-01 type: ios @@ -380,42 +389,20 @@ node: name: data1-node3 node_id: ccc8700fe6797ed532e311b0615c32a7 num_components: 3 - num_cvg: 1 - storage_set: storage-set-1 - type: data_node/1 provisioning: phase: deployment status: success - version: 2.0.0-846 - 4eb5285f0ec23864604123b79de13e38: - cluster_id: 0007ec45379e36d9fa089a3d615c32a3 - components: - - name: utils - version: 2.0.0-5058 - - name: csm - num_services: 1 - services: - - agent - version: 2.0.0-5072 - hostname: ssc-vm-rhev4-2905.colo.seagate.com - name: control-node - node_id: 8efd697708a8f7e428d3fd520c180795 - num_components: 2 - provisioning: - phase: deployment - status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 + num_cvg: 1 storage_set: storage-set-1 - type: control_node + type: data_node/1 5a230afb7355d23155bcc58328bbe03a: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: hare - version: 2.0.0-5072 - name: rgw - version: 2.0.0-5073 num_services: 1 services: - rgw_s3 @@ -423,20 +410,19 @@ node: name: server-node3 node_id: fff8700fe6797ed532e311b0615c32a7 num_components: 3 - storage_set: storage-set-1 provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 + storage_set: storage-set-1 type: server_node 8581ff0c598abccbd020e3b72f2cd334: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: hare - name: rgw - version: 2.0.0-5073 num_services: 1 services: - rgw_s3 @@ -447,32 +433,30 @@ node: provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 storage_set: storage-set-1 type: server_node a41d31a905d3892ba80bc0604041d4af: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: motr - version: 2.0.0-5060 num_services: 1 services: - io - name: hare - version: 2.0.0-5072 cvg: - devices: data: - /dev/sdc - /dev/sdd - metadata: - - /dev/sdb log: - /dev/sdh - num_log: 1 + metadata: + - /dev/sdb num_data: 2 + num_log: 1 num_metadata: 1 name: cvg-01 type: ios @@ -483,7 +467,8 @@ node: provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 num_cvg: 1 storage_set: storage-set-1 type: data_node/1 @@ -491,11 +476,8 @@ node: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: hare - version: 2.0.0-5072 - name: rgw - version: 2.0.0-5073 num_services: 1 services: - rgw_s3 @@ -506,32 +488,30 @@ node: provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 storage_set: storage-set-1 type: server_node b5e8544fd1b3ec3764fff509652a8d07: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: motr - version: 2.0.0-5060 num_services: 1 services: - io - name: hare - version: 2.0.0-5072 cvg: - devices: data: - /dev/sdf - /dev/sdg - metadata: - - /dev/sde log: - /dev/sdi - num_log: 1 + metadata: + - /dev/sde num_data: 2 + num_log: 1 num_metadata: 1 name: cvg-02 type: ios @@ -542,7 +522,8 @@ node: provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 num_cvg: 1 storage_set: storage-set-1 type: data_node/2 @@ -550,25 +531,22 @@ node: cluster_id: 0007ec45379e36d9fa089a3d615c32a3 components: - name: utils - version: 2.0.0-5058 - name: motr - version: 2.0.0-5060 num_services: 1 services: - io - name: hare - version: 2.0.0-5072 cvg: - devices: data: - /dev/sdf - /dev/sdg - metadata: - - /dev/sde log: - /dev/sdi - num_log: 1 + metadata: + - /dev/sde num_data: 2 + num_log: 1 num_metadata: 1 name: cvg-02 type: ios @@ -579,7 +557,8 @@ node: provisioning: phase: deployment status: success - version: 2.0.0-846 + version: 2.0.0-7528 + time: 1660882878 num_cvg: 1 storage_set: storage-set-1 type: data_node/2 diff --git a/conf/solution/config.yaml.sample b/conf/solution/config.yaml.sample index 406f41b32..820ec0d0c 100644 --- a/conf/solution/config.yaml.sample +++ b/conf/solution/config.yaml.sample @@ -3,8 +3,8 @@ cortx: consul: admin: admin endpoints: - - tcp://consul-server.default.svc.cluster.local:8301 - - http://consul-server.default.svc.cluster.local:8500 + - tcp://cortx-consul-server:8301 + - http://cortx-consul-server:8500 secret: consul_admin_secret # Key in the list of secrets kafka: admin: admin @@ -33,10 +33,13 @@ cortx: thread_pool_size: 10 # To be tuned as we go data_path: /var/cortx/radosgw/$clusterid # Needs to be under Local PVC init_timeout: 300 # In seconds - gc_max_objs: 32 # In seconds - gc_obj_min_wait: 1800 # In seconds + gc_max_objs: 64 # In seconds + gc_obj_min_wait: 7200 # In seconds gc_processor_max_time: 3600 # In seconds gc_processor_period: 3600 # In seconds + enable_gc_threads: true + gc_max_concurrent_io: 1 + gc_max_trim_chunk: 256 motr_layout_id: 9 motr_unit_size: 1048576 @@ -156,7 +159,7 @@ cortx: csm: agent: endpoints: - - https://:23256 + - https://:8081 public: # Public Control Endpoint endpoints: - https://control-svc:8081 diff --git a/test/setup/config.yaml b/test/setup/config.yaml index 781872886..820ec0d0c 100644 --- a/test/setup/config.yaml +++ b/test/setup/config.yaml @@ -3,8 +3,8 @@ cortx: consul: admin: admin endpoints: - - tcp://consul-server.default.svc.cluster.local:8301 - - http://consul-server.default.svc.cluster.local:8500 + - tcp://cortx-consul-server:8301 + - http://cortx-consul-server:8500 secret: consul_admin_secret # Key in the list of secrets kafka: admin: admin @@ -12,9 +12,6 @@ cortx: - tcp://kafka.default.svc.cluster.local:9092 secret: kafka_admin_secret # Key in the list of secrets common: - release: - name: CORTX - version: 2.0.0-1111 service: admin: admin secret: common_admin_secret @@ -36,10 +33,13 @@ cortx: thread_pool_size: 10 # To be tuned as we go data_path: /var/cortx/radosgw/$clusterid # Needs to be under Local PVC init_timeout: 300 # In seconds - gc_max_objs: 32 # In seconds - gc_obj_min_wait: 1800 # In seconds + gc_max_objs: 64 # In seconds + gc_obj_min_wait: 7200 # In seconds gc_processor_max_time: 3600 # In seconds gc_processor_period: 3600 # In seconds + enable_gc_threads: true + gc_max_concurrent_io: 1 + gc_max_trim_chunk: 256 motr_layout_id: 9 motr_unit_size: 1048576 @@ -81,12 +81,18 @@ cortx: # Ports: 21002 - (21002 + Number of CVGs) - tcp://data2-node1:21002 # Same thing for the second pod - tcp://data1-node2:21002 # of for Pods on the other nodes + - tcp://data2-node2:21002 + - tcp://data1-node3:21002 + - tcp://data2-node3:21002 confd: endpoints: - tcp://data1-node1:21001 # Format: ://:21001 - - tcp://data1-node2:21001 - - tcp://data1-node3:21001 + - tcp://data2-node1:21001 + - tcp://data1-node2:21001 + - tcp://data2-node2:21001 + - tcp://data1-node3:21001 + - tcp://data2-node3:21001 limits: services: - name: ios @@ -109,13 +115,13 @@ cortx: - name: rgw_s3 # rgw|s3|motr_client (Motr Clients) num_instances: 1 # Client instances per node (pod) endpoints: - - tcp://server1-node1:22501 # Format: ://:22501 - - tcp://server2-node1:22501 # This is for client>type == "s3" + - tcp://server-node1:22501 # Format: ://:22501 + - tcp://server-node2:22501 # This is for client>type == "s3" # This is a starting endpoint and num of s3 # endpoints will be equal to num of s3 instances # in this pod. Port range would be # 22501 to (22501 + "motr>client>{rgw_s3}>num_instances") - - tcp://server-node1:22501 + - tcp://server-node3:22501 - name: motr_client num_instances: 0 # Optional client. Only for Dev. num_subscriptions: 1 @@ -130,8 +136,11 @@ cortx: endpoints: - https://motr-hax-svc:22003 # Control endpoint - tcp://data1-node1:22001 # For motr and Hax communication + - tcp://data2-node1:22001 - tcp://data1-node2:22001 # For motr and Hax communication + - tcp://data2-node2:22001 - tcp://data1-node3:22001 # For motr and Hax communication + - tcp://data2-node3:22001 - tcp://server-node1:22001 # if s3 client is configured - tcp://server-node2:22001 # if s3 client is configured - tcp://server-node3:22001 # if s3 client is configured @@ -150,7 +159,7 @@ cortx: csm: agent: endpoints: - - https://:23256 + - https://:8081 public: # Public Control Endpoint endpoints: - https://control-svc:8081