Skip to content

fix: use standard httpbase error response in runner handler and propagate upstream error in remote_runner #1238

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

Merged
HaiHui886 merged 6 commits into from
Jul 8, 2026
Merged

fix: use standard httpbase error response in runner handler and propagate upstream error in remote_runner #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
662ecc4
fix: use standard httpbase error response in runner handler and propa…
CementZhang Jul 5, 2026
88711f2
fix: use standard httpbase error response in runner handler and propa…
CementZhang Jul 5, 2026
3afdecc
fix lint failed
Jul 7, 2026
7f3b0c3
Merge branch 'sync_mr_2693_4d15634' of https://github.com/OpenCSGs/cs…
Jul 7, 2026
2df9bb7
Merge remote-tracking branch 'origin/main' into sync_mr_2693_4d15634
Jul 7, 2026
13fe514
remove unuse files
Jul 7, 2026
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
4 changes: 2 additions & 2 deletions builder/deploy/imagerunner/remote_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ func (h *RemoteRunner) doRequest(ctx context.Context, method, url string, data i
return nil, errorx.RemoteSvcFail(err, nil)
}
slog.WarnContext(ctx, "remote runner response with", slog.Any("StatusCode", resp.StatusCode), slog.Any("result", result))
err = fmt.Errorf("unexpected http status: %d", resp.StatusCode)
return nil, err
err = fmt.Errorf("unexpected http status: %d, upstream error: %s", resp.StatusCode, result.Msg)
return nil, errorx.RemoteSvcFail(err, nil)
}

