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

[hotfix] Update time and storage units in template configuration files #3434

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −17
Open

[hotfix] Update time and storage units in template configuration files #3434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions amoro-ams/src/test/java/org/apache/amoro/server/TestAmoroManagementConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.amoro.shade.jackson2.com.fasterxml.jackson.core.type.TypeReference;
import org.apache.amoro.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
import org.apache.amoro.utils.JacksonUtil;
import org.apache.amoro.utils.MemorySize;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.yaml.snakeyaml.Yaml;
Expand Down Expand Up @@ -65,7 +66,7 @@ public class TestAmoroManagementConf {
.put(AmoroManagementConf.TERMINAL_SESSION_TIMEOUT.key(), "min")
.build();

private static final ConfigOption<String>[] STORAGE_RELATED_CONFIG_OPTIONS =
private static final ConfigOption<MemorySize>[] STORAGE_RELATED_CONFIG_OPTIONS =
new ConfigOption[] {AmoroManagementConf.THRIFT_MAX_MESSAGE_SIZE};

@Test
Expand Down Expand Up @@ -186,7 +187,7 @@ private void assertTimeRelatedConfigs(

private void assertStorageRelatedConfigs(
Configurations serviceConfig, Configurations expectedConfig) {
for (ConfigOption<String> configOption : STORAGE_RELATED_CONFIG_OPTIONS) {
for (ConfigOption<MemorySize> configOption : STORAGE_RELATED_CONFIG_OPTIONS) {
Assertions.assertEquals(
expectedConfig.get(configOption),
serviceConfig.get(AmoroManagementConf.THRIFT_MAX_MESSAGE_SIZE));
Expand Down
12 changes: 6 additions & 6 deletions charts/amoro/templates/amoro-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ data:
{{- end }}

thrift-server:
max-message-size: 104857600 # 100MB
max-message-size: 100MB # 104857600
selector-thread-count: 2
selector-queue-size: 4
table-service:
Expand All @@ -67,23 +67,23 @@ data:
bind-port: {{ .Values.server.rest.port }}

refresh-external-catalogs:
interval: 180000 # 3min
interval: 3min # 180000

refresh-tables:
thread-count: 10
interval: 60000 # 1min
interval: 1min # 60000

self-optimizing:
commit-thread-count: 10
runtime-data-keep-days: 30
runtime-data-expire-interval-hours: 1

optimizer:
heart-beat-timeout: 60000 # 1min
task-ack-timeout: 30000 # 30s
heart-beat-timeout: 1min # 60000
task-ack-timeout: 30s # 30000

blocker:
timeout: 60000 # 1min
timeout: 1min # 60000

# optional features
expire-snapshots:
Expand Down
18 changes: 9 additions & 9 deletions dist/src/main/amoro-bin/conf/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ams:
server-expose-host: "127.0.0.1"

thrift-server:
max-message-size: 104857600 # 100MB
max-message-size: 100MB # 104857600
selector-thread-count: 2
selector-queue-size: 4
table-service:
Expand All @@ -37,13 +37,13 @@ ams:
rest-auth-type: token

refresh-external-catalogs:
interval: 180000 # 3min
interval: 3min # 180000
thread-count: 10
queue-size: 1000000

refresh-tables:
thread-count: 10
interval: 60000 # 1min
interval: 1min # 60000
max-pending-partition-count: 100 # default 100

self-optimizing:
Expand All @@ -52,13 +52,13 @@ ams:
runtime-data-expire-interval-hours: 1

optimizer:
heart-beat-timeout: 60000 # 1min
task-ack-timeout: 30000 # 30s
polling-timeout: 3000 # 3s
heart-beat-timeout: 1min # 60000
task-ack-timeout: 30s # 30000
polling-timeout: 3s # 3000
max-planning-parallelism: 1 # default 1

blocker:
timeout: 60000 # 1min
timeout: 1min # 60000

# optional features
expire-snapshots:
Expand Down Expand Up @@ -86,7 +86,7 @@ ams:
auto-create-tags:
enabled: true
thread-count: 3
interval: 60000 # 1min
interval: 1min # 60000

table-manifest-io:
thread-count: 20
Expand Down Expand Up @@ -141,7 +141,7 @@ ams:
limit: 1000
stop-on-error: false
session:
timeout: 30
timeout: 30min # 1800000
local:
using-session-catalog-for-hive: false
spark.sql.iceberg.handle-timestamp-without-timezone: false
Expand Down