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

Jump to bottom

e2e: Make incremental backup test work #764

Merged
merged 7 commits into from
Aug 13, 2019
Merged

e2e: Make incremental backup test work #764

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7066d6b
e2e:Add json tag to pump statusmap
Aug 12, 2019
674d187
Merge branch 'master' into yinliang/e2e-pump-jsontag
shuijing198799 Aug 12, 2019
abef3a1
e2e: add protocol name in get drainer and pump
Aug 13, 2019
7a045d8
Merge branch 'yinliang/e2e-pump-jsontag' of github.com:shuijing198799…
Aug 13, 2019
f875c67
fix typo
Aug 13, 2019
7e33121
add some log
Aug 13, 2019
0b7457e
delete log and adjust misunderstand of drainer field Synced
Aug 13, 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
14 changes: 7 additions & 7 deletions tests/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2354,7 +2354,7 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
for _, pod := range pods.Items {
if !oa.pumpHealth(info, pod.Spec.Hostname) {
glog.Errorf("some pods is not health %s", pumpStatefulSetName)
// return false, nil
return false, nil
}

if isv1 {
Expand Down Expand Up @@ -2396,7 +2396,7 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
listOps = metav1.ListOptions{
LabelSelector: labels.SelectorFromSet(
map[string]string{
label.ComponentLabelKey: "pump",
label.ComponentLabelKey: "drainer",
label.InstanceLabelKey: drainerStatefulSet.Labels[label.InstanceLabelKey],
label.NameLabelKey: "tidb-cluster",
},
Expand All @@ -2410,7 +2410,7 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
for _, pod := range pods.Items {
if !oa.drainerHealth(info, pod.Spec.Hostname) {
glog.Errorf("some pods is not health %s", drainerStatefulSetName)
// return false, nil
return false, nil
}

if isv1 {
Expand Down Expand Up @@ -2515,15 +2515,15 @@ func (oa *operatorActions) CleanWebHookAndServiceOrDie(info *OperatorConfig) {
}

type pumpStatus struct {
StatusMap map[string]*nodeStatus
StatusMap map[string]*nodeStatus `json:"StatusMap"`
}

type nodeStatus struct {
State string `json:"state"`
}

func (oa *operatorActions) pumpHealth(info *TidbClusterConfig, hostName string) bool {
pumpHealthURL := fmt.Sprintf("%s.%s-pump.%s:8250/status", hostName, info.ClusterName, info.Namespace)
pumpHealthURL := fmt.Sprintf("http://%s.%s-pump.%s:8250/status", hostName, info.ClusterName, info.Namespace)
res, err := http.Get(pumpHealthURL)
if err != nil {
glog.Errorf("cluster:[%s] call %s failed,error:%v", info.ClusterName, pumpHealthURL, err)
Expand Down Expand Up @@ -2561,7 +2561,7 @@ type drainerStatus struct {
}

func (oa *operatorActions) drainerHealth(info *TidbClusterConfig, hostName string) bool {
drainerHealthURL := fmt.Sprintf("%s.%s-drainer.%s:8249/status", hostName, info.ClusterName, info.Namespace)
drainerHealthURL := fmt.Sprintf("http://%s.%s-drainer.%s:8249/status", hostName, info.ClusterName, info.Namespace)
res, err := http.Get(drainerHealthURL)
if err != nil {
glog.Errorf("cluster:[%s] call %s failed,error:%v", info.ClusterName, drainerHealthURL, err)
Expand All @@ -2582,7 +2582,7 @@ func (oa *operatorActions) drainerHealth(info *TidbClusterConfig, hostName strin
glog.Errorf("cluster:[%s] unmarshal failed,error:%v", info.ClusterName, err)
return false
}
return len(healths.PumpPos) > 0 && healths.Synced
return len(healths.PumpPos) > 0
}

func (oa *operatorActions) EmitEvent(info *TidbClusterConfig, message string) {
Expand Down