From c03d53c8c39200c2396425284efc453d082de1c7 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 27 Aug 2024 12:52:14 -0700 Subject: [PATCH 1/5] HDDS-11375. Bump default hdds.ratis.raft.grpc.message.size.max to 33MB. Change-Id: I355dd25654864c1e917d3c13e0fb99b263d26de5 (cherry picked from commit 0127097cadc3ac318b56e548b6d59f68626faaef) --- .../org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java index 5b283c3a1a3..ad6aab5e8dc 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java @@ -32,13 +32,13 @@ + GrpcConfigKeys.PREFIX) public class DatanodeRatisGrpcConfig { @Config(key = "message.size.max", - defaultValue = "32MB", + defaultValue = "33MB", type = ConfigType.SIZE, tags = {OZONE, CLIENT, PERFORMANCE}, description = "Maximum message size allowed to be received by Grpc " + "Channel (Server)." ) - private int maximumMessageSize = 32 * 1024 * 1024; + private int maximumMessageSize = 33 * 1024 * 1024; public int getMaximumMessageSize() { return maximumMessageSize; From d8f7fdd95aed19693e84bfd861429458e5b3262c Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 27 Aug 2024 15:44:57 -0700 Subject: [PATCH 2/5] Update description. Change-Id: Ic9be1662a348c9c65c4df1140a5fb3aa353b3e50 --- .../org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java index ad6aab5e8dc..c3118cd5ed3 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java @@ -36,7 +36,10 @@ public class DatanodeRatisGrpcConfig { type = ConfigType.SIZE, tags = {OZONE, CLIENT, PERFORMANCE}, description = "Maximum message size allowed to be received by Grpc " + - "Channel (Server)." + "Channel (Server). This value must be at least 1MB greater than " + + "the log appender buffer byte limit, " + + "hdds.container.ratis.log.appender.queue.byte-limit, which is 32MB by default +" + + ". This is to avoid the issue mentioned in RATIS-2135." ) private int maximumMessageSize = 33 * 1024 * 1024; From d2ee0dad29c9c0ae3d20310d80bf0c59614be802 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 27 Aug 2024 15:48:45 -0700 Subject: [PATCH 3/5] Revert "Update description." This reverts commit d8f7fdd95aed19693e84bfd861429458e5b3262c. --- .../org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java index c3118cd5ed3..ad6aab5e8dc 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java @@ -36,10 +36,7 @@ public class DatanodeRatisGrpcConfig { type = ConfigType.SIZE, tags = {OZONE, CLIENT, PERFORMANCE}, description = "Maximum message size allowed to be received by Grpc " + - "Channel (Server). This value must be at least 1MB greater than " + - "the log appender buffer byte limit, " + - "hdds.container.ratis.log.appender.queue.byte-limit, which is 32MB by default +" + - ". This is to avoid the issue mentioned in RATIS-2135." + "Channel (Server)." ) private int maximumMessageSize = 33 * 1024 * 1024; From 35cb83b3d05d17fcf4c7668eb7a9ab57f901618a Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 27 Aug 2024 15:48:54 -0700 Subject: [PATCH 4/5] Revert "HDDS-11375. Bump default hdds.ratis.raft.grpc.message.size.max to 33MB." This reverts commit c03d53c8c39200c2396425284efc453d082de1c7. --- .../org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java index ad6aab5e8dc..5b283c3a1a3 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java @@ -32,13 +32,13 @@ + GrpcConfigKeys.PREFIX) public class DatanodeRatisGrpcConfig { @Config(key = "message.size.max", - defaultValue = "33MB", + defaultValue = "32MB", type = ConfigType.SIZE, tags = {OZONE, CLIENT, PERFORMANCE}, description = "Maximum message size allowed to be received by Grpc " + "Channel (Server)." ) - private int maximumMessageSize = 33 * 1024 * 1024; + private int maximumMessageSize = 32 * 1024 * 1024; public int getMaximumMessageSize() { return maximumMessageSize; From 74468610abfb03a52899e65b28c5362666ba7398 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 27 Aug 2024 18:27:52 -0700 Subject: [PATCH 5/5] Remove predefined hdds.ratis.raft.grpc.message.size.max, and set default hdds.container.ratis.log.appender.queue.byte-limit in the integration test to 32MB Change-Id: I76481ea60a0bd37e5f72007b882f741e9a1a82c6 --- .../hdds/conf/DatanodeRatisGrpcConfig.java | 17 ----------------- .../src/test/resources/ozone-site.xml | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java index 5b283c3a1a3..fde555208b3 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java @@ -31,23 +31,6 @@ @ConfigGroup(prefix = HDDS_DATANODE_RATIS_PREFIX_KEY + "." + GrpcConfigKeys.PREFIX) public class DatanodeRatisGrpcConfig { - @Config(key = "message.size.max", - defaultValue = "32MB", - type = ConfigType.SIZE, - tags = {OZONE, CLIENT, PERFORMANCE}, - description = "Maximum message size allowed to be received by Grpc " + - "Channel (Server)." - ) - private int maximumMessageSize = 32 * 1024 * 1024; - - public int getMaximumMessageSize() { - return maximumMessageSize; - } - - public void setMaximumMessageSize(int maximumMessageSize) { - this.maximumMessageSize = maximumMessageSize; - } - @Config(key = "flow.control.window", defaultValue = "5MB", type = ConfigType.SIZE, diff --git a/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml b/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml index 779ed2b785c..5ea2eb89dfa 100644 --- a/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml +++ b/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml @@ -84,7 +84,7 @@ hdds.container.ratis.log.appender.queue.byte-limit - 8MB + 32MB ozone.om.ratis.log.appender.queue.byte-limit