mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-03-06 15:28:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixups and clarity

Browse Source
This commit is contained in:
Aaron H. Alpar
2022-12-05 10:59:59 -08:00
parent 1b653b071b
commit 95a9d18d1c
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cli/command_repository_upgrade.go
View File

@@ -152,19 +152,21 @@ func (c *commandRepositoryUpgrade) validateAction(ctx context.Context, rep repo.
return errors.Wrapf(err, "failed to load index entries for new index")
}
var msgs []string
var msgs []string // a place to keep messages from the index comparison process
// both indexes will have matching contentiDs with matching indexInfo sructures.
for contentID, indexEntryPairs := range indexEntries {
iep0 := indexEntryPairs[0]
iep1 := indexEntryPairs[1]
// compare two index blobs for the same content ID
iep0 := indexEntryPairs[0] // first entry of index entry pair
iep1 := indexEntryPairs[1] // second entry of index entry pair
// check that both the new and old indexes have entries for the same content
if iep0 != nil && iep1 != nil {
// this is the happy-path, check the entries. any problems found will be added to msgs
msgs = append(msgs, checkIndexInfo(iep0, iep1)...)
continue
}
// one of iep0 or iep1 are nil .. find out which one and add an appropriate message.
if iep0 != nil {
msgs = append(msgs, fmt.Sprintf("lop-sided index entries for contentID %q at blob %q", contentID, iep0.GetPackBlobID()))
continue
@@ -173,17 +175,20 @@ func (c *commandRepositoryUpgrade) validateAction(ctx context.Context, rep repo.
msgs = append(msgs, fmt.Sprintf("lop-sided index entries for contentID %q at blob %q", contentID, iep1.GetPackBlobID()))
}
// no msgs means the check passed without finding anything wrong
if len(msgs) == 0 {
log(ctx).Infof("index validation succeeded")
return nil
}
// otherwise there's a problem somewhere ... log the problems
log(ctx).Error("inconsistencies found in migrated index:")
for _, m := range msgs {
log(ctx).Error(m)
}
// and return an error that states something's wrong.
return errors.Wrap(err, "repository will remain locked until index differences are resolved")
}

1
cli/command_repository_upgrade_test.go
View File

@@ -87,7 +87,6 @@ func (s *formatSpecificTestSuite) TestRepositoryCorruptedUpgrade(t *testing.T) {
"--status-poll-interval", "1s",
"--max-permitted-clock-drift", "1s")
require.Contains(t, stderr, "Repository indices have already been migrated to the epoch format, no need to drain other clients")
require.Contains(t, stderr, "Commit mode is set to 'never'. Skipping commit.")
default:
require.Contains(t, out, "Format version: 3")
env.RunAndExpectFailure(t, "repository", "upgrade",