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

stability test: Add stable scheduling e2e test case #524

Merged
merged 2 commits into from
May 29, 2019
Merged

stability test: Add stable scheduling e2e test case #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea72af2
stability test: Add stable scheduling e2e test case
cofyc May 27, 2019
187537c
Merge branch 'master' into fix498
cofyc May 29, 2019
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
17 changes: 17 additions & 0 deletions tests/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ type OperatorActions interface {
BackupRestore(from, to *TidbClusterConfig) error
BackupRestoreOrDie(from, to *TidbClusterConfig)
GetTidbMemberAssignedNodes(info *TidbClusterConfig) (map[string]string, error)
GetTidbMemberAssignedNodesOrDie(info *TidbClusterConfig) map[string]string
CheckTidbMemberAssignedNodes(info *TidbClusterConfig, oldAssignedNodes map[string]string) error
CheckTidbMemberAssignedNodesOrDie(info *TidbClusterConfig, oldAssignedNodes map[string]string)
}

type operatorActions struct {
Expand Down Expand Up @@ -602,7 +604,16 @@ func (oa *operatorActions) GetTidbMemberAssignedNodes(info *TidbClusterConfig) (
return assignedNodes, nil
}

func (oa *operatorActions) GetTidbMemberAssignedNodesOrDie(info *TidbClusterConfig) map[string]string {
result, err := oa.GetTidbMemberAssignedNodes(info)
if err != nil {
slack.NotifyAndPanic(err)
}
return result
}

func (oa *operatorActions) CheckTidbMemberAssignedNodes(info *TidbClusterConfig, oldAssignedNodes map[string]string) error {
glog.Infof("checking tidb member [%s/%s] assigned nodes", info.Namespace, info.ClusterName)
assignedNodes, err := oa.GetTidbMemberAssignedNodes(info)
if err != nil {
return err
Expand All @@ -616,6 +627,12 @@ func (oa *operatorActions) CheckTidbMemberAssignedNodes(info *TidbClusterConfig,
return nil
}

func (oa *operatorActions) CheckTidbMemberAssignedNodesOrDie(info *TidbClusterConfig, oldAssignedNodes map[string]string) {
if err := oa.CheckTidbMemberAssignedNodes(info, oldAssignedNodes); err != nil {
slack.NotifyAndPanic(err)
}
}

func (oa *operatorActions) CheckTidbClusterStatus(info *TidbClusterConfig) error {
glog.Infof("checking tidb cluster [%s/%s] status", info.Namespace, info.ClusterName)

Expand Down
17 changes: 12 additions & 5 deletions tests/cmd/stability/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,14 @@ func main() {
upgardeTiDBVersions := conf.GetUpgradeTidbVersionsOrDie()

operatorCfg := &tests.OperatorConfig{
Namespace: "pingcap",
ReleaseName: "operator",
Image: conf.OperatorImage,
Tag: conf.OperatorTag,
SchedulerImage: "gcr.io/google-containers/hyperkube",
Namespace: "pingcap",
ReleaseName: "operator",
Image: conf.OperatorImage,
Tag: conf.OperatorTag,
SchedulerImage: "gcr.io/google-containers/hyperkube",
SchedulerFeatures: []string{
"StableScheduling",
},
LogLevel: "2",
WebhookServiceName: "webhook-service",
WebhookSecretName: "webhook-secret",
Expand Down Expand Up @@ -235,12 +238,16 @@ func run(oa tests.OperatorActions,

// upgrade cluster1 and cluster2
firstUpgradeVersion := upgardeTiDBVersions[0]
assignedNodes1 := oa.GetTidbMemberAssignedNodesOrDie(cluster1)
assignedNodes2 := oa.GetTidbMemberAssignedNodesOrDie(cluster2)
cluster1.UpgradeAll(firstUpgradeVersion)
cluster2.UpgradeAll(firstUpgradeVersion)
oa.UpgradeTidbClusterOrDie(cluster1)
oa.UpgradeTidbClusterOrDie(cluster2)
oa.CheckTidbClusterStatusOrDie(cluster1)
oa.CheckTidbClusterStatusOrDie(cluster2)
oa.CheckTidbMemberAssignedNodesOrDie(cluster1, assignedNodes1)
oa.CheckTidbMemberAssignedNodesOrDie(cluster2, assignedNodes2)

// after upgrade cluster, clean webhook
oa.CleanWebHookAndService(operatorCfg)
Expand Down