Fix delete BackupPolicy error #276
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp>
Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp>
ymmt2005
reviewed
Jul 6, 2021
Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp>
ymmt2005
requested changes
Jul 6, 2021
backup/backup.go
Outdated
| @@ -418,7 +418,7 @@ func (bm *BackupManager) backupBinlog(ctx context.Context, op bkop.Operator) err | |||
| pw2 = nil | |||
|
|
|||
| bw := &ByteCountWriter{} | |||
| key := calcKey(bm.cluster.Namespace, bm.cluster.Name, constants.BinlogFilename, lastBackup.Time.Time) | |||
| key := calcKey(bm.cluster.Namespace, bm.cluster.Name, constants.BinlogFilename, lastBackup.Time.Time.UTC()) | |||
There was a problem hiding this comment.
This is a bug by itself that is worth another issue or PR.
Also, I think the conversion to UTC should happen in calcKey because by doing so, any use of calcKey is protected.
In fact, there is another use of calcKey in this same file.
There was a problem hiding this comment.
Alright. Will create another PR for it, and convert time zone inside calcKey.
backup/integration_test.go
Outdated
| @@ -194,7 +194,7 @@ var _ = Describe("Backup/Restore", func() { | |||
| Expect(bc.contents).To(HaveLen(1)) | |||
|
|
|||
| time.Sleep(1100 * time.Millisecond) | |||
| restorePoint := time.Now() | |||
| restorePoint := time.Now().UTC() | |||
There was a problem hiding this comment.
Why do we need this conversion?
There was a problem hiding this comment.
It's not necessary. Will revert.
Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Yusuke Suzuki yusuke-suzuki@cybozu.co.jp