Skip to content

USHIFT-1088 Refuse to start if existing data is older than 1 y-stream #1944

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

Merged
openshift-merge-robot merged 1 commit into from
Jun 21, 2023
Merged

USHIFT-1088 Refuse to start if existing data is older than 1 y-stream #1944

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions pkg/admin/prerun/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ func getVersionOfData() (versionMetadata, error) {
return versionMetadataFromString(string(versionFileContents))
}

// checkVersionDiff compares versions of executable and existing data for purposes of data migration.
// It returns true if the migration should be performed.
func checkVersionDiff(execVer, dataVer versionMetadata) (bool, error) {
if execVer == dataVer {
return false, nil
Expand All @@ -118,5 +120,13 @@ func checkVersionDiff(execVer, dataVer versionMetadata) (bool, error) {
return false, fmt.Errorf("executable (%s) is older than existing data (%s): migrating data to older version is not supported", execVer.String(), dataVer.String())
}

if execVer.Minor > dataVer.Minor {
if execVer.Minor-1 == dataVer.Minor {
return true, nil
} else {
Copy link
Copy Markdown
Contributor

@dhellmann dhellmann Jun 21, 2023

Choose a reason for hiding this comment

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

nit: this else isn't needed, the code will fall through to the alternative case.

return false, fmt.Errorf("executable (%s) is too recent compared to existing data (%s): maximum minor version difference is 1", execVer.String(), dataVer.String())
}
}

return false, nil
}
14 changes: 14 additions & 0 deletions pkg/admin/prerun/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,20 @@ func TestCheckVersionDiff(t *testing.T) {
expectedMigrationRequired: false,
errExpected: true,
},
{
name: "binary must be newer only by one minor version",
execVer: versionMetadata{Major: 4, Minor: 15},
dataVer: versionMetadata{Major: 4, Minor: 14},
expectedMigrationRequired: true,
errExpected: false,
},
{
name: "binary newer more than one minor version is not supported",
execVer: versionMetadata{Major: 4, Minor: 15},
dataVer: versionMetadata{Major: 4, Minor: 13},
expectedMigrationRequired: false,
errExpected: true,
},
}

for _, td := range testData {
Expand Down