This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push: new 8737725624 Modifying the limit size of DCS gRPC inbound message (#11892) 8737725624 is described below commit 87377256241931af4d68da8bb40ebe4d2b044974 Author: ooi22 <74545513+oo...@users.noreply.github.com> AuthorDate: Fri Feb 23 08:54:45 2024 +0800 Modifying the limit size of DCS gRPC inbound message (#11892) --- docs/en/changes/changes.md | 1 + docs/en/setup/backend/configuration-vocabulary.md | 1 + .../oap/server/configuration/grpc/GRPCConfigWatcherRegister.java | 1 + .../skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java | 1 + oap-server/server-starter/src/main/resources/application.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index d84775062a..118d0ab995 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -54,6 +54,7 @@ * Mock `/api/v1/status/buildinfo` for PromQL API. * Fix table exists check in the JDBC Storage Plugin. * Fix day-based table rolling time range strategy in JDBC storage. +* Add `maxInboundMessageSize (SW_DCS_MAX_INBOUND_MESSAGE_SIZE)` configuration to change the max inbound message size of DCS. #### UI diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md index 3b30be2475..4dd361ffb1 100644 --- a/docs/en/setup/backend/configuration-vocabulary.md +++ b/docs/en/setup/backend/configuration-vocabulary.md @@ -281,6 +281,7 @@ The Configuration Vocabulary lists all available configurations provided by `app | - | - | port | DCS server binding port. [...] | - | - | clusterName | Cluster name when reading the latest configuration from DSC server. [...] | - | - | period | The period of reading data from DSC server by the OAP (in seconds). [...] +| - | - | maxInboundMessageSize | The max inbound message size of gRPC. [...] | - | apollo | apolloMeta | `apollo.meta` in Apollo. [...] | - | - | apolloCluster | `apollo.cluster` in Apollo. [...] | - | - | apolloEnv | `env` in Apollo. [...] diff --git a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java index 7fd028261b..0fe131db1d 100644 --- a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java +++ b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java @@ -44,6 +44,7 @@ public class GRPCConfigWatcherRegister extends FetchingConfigWatcherRegister { stub = ConfigurationServiceGrpc.newBlockingStub( NettyChannelBuilder.forAddress(settings.getHost(), settings.getPort()) .usePlaintext() + .maxInboundMessageSize(settings.getMaxInboundMessageSize()) .build()); } diff --git a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java index f692d90633..02178a8783 100644 --- a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java +++ b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java @@ -30,6 +30,7 @@ public class RemoteEndpointSettings extends ModuleConfig { private String clusterName = "default"; // Sync configuration per 60 seconds. private int period = 60; + private int maxInboundMessageSize = 4194304; @Override public String toString() { diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index 501bbf2a3a..02a043d491 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -485,6 +485,7 @@ configuration: port: ${SW_DCS_SERVER_PORT:80} clusterName: ${SW_DCS_CLUSTER_NAME:SkyWalking} period: ${SW_DCS_PERIOD:20} + maxInboundMessageSize: ${SW_DCS_MAX_INBOUND_MESSAGE_SIZE:4194304} apollo: apolloMeta: ${SW_CONFIG_APOLLO:http://localhost:8080} apolloCluster: ${SW_CONFIG_APOLLO_CLUSTER:default}