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

Upgrade panic bug 1.2 dev #18529

Merged
merged 8 commits into from
Sep 6, 2024
Merged

Upgrade panic bug 1.2 dev #18529

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3ac4aa
append log info
qingxinhome Sep 4, 2024
d9a0c4d
recover code
qingxinhome Sep 4, 2024
afe0827
fix version upgrade with same versionOffset
qingxinhome Sep 4, 2024
b1054f9
Merge branch '1.2-dev' into UpgradePanicBug-1.2-dev
mergify[bot] Sep 4, 2024
ea8e9cc
improve code
qingxinhome Sep 5, 2024
021f955
Merge branch 'UpgradePanicBug-1.2-dev' of github.com:qingxinhome/matr…
qingxinhome Sep 5, 2024
29b65e1
improve code
qingxinhome Sep 6, 2024
523ea3b
Merge branch '1.2-dev' into UpgradePanicBug-1.2-dev
qingxinhome Sep 6, 2024
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
22 changes: 16 additions & 6 deletions pkg/bootstrap/service_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,23 @@ func (s *service) doCheckUpgrade(ctx context.Context) error {

getUpgradeLogger().Info("get current mo cluster latest version",
zap.String("latest", v.Version),
zap.String("final", final.Version))
zap.Uint32("latest versionOffset", v.VersionOffset),
zap.String("final", final.Version),
zap.Uint32("final versionOffset", final.VersionOffset))

// cluster is upgrading to v1, only v1's cn can start up.
if !v.IsReady() && v.Version != final.Version {
panic(fmt.Sprintf("cannot upgrade to version %s, because version %s is in upgrading",
final.Version,
v.Version))
if !v.IsReady() {
if v.Version != final.Version {
panic(fmt.Sprintf("cannot upgrade to version %s, because version %s is in upgrading",
final.Version,
v.Version))
} else if v.VersionOffset != final.VersionOffset {
panic(fmt.Sprintf("cannot upgrade to version %s with versionOffset[%d], because version %s with versionOffset[%d] is in upgrading",
final.Version,
final.VersionOffset,
v.Version,
v.VersionOffset))
}
}
// cluster is running at v1, cannot startup a old version to join cluster.
if v.IsReady() && versions.Compare(final.Version, v.Version) < 0 {
Expand Down Expand Up @@ -190,7 +200,7 @@ func (s *service) doCheckUpgrade(ctx context.Context) error {
}

getUpgradeLogger().Info("final version added",
zap.String("final", final.Version))
zap.String("final", final.Version), zap.Uint32("versionOffset", final.VersionOffset))

latest, err := versions.MustGetLatestReadyVersion(txn)
if err != nil {
Expand Down
Loading