Set shorter syncthing timeouts (#952)

Signed-off-by: Pablo Chico de Guzman <pchico83@gmail.com>
okteto · Jun 25, 2020 · c15cdd0 · c15cdd0
1 parent fc9f957
commit c15cdd0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/k8s/pods/pod.go b/pkg/k8s/pods/pod.go
@@ -91,7 +91,7 @@ func ListBySelector(namespace string, selector map[string]string, c kubernetes.I
 // GetDevPodInLoop returns the dev pod for a deployment and loops until it success
 func GetDevPodInLoop(ctx context.Context, dev *model.Dev, c *kubernetes.Clientset, waitUntilDeployed bool) (*apiv1.Pod, error) {
 	ticker := time.NewTicker(500 * time.Millisecond)
-	to := 2 * config.GetTimeout() // 60 seconds
+	to := 4 * config.GetTimeout() // 120 seconds
 	timeout := time.Now().Add(to)
 
 	for i := 0; ; i++ {

diff --git a/pkg/syncthing/api.go b/pkg/syncthing/api.go
@@ -45,8 +45,13 @@ func (s *Syncthing) APICall(ctx context.Context, url, method string, code int, p
 	var urlPath string
 	if local {
 		urlPath = path.Join(s.GUIAddress, url)
+		s.Client.Timeout = 2 * time.Second
 	} else {
 		urlPath = path.Join(s.RemoteGUIAddress, url)
+		s.Client.Timeout = 5 * time.Second
+	}
+	if url == "rest/events" || url == "rest/db/completion" {
+		s.Client.Timeout = 20 * time.Second
 	}
 
 	req, err := http.NewRequest(method, fmt.Sprintf("http://%s", urlPath), bytes.NewBuffer(body))