From 385088944201f42de63d62b7b01fa71f6fa0ee83 Mon Sep 17 00:00:00 2001 From: shihuixing Date: Fri, 9 Feb 2024 15:14:27 +0800 Subject: [PATCH] improve description and update CHANGELOG-3.5.md Signed-off-by: shihuixing --- CHANGELOG/CHANGELOG-3.5.md | 6 ++++++ server/etcdmain/grpc_proxy.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG/CHANGELOG-3.5.md b/CHANGELOG/CHANGELOG-3.5.md index 5f0b66e22..afd5e16e1 100644 --- a/CHANGELOG/CHANGELOG-3.5.md +++ b/CHANGELOG/CHANGELOG-3.5.md @@ -18,6 +18,12 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/ - Compile binaries using [go 1.20.13](https://github.com/etcd-io/etcd/pull/17275) - Upgrade [golang.org/x/crypto to v0.17+ to address CVE-2023-48795](https://github.com/etcd-io/etcd/pull/17346) +### etcd grpc-proxy + +- Add [`etcd grpc-proxy start --dial-keepalive-time`](https://github.com/etcd-io/etcd/pull/17366) flag to keepalive time for client(grpc-proxy) connections. +- Add [`etcd grpc-proxy start --dial-keepalive-timeout`](https://github.com/etcd-io/etcd/pull/17366) flag to keepalive timeout for client(grpc-proxy) connections. +- Add [`etcd grpc-proxy start --permit-without-stream`](https://github.com/etcd-io/etcd/pull/17366) flag to enable client(grpc-proxy) to send keepalive pings even with no active RPCs. + ## v3.5.11 (2023-12-07) ### etcd server diff --git a/server/etcdmain/grpc_proxy.go b/server/etcdmain/grpc_proxy.go index 85233f0b5..f3c789f5f 100644 --- a/server/etcdmain/grpc_proxy.go +++ b/server/etcdmain/grpc_proxy.go @@ -143,7 +143,7 @@ func newGRPCProxyStartCommand() *cobra.Command { cmd.Flags().DurationVar(&grpcProxyEndpointsAutoSyncInterval, "endpoints-auto-sync-interval", 0, "etcd endpoints auto sync interval (disabled by default)") cmd.Flags().DurationVar(&grpcProxyDialKeepAliveTime, "dial-keepalive-time", 0, "keepalive time for client(grpc-proxy) connections (default 0, disable).") cmd.Flags().DurationVar(&grpcProxyDialKeepAliveTimeout, "dial-keepalive-timeout", embed.DefaultGRPCKeepAliveTimeout, "keepalive timeout for client(grpc-proxy) connections (default 20s).") - cmd.Flags().BoolVar(&grpcProxyPermitWithoutStream, "permit-without-stream", false, "if true, client(grpc-proxy) sends keepalive pings even with no active RPCs (default false).") + cmd.Flags().BoolVar(&grpcProxyPermitWithoutStream, "permit-without-stream", false, "Enable client(grpc-proxy) to send keepalive pings even with no active RPCs.") cmd.Flags().StringVar(&grpcProxyAdvertiseClientURL, "advertise-client-url", "127.0.0.1:23790", "advertise address to register (must be reachable by client)") cmd.Flags().StringVar(&grpcProxyResolverPrefix, "resolver-prefix", "", "prefix to use for registering proxy (must be shared with other grpc-proxy members)") cmd.Flags().IntVar(&grpcProxyResolverTTL, "resolver-ttl", 0, "specify TTL, in seconds, when registering proxy endpoints")