Skip to content

[release-4.20] OCPBUGS-63249: Ensure revision.json persists on ungraceful shutdown #1501

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

Open
wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
+13 −8
Open

[release-4.20] OCPBUGS-63249: Ensure revision.json persists on ungraceful shutdown #1501

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
21 changes: 13 additions & 8 deletions pkg/cmd/rev/rev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,24 @@ func trySaveRevision(ctx context.Context, endpoints []string, outputFile string,
}

tmpPath := fmt.Sprintf("%s.tmp", outputFile)
file, err := os.OpenFile(tmpPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
file, err := os.OpenFile(tmpPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC|os.O_SYNC, 0644)
if err != nil {
klog.Errorf("error opening file: %v", err)
return
}
defer func() {
if err = file.Close(); err != nil {
klog.Errorf("error closing file: %v", err)
if closeErr := file.Close(); closeErr != nil {
klog.Errorf("error closing file: %v", closeErr)
return
}
// Only rename if no error occurred before
if err != nil {
klog.Errorf("could not create temporary revision.json, keeping current version: %v", err)
return
}
if err = os.Rename(tmpPath, outputFile); err != nil {
klog.Errorf("error during rename to destination file: %v", err)
return
}
}()

Expand All @@ -205,11 +215,6 @@ func trySaveRevision(ctx context.Context, endpoints []string, outputFile string,
klog.Errorf("error writing result to file: %v", err)
return
}

if err = os.Rename(tmpPath, outputFile); err != nil {
klog.Errorf("error during rename to destination file: %v", err)
return
}
}

func newETCD3Client(ctx context.Context, endpoints []string, tlsInfo transport.TLSInfo) (*clientv3.Client, error) {
Expand Down