return resp, nil
Expand Down
47 changes: 23 additions & 24 deletions runner/handler/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package handler
import (
"database/sql"
"errors"
"fmt"
"io"
"log/slog"
"net/http"
Expand Down Expand Up @@ -46,15 +47,15 @@ func (s *K8sHandler) RunService(c *gin.Context) {
err := c.BindJSON(&request)
if err != nil {
slog.ErrorContext(c.Request.Context(), "runService get bad request", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
httpbase.BadRequest(c, err.Error())
return
}
svcName := s.getServiceNameFromRequest(c)
request.SvcName = svcName
err = s.serviceComponent.RunService(c.Request.Context(), *request)
if err != nil {
slog.Error("fail to run service", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
slog.ErrorContext(c.Request.Context(), "fail to run service", slog.Any("error", err), slog.Any("req", request))
httpbase.ServerError(c, err)
return
}
slog.Info("service created successfully", slog.String("svc_name", svcName), slog.Int64("deploy_id", request.DeployID))
Expand All @@ -67,15 +68,15 @@ func (s *K8sHandler) StopService(c *gin.Context) {

if err != nil {
slog.ErrorContext(c.Request.Context(), "stop service get bad request", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
httpbase.BadRequest(c, err.Error())
return
}
svcName := s.getServiceNameFromRequest(c)
request.SvcName = svcName
resp, err := s.serviceComponent.StopService(c.Request.Context(), *request)
if err != nil {
slog.ErrorContext(c.Request.Context(), "failed to stop service", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
httpbase.ServerError(c, err)
return
}

Expand All @@ -92,15 +93,15 @@ func (s *K8sHandler) UpdateService(c *gin.Context) {

if err != nil {
slog.ErrorContext(c.Request.Context(), "updateService get bad request", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
httpbase.BadRequest(c, err.Error())
return
}
svcName := s.getServiceNameFromRequest(c)
request.SvcName = svcName
resp, err := s.serviceComponent.UpdateService(c.Request.Context(), *request)
if err != nil {
slog.ErrorContext(c.Request.Context(), "failed to update service", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
httpbase.ServerError(c, err)
return
}
slog.Info("service updated", slog.String("svc_name", svcName))
Expand All @@ -114,7 +115,7 @@ func (s *K8sHandler) ServiceStatus(c *gin.Context) {
err := c.BindJSON(request)
if err != nil {
slog.ErrorContext(c.Request.Context(), "serviceStatus get bad request", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
httpbase.BadRequest(c, err.Error())
return
}
svcName := s.getServiceNameFromRequest(c)
Expand All @@ -128,7 +129,7 @@ func (s *K8sHandler) ServiceStatus(c *gin.Context) {
return
}
slog.ErrorContext(c.Request.Context(), "failed to get service", slog.Any("error", err), slog.String("svc_name", svcName))
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to get service"})
httpbase.ServerError(c, fmt.Errorf("failed to get service"))
return
}
c.JSON(http.StatusOK, resp)
Expand All @@ -140,20 +141,20 @@ func (s *K8sHandler) ServiceLogs(c *gin.Context) {

if err != nil {
slog.ErrorContext(c.Request.Context(), "get bad request", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
httpbase.BadRequest(c, err.Error())
return
}
cluster, err := s.clusterPool.GetClusterByID(c, request.ClusterID)
if err != nil {
slog.ErrorContext(c.Request.Context(), "fail to get cluster ", slog.Any("error", err))
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
httpbase.BadRequest(c, err.Error())
return
}
svcName := s.getServiceNameFromRequest(c)
podNames, err := s.serviceComponent.GetServicePods(c.Request.Context(), cluster, svcName, s.k8sNameSpace, 1)
if err != nil {
slog.ErrorContext(c.Request.Context(), "failed to read image logs, cannot get pods info", slog.Any("error", err), slog.String("svc_name", svcName))
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to get pods info"})
httpbase.ServerError(c, fmt.Errorf("failed to get pods info"))
return
}
podName := ""
Expand All @@ -169,13 +170,13 @@ func (s *K8sHandler) ServiceLogsByPod(c *gin.Context) {

if err != nil {
slog.ErrorContext(c.Request.Context(), "serviceLogs get bad request", slog.Any("error", err), slog.Any("req", request))
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
httpbase.BadRequest(c, err.Error())
return
}
cluster, err := s.clusterPool.GetClusterByID(c, request.ClusterID)
if err != nil {
slog.ErrorContext(c.Request.Context(), "fail to get cluster ", slog.Any("error", err))
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
httpbase.BadRequest(c, err.Error())
return
}
svcName := s.getServiceNameFromRequest(c)
Expand All @@ -193,7 +194,7 @@ func (s *K8sHandler) getLogsByPod(c *gin.Context, cluster *cluster.Cluster, podN
if err != nil {
slog.ErrorContext(c.Request.Context(), "check pod existence", slog.Any("namespace", s.k8sNameSpace), slog.Any("pod-name", podName),
slog.Any("clusterID", cluster.ID), slog.Any("error", err))
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to check pod existence"})
httpbase.ServerError(c, fmt.Errorf("failed to check pod existence"))
return
}
}
Expand Down Expand Up @@ -234,7 +235,7 @@ func (s *K8sHandler) readPodLogsFromCluster(c *gin.Context, cluster *cluster.Clu
stream, message, err := rcommon.GetPodLogStream(c.Request.Context(), cluster.Client, podName, s.k8sNameSpace, rTypes.UserContainerName)
if err != nil {
slog.ErrorContext(c.Request.Context(), "Failed to open stream", slog.Any("error", err))
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to open stream"})
httpbase.ServerError(c, fmt.Errorf("failed to open stream"))
return
}
defer func() {
Expand All @@ -244,12 +245,10 @@ func (s *K8sHandler) readPodLogsFromCluster(c *gin.Context, cluster *cluster.Clu
}()

if message != "" {
c.JSON(http.StatusBadRequest, gin.H{"error": message})
httpbase.BadRequest(c, message)
return
}

// TODO miss web socket

setResponseHeaderForLogs(c)

// Flush the header by calling http.Flusher if supported.
Expand Down Expand Up @@ -320,20 +319,20 @@ func (s *K8sHandler) GetReplica(c *gin.Context) {
err := c.BindJSON(request)
if err != nil {
slog.ErrorContext(c.Request.Context(), "fail to parse input parameters", slog.Any("error", err))
c.JSON(http.StatusInternalServerError, gin.H{"error": "fail to parse input parameters"})
httpbase.ServerError(c, fmt.Errorf("fail to parse input parameters"))
return
}
svcName := s.getServiceNameFromRequest(c)
svc, err := s.serviceComponent.GetServiceByName(c.Request.Context(), svcName, request.ClusterID)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
slog.ErrorContext(c.Request.Context(), "fail to get service", slog.Any("error", err))
c.JSON(http.StatusInternalServerError, gin.H{"error": "fail to get service"})
httpbase.ServerError(c, fmt.Errorf("fail to get service"))
return
}
if svc == nil {
// service not exist
slog.ErrorContext(c.Request.Context(), "service not exist")
c.JSON(http.StatusNotFound, gin.H{"error": "service not exist"})
httpbase.NotFoundError(c, fmt.Errorf("service not exist"))
return
}

Expand Down Expand Up @@ -400,7 +399,7 @@ func (s *K8sHandler) GetServiceInfo(c *gin.Context) {
err := c.BindJSON(request)
if err != nil {
slog.ErrorContext(c.Request.Context(), "fail to parse input parameters", slog.Any("error", err))
c.JSON(http.StatusInternalServerError, gin.H{"error": "fail to parse input parameters"})
httpbase.ServerError(c, fmt.Errorf("fail to parse input parameters"))
return
}

Expand All @@ -409,7 +408,7 @@ func (s *K8sHandler) GetServiceInfo(c *gin.Context) {
resp, err := s.serviceComponent.GetServiceInfo(c.Request.Context(), *request)
if err != nil {
slog.ErrorContext(c.Request.Context(), "fail to get service info", slog.Any("error", err))
c.JSON(http.StatusInternalServerError, gin.H{"error": "fail to get service info"})
httpbase.ServerError(c, fmt.Errorf("fail to get service info"))
return
}
c.JSON(http.StatusOK, resp)
Expand Down
Loading