Skip to content
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

feat: turn healthCheckHttpClient timeout from 500ms to 3s #1321

Merged
merged 1 commit into from
Oct 15, 2024
Merged

feat: turn healthCheckHttpClient timeout from 500ms to 3s #1321

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions controllers/workspace/devworkspace_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,10 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
reconcileStatus.setConditionTrue(conditions.DeploymentReady, "DevWorkspace deployment ready")

serverReady, serverStatusCode, err := checkServerStatus(clusterWorkspace)
if err != nil {
return reconcile.Result{}, err
if shouldReturn, reconcileResult, reconcileErr := r.checkDWError(workspace, err, "Error checking server status", metrics.ReasonInfrastructureFailure, reqLogger, &reconcileStatus); shouldReturn {
reqLogger.Info("Waiting for DevWorkspace health check endpoint to become available")
reconcileStatus.setConditionFalse(dw.DevWorkspaceReady, "Waiting for workspace health check to become available")
return reconcileResult, reconcileErr
}
if !serverReady {
reqLogger.Info("Main URL server not ready", "status-code", serverStatusCode)
Expand Down
3 changes: 2 additions & 1 deletion controllers/workspace/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/devworkspace-operator/pkg/common"
"github.com/devfile/devworkspace-operator/pkg/dwerrors"
"github.com/devfile/devworkspace-operator/pkg/provision/sync"

"github.com/go-logr/logr"
Expand Down Expand Up @@ -211,7 +212,7 @@ func checkServerStatus(workspace *common.DevWorkspaceWithConfig) (ok bool, respo

resp, err := healthCheckHttpClient.Get(healthz.String())
if err != nil {
return false, nil, err
return false, nil, &dwerrors.RetryError{Err: err, Message: "Failed to check server status", RequeueAfter: 1 * time.Second}
}
if (resp.StatusCode / 100) == 4 {
// Assume endpoint is unimplemented and/or * is covered with authentication.
Expand Down
Loading