Skip to content

Cherrypick #37013 #37021 to Release 2.70 #37086

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

Merged
shunping merged 2 commits into from
Dec 11, 2025
Merged

Cherrypick #37013 #37021 to Release 2.70 #37086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b871e3
Fix too-many-pings on FnAPI runner under grpc mode (#37013)
shunping Dec 5, 2025
afce87a
Set keepalive policy for prism grpc server. (#37021)
shunping Dec 8, 2025
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: 5 additions & 0 deletions sdks/go/pkg/beam/runners/prism/internal/jobservices/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
jobpb "github.com/apache/beam/sdks/v2/go/pkg/beam/model/jobmanagement_v1"
"github.com/apache/beam/sdks/v2/go/pkg/beam/runners/prism/internal/worker"
"google.golang.org/grpc"
"google.golang.org/grpc/keepalive"
)

type Server struct {
Expand Down Expand Up @@ -80,6 +81,10 @@ func NewServer(port int, execute func(*Job)) *Server {
s.logger.Info("Serving JobManagement", slog.String("endpoint", s.Endpoint()))
opts := []grpc.ServerOption{
grpc.MaxRecvMsgSize(math.MaxInt32),
grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{
MinTime: 20 * time.Second, // Minimum duration a client should wait before sending a keepalive ping
PermitWithoutStream: true, // Allow pings even if there are no active streams
}),
}
s.server = grpc.NewServer(opts...)
jobpb.RegisterJobServiceServer(s.server, s)
Expand Down
13 changes: 9 additions & 4 deletions sdks/python/apache_beam/runners/portability/fn_api_runner/worker_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,15 @@ def __init__(
# received or sent over the data plane. The actual buffer size
# is controlled in a layer above. Also, options to keep the server alive
# when too many pings are received.
options = [("grpc.max_receive_message_length", -1),
("grpc.max_send_message_length", -1),
("grpc.http2.max_pings_without_data", 0),
("grpc.http2.max_ping_strikes", 0)]
options = [
("grpc.max_receive_message_length", -1),
("grpc.max_send_message_length", -1),
("grpc.http2.max_pings_without_data", 0),
("grpc.http2.max_ping_strikes", 0),
# match `grpc.keepalive_time_ms` defined in the client
# (channel_factory.py)
("grpc.http2.min_ping_interval_without_data_ms", 20_000),
]

self.state = state
self.provision_info = provision_info
Expand Down
Loading