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 e878c11 Open more grpc config in the default application.yml (#5379)
e878c11 is described below
commit e878c111582d5a89a731b3a49ef84b33f327d944
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Wed Aug 26 08:48:18 2020 +0800
Open more grpc config in the default application.yml (#5379)
---
docs/en/setup/backend/configuration-vocabulary.md | 25 +++++++++++-----------
.../src/main/resources/application.yml | 17 ++++++++++++++-
2 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/docs/en/setup/backend/configuration-vocabulary.md
b/docs/en/setup/backend/configuration-vocabulary.md
index 6bb7a57..15bf881 100644
--- a/docs/en/setup/backend/configuration-vocabulary.md
+++ b/docs/en/setup/backend/configuration-vocabulary.md
@@ -30,10 +30,10 @@ core|default|role|Option values,
`Mixed/Receiver/Aggregator`. **Receiver** mode
| - | - | instanceNameMaxLength| Max length limitation of service instance
name. The max length of service + instance names should be less than
200.|SW_INSTANCE_NAME_MAX_LENGTH|70|
| - | - | endpointNameMaxLength| Max length limitation of endpoint name. The
max length of service + endpoint names should be less than
240.|SW_ENDPOINT_NAME_MAX_LENGTH|150|
| - | - | searchableTracesTags | Define the set of span tag keys, which should
be searchable through the GraphQL. Multiple values should be separated through
the comma. | SW_SEARCHABLE_TAG_KEYS |
http.method,status_code,db.type,db.instance,mq.queue,mq.topic,mq.broker|
-| - | - | gRPCThreadPoolSize|Pool size of gRPC server| - | CPU core * 4|
-| - | - | gRPCThreadPoolQueueSize| The queue size of gRPC server| - | 10000|
-| - | - | maxConcurrentCallsPerConnection | The maximum number of concurrent
calls permitted for each incoming connection. Defaults to no limit. | - | - |
-| - | - | maxMessageSize | Sets the maximum message size allowed to be
received on the server. Empty means 4 MiB | - | 4M(based on Netty) |
+| - | - | gRPCThreadPoolSize|Pool size of gRPC server|
SW_CORE_GRPC_THREAD_POOL_SIZE | CPU core * 4|
+| - | - | gRPCThreadPoolQueueSize| The queue size of gRPC server|
SW_CORE_GRPC_POOL_QUEUE_SIZE | 10000|
+| - | - | maxConcurrentCallsPerConnection | The maximum number of concurrent
calls permitted for each incoming connection. Defaults to no limit. |
SW_CORE_GRPC_MAX_CONCURRENT_CALL | - |
+| - | - | maxMessageSize | Sets the maximum message size allowed to be
received on the server. Empty means 4 MiB | SW_CORE_GRPC_MAX_MESSAGE_SIZE |
4M(based on Netty) |
| - | - | remoteTimeout |Timeout for cluster internal communication, in
seconds.| - |20|
| - | - | maxSizeOfNetworkAddressAlias|Max size of network address detected in
the be monitored system.| - | 1_000_000|
| - | - | maxPageSizeOfQueryProfileSnapshot|The max size in every OAP query
for snapshot analysis| - | 500 |
@@ -137,14 +137,15 @@ core|default|role|Option values,
`Mixed/Receiver/Aggregator`. **Receiver** mode
| - | - | restHost| Binding IP of restful service. Services include GraphQL
query and HTTP data report| - | - |
| - | - | restPort | Binding port of restful service | - | - |
| - | - | restContextPath| Web context path of restful service| - | - |
-| - | - | gRPCHost|Binding IP of gRPC service. Services include gRPC data
report and internal communication among OAP nodes| - | - |
-| - | - | gRPCPort| Binding port of gRPC service | - | - |
-| - | - | gRPCThreadPoolSize|Pool size of gRPC server| - | CPU core * 4|
-| - | - | gRPCThreadPoolQueueSize| The queue size of gRPC server| - | 10000|
-| - | - | gRPCSslEnabled| Activate SSL for gRPC service | - | - |
-| - | - | gRPCSslKeyPath| The file path of gRPC SSL key| - | - |
-| - | - | gRPCSslCertChainPath| The file path of gRPC SSL cert chain| - | - |
-| - | - | maxConcurrentCallsPerConnection | The maximum number of concurrent
calls permitted for each incoming connection. Defaults to no limit. | - | - |
+| - | - | gRPCHost|Binding IP of gRPC service. Services include gRPC data
report and internal communication among OAP nodes| SW_RECEIVER_GRPC_HOST |
0.0.0.0. Not Activated |
+| - | - | gRPCPort| Binding port of gRPC service | SW_RECEIVER_GRPC_PORT | Not
Activated |
+| - | - | gRPCThreadPoolSize|Pool size of gRPC server|
SW_RECEIVER_GRPC_THREAD_POOL_SIZE | CPU core * 4|
+| - | - | gRPCThreadPoolQueueSize| The queue size of gRPC server|
SW_RECEIVER_GRPC_POOL_QUEUE_SIZE | 10000|
+| - | - | gRPCSslEnabled| Activate SSL for gRPC service |
SW_RECEIVER_GRPC_SSL_ENABLED | false |
+| - | - | gRPCSslKeyPath| The file path of gRPC SSL key|
SW_RECEIVER_GRPC_SSL_KEY_PATH | - |
+| - | - | gRPCSslCertChainPath| The file path of gRPC SSL cert chain|
SW_RECEIVER_GRPC_SSL_CERT_CHAIN_PATH | - |
+| - | - | maxConcurrentCallsPerConnection | The maximum number of concurrent
calls permitted for each incoming connection. Defaults to no limit. |
SW_RECEIVER_GRPC_MAX_CONCURRENT_CALL | - |
+| - | - | authentication | The token text for the authentication. Work for
gRPC connection only. Once this is set, the client is required to use the same
token. | SW_AUTHENTICATION | - |
| receiver-register|default| Read [receiver doc](backend-receivers.md) for
more details | - | - |
| receiver-trace|default| Read [receiver doc](backend-receivers.md) for more
details | - | - |
| receiver-jvm| default| Read [receiver doc](backend-receivers.md) for more
details | - | - |
diff --git a/oap-server/server-bootstrap/src/main/resources/application.yml
b/oap-server/server-bootstrap/src/main/resources/application.yml
index 32d3cdc..d774945 100755
--- a/oap-server/server-bootstrap/src/main/resources/application.yml
+++ b/oap-server/server-bootstrap/src/main/resources/application.yml
@@ -64,6 +64,10 @@ core:
restAcceptQueueSize: ${SW_CORE_REST_JETTY_QUEUE_SIZE:0}
gRPCHost: ${SW_CORE_GRPC_HOST:0.0.0.0}
gRPCPort: ${SW_CORE_GRPC_PORT:11800}
+ maxConcurrentCallsPerConnection: ${SW_CORE_GRPC_MAX_CONCURRENT_CALL:0}
+ maxMessageSize: ${SW_CORE_GRPC_MAX_MESSAGE_SIZE:0}
+ gRPCThreadPoolQueueSize: ${SW_CORE_GRPC_POOL_QUEUE_SIZE:0}
+ gRPCThreadPoolSize: ${SW_CORE_GRPC_THREAD_POOL_SIZE:0}
gRPCSslEnabled: ${SW_CORE_GRPC_SSL_ENABLED:false}
gRPCSslKeyPath: ${SW_CORE_GRPC_SSL_KEY_PATH:""}
gRPCSslCertChainPath: ${SW_CORE_GRPC_SSL_CERT_CHAIN_PATH:""}
@@ -175,14 +179,25 @@ agent-analyzer:
receiver-sharing-server:
selector: ${SW_RECEIVER_SHARING_SERVER:default}
default:
+ # For Jetty server
host: ${SW_RECEIVER_JETTY_HOST:0.0.0.0}
contextPath: ${SW_RECEIVER_JETTY_CONTEXT_PATH:/}
- authentication: ${SW_AUTHENTICATION:""}
jettyMinThreads: ${SW_RECEIVER_SHARING_JETTY_MIN_THREADS:1}
jettyMaxThreads: ${SW_RECEIVER_SHARING_JETTY_MAX_THREADS:200}
jettyIdleTimeOut: ${SW_RECEIVER_SHARING_JETTY_IDLE_TIMEOUT:30000}
jettyAcceptorPriorityDelta: ${SW_RECEIVER_SHARING_JETTY_DELTA:0}
jettyAcceptQueueSize: ${SW_RECEIVER_SHARING_JETTY_QUEUE_SIZE:0}
+ # For gRPC server
+ gRPCHost: ${SW_RECEIVER_GRPC_HOST:0.0.0.0}
+ gRPCPort: ${SW_RECEIVER_GRPC_PORT:0}
+ maxConcurrentCallsPerConnection: ${SW_RECEIVER_GRPC_MAX_CONCURRENT_CALL:0}
+ maxMessageSize: ${SW_RECEIVER_GRPC_MAX_MESSAGE_SIZE:0}
+ gRPCThreadPoolQueueSize: ${SW_RECEIVER_GRPC_POOL_QUEUE_SIZE:0}
+ gRPCThreadPoolSize: ${SW_RECEIVER_GRPC_THREAD_POOL_SIZE:0}
+ gRPCSslEnabled: ${SW_RECEIVER_GRPC_SSL_ENABLED:false}
+ gRPCSslKeyPath: ${SW_RECEIVER_GRPC_SSL_KEY_PATH:""}
+ gRPCSslCertChainPath: ${SW_RECEIVER_GRPC_SSL_CERT_CHAIN_PATH:""}
+ authentication: ${SW_AUTHENTICATION:""}
receiver-register:
selector: ${SW_RECEIVER_REGISTER:default}
default:
