github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111549 from claudiubelu/log-compression

Browse Source 
Fixes kubelet log compression on Windows
This commit is contained in:
Kubernetes Prow Robot
2022-08-01 13:18:41 -07:00
committed by GitHub
parent 1e18ff5b37 430ada006d
commit acc64759f5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/logs/container_log_manager.go
View File

@@ -393,11 +393,15 @@ func (c *containerLogManager) compressLog(log string) error {
if _, err := io.Copy(w, r); err != nil { if _, err := io.Copy(w, r); err != nil {
return fmt.Errorf("failed to compress %q to %q: %v", log, tmpLog, err) return fmt.Errorf("failed to compress %q to %q: %v", log, tmpLog, err)
} }
// The archive needs to be closed before renaming, otherwise an error will occur on Windows.
w.Close()
f.Close()
compressedLog := log + compressSuffix compressedLog := log + compressSuffix
if err := c.osInterface.Rename(tmpLog, compressedLog); err != nil { if err := c.osInterface.Rename(tmpLog, compressedLog); err != nil {
return fmt.Errorf("failed to rename %q to %q: %v", tmpLog, compressedLog, err) return fmt.Errorf("failed to rename %q to %q: %v", tmpLog, compressedLog, err)
} }
// Remove old log file. // Remove old log file.
r.Close()
if err := c.osInterface.Remove(log); err != nil { if err := c.osInterface.Remove(log); err != nil {
return fmt.Errorf("failed to remove log %q after compress: %v", log, err) return fmt.Errorf("failed to remove log %q after compress: %v", log, err)
} }