From 6ac25c9ece67b4e1e5bac5e6428e1e68ccae82e3 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Fri, 24 Apr 2026 15:56:22 -0500 Subject: [PATCH] fix: reduce re-registration interval to 5s to prevent replica staleness flapping (#24597) --- enterprise/wsproxy/wsproxysdk/wsproxysdk.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/enterprise/wsproxy/wsproxysdk/wsproxysdk.go b/enterprise/wsproxy/wsproxysdk/wsproxysdk.go index 34b63ce642..d33df7bffa 100644 --- a/enterprise/wsproxy/wsproxysdk/wsproxysdk.go +++ b/enterprise/wsproxy/wsproxysdk/wsproxysdk.go @@ -313,8 +313,11 @@ func (l *RegisterWorkspaceProxyLoop) register(ctx context.Context) (RegisterWork // Start starts the proxy registration loop. The provided context is only used // for the initial registration. Use Close() to stop. func (l *RegisterWorkspaceProxyLoop) Start(ctx context.Context) (RegisterWorkspaceProxyResponse, error) { + // Workspace proxy re-registrations should be on the same interval as the rest of the replicasync. + // If they differ significantly it can cause problems with meshing. if l.opts.Interval == 0 { - l.opts.Interval = 15 * time.Second + // Default to the same interval as the rest of the replicasync. + l.opts.Interval = 5 * time.Second } if l.opts.MaxFailureCount == 0 { l.opts.MaxFailureCount = 10