scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kubelet server was not returning a 500 on errors writing logs

Browse Source 
Writing 200 first masks the second error. 200 is defaulted by the Go
http stack automatically.
This commit is contained in:
Clayton Coleman
2016-01-28 00:15:44 -05:00
parent 4f559b3af7
commit 8448b60f51
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/server/server.go
View File

@@ -440,7 +440,6 @@ func (s *Server) getContainerLogs(request *restful.Request, response *restful.Re
fw = limitwriter.New(fw, *logOptions.LimitBytes) fw = limitwriter.New(fw, *logOptions.LimitBytes)
} }
response.Header().Set("Transfer-Encoding", "chunked") response.Header().Set("Transfer-Encoding", "chunked")
response.WriteHeader(http.StatusOK)
if err := s.host.GetKubeletContainerLogs(kubecontainer.GetPodFullName(pod), containerName, logOptions, fw, fw); err != nil { if err := s.host.GetKubeletContainerLogs(kubecontainer.GetPodFullName(pod), containerName, logOptions, fw, fw); err != nil {
if err != limitwriter.ErrMaximumWrite { if err != limitwriter.ErrMaximumWrite {
response.WriteError(http.StatusInternalServerError, err) response.WriteError(http.StatusInternalServerError, err)