Skip to content

Add configurable request timeout via environment variable in RequestReply ingress handler #8785

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add configurable request timeout via environment variable in RequestReply ingress handler #8785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion pkg/requestreply/ingress_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package requestreply

import (
"os"
"context"
"fmt"
"net/http"
Expand Down Expand Up @@ -56,6 +57,8 @@ type IngressHandler struct {

requestLock sync.RWMutex
entries map[types.NamespacedName]map[string]*proxiedRequest

requestTimeout time.Duration
}

type proxiedRequest struct {
Expand All @@ -75,6 +78,17 @@ func NewHandler(logger *zap.Logger, requestReplyInformer eventingv1alpha1informe
clientConfig := eventingtls.ClientConfig{
TrustBundleConfigMapLister: trustBundleConfigMapLister,
}
timeout := time.Minute
if val := os.Getenv("REQUEST_REPLY_TIMEOUT"); val != "" {
if parsed, err := time.ParseDuration(val); err == nil {
timeout = parsed
logger.Info("Configured request timeout from env", zap.String("REQUEST_REPLY_TIMEOUT", val))
} else {
logger.Warn("Failed to parse REQUEST_REPLY_TIMEOUT, using default 1m", zap.Error(err))
}
} else {
logger.Info("Using default 1m request timeout (env not set)")
}

requestReplyInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: func(obj any) {
Expand All @@ -97,6 +111,7 @@ func NewHandler(logger *zap.Logger, requestReplyInformer eventingv1alpha1informe
keyStore: keyStore,

entries: make(map[types.NamespacedName]map[string]*proxiedRequest),
requestTimeout: timeout,
}

}
Expand Down Expand Up @@ -158,7 +173,7 @@ func (h *IngressHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
return
}

ctx, cancel := context.WithTimeout(context.Background(), time.Minute) // TODO: make this timeout configurable
ctx, cancel := context.WithTimeout(context.Background(), h.requestTimeout)
defer cancel()

if isReplyEvent {
Expand Down