From 48cb80b051be12b5bbd3d20573f2295f0f605e7b Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 15 Apr 2026 04:31:13 +0000 Subject: [PATCH] appview/pulls: bump service auth client timeout for merges large repos like witchsky seem to require a large request window. the real issue here is the transaction process: we should use the knotstream to identify successful/failed merges, and not depend entirely on the request timeout. additionaly: investigate the root cause of slow merges. Signed-off-by: oppiliappan --- appview/pulls/pulls.go | 1 + 1 file(s) changed, 1 insertion(s)(+), 0 deletion(s)(-) diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go --- a/appview/pulls/pulls.go +++ b/appview/pulls/pulls.go @@ -2370,6 +2370,7 @@ r, oauth.WithService(f.Knot), oauth.WithLxm(tangled.RepoMergeNSID), oauth.WithDev(s.config.Core.Dev), + oauth.WithTimeout(time.Second*20), // merge is quite slow on large repos, like witchsky ) if err != nil { l.Error("failed to connect to knot server", "err", err, "knot", f.Knot) -- tangled.sh