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

Jump to bottom

fix for a bug #2226 #2231

Merged
merged 8 commits into from
Feb 3, 2020
Merged

fix for a bug #2226 #2231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6acebe1
fix for a bug #2226 I think
Jan 30, 2020
cb9ad42
got my go build working; added nil-safe check also
Jan 30, 2020
47da136
simplified code slightly by combining both edge cases into a single i…
Jan 31, 2020
39a5751
improved tests
Jan 31, 2020
e969e3b
Revert "improved tests"
Jan 31, 2020
0e2cbb1
improved tests
Jan 31, 2020
d7968d9
improved tests by removing unneeded code
Jan 31, 2020
58b5ce4
suppressed extraneous warning
Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 17 additions & 12 deletions pkg/restic/exec_commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,20 @@ func RunBackup(backupCmd *Command, log logrus.FieldLogger, updateFunc func(veler
select {
case <-ticker.C:
lastLine := getLastLine(stdoutBuf.Bytes())
stat, err := decodeBackupStatusLine(lastLine)
if err != nil {
log.WithError(err).Errorf("error getting restic backup progress")
}

// if the line contains a non-empty bytes_done field, we can update the
// caller with the progress
if stat.BytesDone != 0 {
updateFunc(velerov1api.PodVolumeOperationProgress{
TotalBytes: stat.TotalBytes,
BytesDone: stat.BytesDone,
})
if len(lastLine) > 0 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it'd be more consistent with go style to invert this, so e.g.

if len(lastLine) == 0 {
    break
}

...

so the main logic can be less indented. this is not a merge-blocking comment, though.

stat, err := decodeBackupStatusLine(lastLine)
if err != nil {
log.WithError(err).Errorf("error getting restic backup progress")
}

// if the line contains a non-empty bytes_done field, we can update the
// caller with the progress
if stat.BytesDone != 0 {
updateFunc(velerov1api.PodVolumeOperationProgress{
TotalBytes: stat.TotalBytes,
BytesDone: stat.BytesDone,
})
}
}
case <-quit:
ticker.Stop()
Expand Down Expand Up @@ -153,6 +155,9 @@ func decodeBackupStatusLine(lastLine []byte) (backupStatusLine, error) {
// have a newline at the end of it, so this returns the substring between the
// last two newlines.
func getLastLine(b []byte) []byte {
if b == nil || len(b) == 0 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should be able to just do if len(b) == 0 { since a nil slice also has a length of zero. Not blocking.

return []byte("")
}
// subslice the byte array to ignore the newline at the end of the string
lastNewLineIdx := bytes.LastIndex(b[:len(b)-1], []byte("\n"))
return b[lastNewLineIdx+1 : len(b)-1]
Expand Down
12 changes: 7 additions & 5 deletions pkg/restic/exec_commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,17 @@ func Test_getSummaryLine(t *testing.T) {

func Test_getLastLine(t *testing.T) {
tests := []struct {
output string
output []byte
want string
}{
{`last line
`, "last line"},
{`first line
{[]byte(`last line
`), "last line"},
{[]byte(`first line
second line
third line
`, "third line"},
`), "third line"},
{[]byte(""), ""},
{nil, ""},
}
for _, tt := range tests {
t.Run(tt.want, func(t *testing.T) {
Expand Down