Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions pkg/manager/member/tidb_member_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2798,6 +2798,19 @@ func TestTiDBMemberManagerSetServerLabels(t *testing.T) {
},
setCount: 0,
},
{
name: "sha256 version string",
tidbVersion: "d7f62aab6315b4378cbbfaaaaaaaaaaaaaaaa90ecaf7e0f22d2225304822ee2e",
members: []Member{
{
node: "node-1",
},
{
node: "node-2",
},
},
setCount: 2,
},
{
name: "skip unhealthy pods",
members: []Member{
Expand Down
31 changes: 30 additions & 1 deletion pkg/util/cmpver/cmpver.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package cmpver

import (
"encoding/hex"
"fmt"
"strings"

Expand Down Expand Up @@ -98,8 +99,12 @@ func NewConstraint(op Operation, version string) (*Constraint, error) {
// Dirty versions and pre versions are regarded as standard version.
// For example: 'v5.1.2-dev' and 'v5.1.2-betav1' are regarded as 'v5.1.2'.
//
// Latest, nightly or master version is larger than any version
// sha256, Latest, nightly or master version is larger than any version
func (c *Constraint) Check(version string) (bool, error) {
if isSha(version) {
return compareSha(c.op), nil
}

if isLatest(version) {
return compareLatest(c.op), nil
}
Expand Down Expand Up @@ -155,3 +160,27 @@ func compareLatest(op Operation) bool {

return false
}

func isSha(version string) bool {
if len(version) != 64 {
return false
}
_, err := hex.DecodeString(version)
if err != nil {
return false
}

return true
}

func compareSha(op Operation) bool {
// Sha is greater than any version
switch op {
case Greater, GreaterOrEqual:
return true
case Less, LessOrEqual:
return false
}

return false
}
4 changes: 4 additions & 0 deletions pkg/util/cmpver/cmpver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func genTestCases() []testcase {
{"latest-dev", Greater, "v5.3.1", true},
{"nightly-dev", Greater, "v5.3.1", true},
{"master-dev", Greater, "v5.3.1", true},
{"d7f62aab6315b4378cbbfaaaaaaaaaaaaaaaa90ecaf7e0f22d2225304822ee2e", Greater, "v5.3.1", true},
// GreaterOrEqual
{"v5.3.1", GreaterOrEqual, "v5.1.2", true},
{"5.3.1", GreaterOrEqual, "5.1.2", true},
Expand All @@ -90,6 +91,7 @@ func genTestCases() []testcase {
{"latest-dev", GreaterOrEqual, "v5.3.1", true},
{"nightly-dev", GreaterOrEqual, "v5.3.1", true},
{"master-dev", GreaterOrEqual, "v5.3.1", true},
{"d7f62aab6315b4378cbbfaaaaaaaaaaaaaaaa90ecaf7e0f22d2225304822ee2e", GreaterOrEqual, "v5.3.1", true},
// Less
{"v5.3.1", Less, "v5.1.2", false},
{"v5.1.2", Less, "v5.3.1", true},
Expand All @@ -104,6 +106,7 @@ func genTestCases() []testcase {
{"latest-dev", Less, "v5.3.1", false},
{"nightly-dev", Less, "v5.3.1", false},
{"master-dev", Less, "v5.3.1", false},
{"d7f62aab6315b4378cbbfaaaaaaaaaaaaaaaa90ecaf7e0f22d2225304822ee2e", Less, "v5.3.1", false},
// LessOrEqual
{"v5.3.1", LessOrEqual, "v5.1.2", false},
{"5.3.1", LessOrEqual, "5.1.2", false},
Expand All @@ -118,5 +121,6 @@ func genTestCases() []testcase {
{"latest-dev", LessOrEqual, "v5.3.1", false},
{"nightly-dev", LessOrEqual, "v5.3.1", false},
{"master-dev", LessOrEqual, "v5.3.1", false},
{"d7f62aab6315b4378cbbfaaaaaaaaaaaaaaaa90ecaf7e0f22d2225304822ee2e", LessOrEqual, "v5.3.1", false},
}
}