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

br: volume-snapshot may lead to a panic when there is no block change between two snapshot #4922

Merged
merged 9 commits into from
Mar 7, 2023
Merged

br: volume-snapshot may lead to a panic when there is no block change between two snapshot #4922

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc54ac7
fix: add a new check for encryption during the volume snapshot restore
fengou1 Feb 28, 2023
f07c1c3
Merge branch 'master' into issue_4913
fengou1 Feb 28, 2023
6a26fca
fix: refactor code according to comments
fengou1 Mar 1, 2023
3cc6471
fix: unit test with tikv configuration
fengou1 Mar 3, 2023
47a1772
fix: fix unit test issue
fengou1 Mar 3, 2023
23edbbc
fix: json format in unit test
fengou1 Mar 4, 2023
11310d4
fix: json in unit test for tikv config
fengou1 Mar 4, 2023
16cef29
fix: remote data change rate since it always 1 from test result and m…
fengou1 Mar 7, 2023
29e36e0
Merge branch 'master' into issue_4921
fengou1 Mar 7, 2023
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
6 changes: 2 additions & 4 deletions cmd/backup-manager/app/util/backup_size.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ func changedBlocksSize(preSnapshotId string, snapshotId string) (uint64, uint64,
}

var nextToken *string
var blockSize uint64

for {
resp, err := ebsSession.EBS.ListChangedBlocks(&ebs.ListChangedBlocksInput{
Expand All @@ -350,8 +349,7 @@ func changedBlocksSize(preSnapshotId string, snapshotId string) (uint64, uint64,
// retrieve only changed block and blocks only existed in current snapshot (new add blocks)
for _, block := range resp.ChangedBlocks {
if block.SecondBlockToken != nil && resp.BlockSize != nil {
blockSize = uint64(*resp.BlockSize)
snapshotSize += 1 * blockSize
snapshotSize += uint64(*resp.BlockSize)
}
}

Expand All @@ -361,6 +359,6 @@ func changedBlocksSize(preSnapshotId string, snapshotId string) (uint64, uint64,
}
nextToken = resp.NextToken
}
klog.Infof("the total size of snapshot %d, num of api ListChangedBlocks request %d, snapshot id %s, data change rate %.4f", snapshotSize, numApiReq, snapshotId, float64(snapshotSize/blockSize)/float64(numBlocks))
klog.Infof("the total size of snapshot %d, num of api ListChangedBlocks request %d, snapshot id %s", snapshotSize, numApiReq, snapshotId)
return snapshotSize, numApiReq, nil
}