Skip to content

Commit

Permalink
stability: use fault-trigger at e2e tests and add some log (pingcap#330)
Browse files Browse the repository at this point in the history
  • Loading branch information
cwen0 authored and weekface committed Mar 21, 2019
1 parent 2c9f47d commit b2376e6
Show file tree
Hide file tree
Showing 12 changed files with 355 additions and 39 deletions.
37 changes: 8 additions & 29 deletions tests/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ const (
defaultRawSize = 100
)

func NewOperatorActions(cli versioned.Interface, kubeCli kubernetes.Interface, logDir string) OperatorActions {
func NewOperatorActions(cli versioned.Interface, kubeCli kubernetes.Interface, cfg *Config) OperatorActions {
return &operatorActions{
cli: cli,
kubeCli: kubeCli,
pdControl: controller.NewDefaultPDControl(),
logDir: logDir,
cfg: cfg,
}
}

Expand Down Expand Up @@ -96,32 +96,11 @@ type OperatorActions interface {
getBackupDir(info *TidbClusterInfo) ([]string, error)
}

type FaultTriggerActions interface {
StopNode(nodeName string) error
StartNode(nodeName string) error
StopEtcd() error
StartEtcd() error
StopKubeAPIServer() error
StartKubeAPIServer() error
StopKubeControllerManager() error
StartKubeControllerManager() error
StopKubeScheduler() error
StartKubeScheduler() error
StopKubelet(nodeName string) error
StartKubelet(nodeName string) error
StopKubeProxy(nodeName string) error
StartKubeProxy(nodeName string) error
DiskCorruption(nodeName string) error
NetworkPartition(fromNode, toNode string) error
NetworkDelay(fromNode, toNode string) error
DockerCrash(nodeName string) error
}

type operatorActions struct {
cli versioned.Interface
kubeCli kubernetes.Interface
pdControl controller.PDControlInterface
logDir string
cfg *Config
}

var _ = OperatorActions(&operatorActions{})
Expand Down Expand Up @@ -915,27 +894,27 @@ func (oa *operatorActions) monitorNormal(clusterInfo *TidbClusterInfo) (bool, er
return false, nil
}
if monitorDeployment.Status.ReadyReplicas < 1 {
glog.Info("monitor ready replicas %d < 1", monitorDeployment.Status.ReadyReplicas)
glog.Infof("monitor ready replicas %d < 1", monitorDeployment.Status.ReadyReplicas)
return false, nil
}
configuratorJobName := fmt.Sprintf("%s-monitor-configurator", tcName)
monitorJob, err := oa.kubeCli.BatchV1().Jobs(ns).Get(configuratorJobName, metav1.GetOptions{})
if err != nil {
glog.Info("get monitor configurator job: [%s/%s] failed", ns, configuratorJobName)
glog.Infof("get monitor configurator job: [%s/%s] failed", ns, configuratorJobName)
return false, nil
}
if monitorJob.Status.Succeeded == 0 {
glog.Info("the monitor configurator job: [%s/%s] had not success", ns, configuratorJobName)
glog.Infof("the monitor configurator job: [%s/%s] had not success", ns, configuratorJobName)
return false, nil
}

if err := oa.checkPrometheus(clusterInfo); err != nil {
glog.Info("check [%s/%s]'s prometheus data failed: %v", ns, monitorDeploymentName, err)
glog.Infof("check [%s/%s]'s prometheus data failed: %v", ns, monitorDeploymentName, err)
return false, nil
}

if err := oa.checkGrafanaData(clusterInfo); err != nil {
glog.Info("check [%s/%s]'s grafana data failed: %v", ns, monitorDeploymentName, err)
glog.Infof("check [%s/%s]'s grafana data failed: %v", ns, monitorDeploymentName, err)
return false, nil
}
return true, nil
Expand Down
23 changes: 23 additions & 0 deletions tests/cmd/e2e/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
nodes:
- physical_node: 172.16.4.39
nodes:
- 172.16.4.171
- 172.16.4.172
- 172.16.4.173
- physical_node: 172.16.4.40
nodes:
- 172.16.4.174
- 172.16.4.175
- 172.16.4.176
etcds:
- physical_node: 172.16.4.39
nodes:
- 172.16.4.171
- 172.16.4.172
- 172.16.4.173
apiservers:
- physical_node: 172.16.4.39
nodes:
- 172.16.4.171
- 172.16.4.172
- 172.16.4.173
22 changes: 19 additions & 3 deletions tests/cmd/e2e/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
package main

import (
"flag"
"net/http"
_ "net/http/pprof"
"time"

"github.com/golang/glog"
"github.com/pingcap/tidb-operator/pkg/client/clientset/versioned"
Expand All @@ -36,10 +36,15 @@ func perror(err error) {
}

func main() {
flag.Parse()
logs.InitLogs()
defer logs.FlushLogs()

conf := tests.NewConfig()
err := conf.Parse()
if err != nil {
glog.Fatalf("failed to parse config: %v", err)
}

go func() {
glog.Info(http.ListenAndServe("localhost:6060", nil))
}()
Expand All @@ -57,7 +62,7 @@ func main() {
glog.Fatalf("failed to get kubernetes Clientset: %v", err)
}

oa := tests.NewOperatorActions(cli, kubeCli, "/logDir")
oa := tests.NewOperatorActions(cli, kubeCli, conf)

operatorInfo := &tests.OperatorInfo{
Namespace: "pingcap",
Expand Down Expand Up @@ -218,4 +223,15 @@ func main() {
oa.DumpAllLogs(operatorInfo, []*tests.TidbClusterInfo{clusterInfo, restoreClusterInfo})
glog.Fatal(err)
}

fa := tests.NewFaultTriggerAction(cli, kubeCli, conf)
if err := fa.StopETCD("172.16.4.171"); err != nil {
glog.Fatal(err)
}

time.Sleep(1 * time.Minute)

if err := fa.StartETCD("172.16.4.171"); err != nil {
glog.Fatal(err)
}
}
65 changes: 65 additions & 0 deletions tests/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package tests

import (
"flag"
"io/ioutil"

yaml "gopkg.in/yaml.v2"
)

// Config defines the config of operator tests
type Config struct {
configFile string

LogDir string `yaml:"log_dir" json:"log_dir"`
FaultTriggerPort int `yaml:"fault_trigger_port" json:"fault_trigger_port"`
Nodes []Nodes `yaml:"nodes" json:"nodes"`
ETCDs []Nodes `yaml:"etcds" json:"etcds"`
APIServers []Nodes `yaml:"apiservers" json:"apiservers"`
}

// Nodes defines a series of nodes that belong to the same physical node.
type Nodes struct {
PhysicalNode string `yaml:"physical_node" json:"physical_node"`
Nodes []string `yaml:"nodes" json:"nodes"`
}

// NewConfig creates a new config.
func NewConfig() *Config {
cfg := &Config{}
flag.StringVar(&cfg.configFile, "config", "/etc/e2e/config.yaml", "Config file")
flag.StringVar(&cfg.LogDir, "log-dir", "/logDir", "log directory")
flag.IntVar(&cfg.FaultTriggerPort, "fault-trigger-port", 23332, "the http port of fault trigger service")

return cfg
}

// Parse parses flag definitions from the argument list.
func (c *Config) Parse() error {
// Parse first to get config file
flag.Parse()

if c.configFile != "" {
if err := c.configFromFile(c.configFile); err != nil {
return err
}
}

// Parse again to replace with command line options.
flag.Parse()

return nil
}

func (c *Config) configFromFile(path string) error {
data, err := ioutil.ReadFile(path)
if err != nil {
return err
}

if err = yaml.Unmarshal(data, c); err != nil {
return err
}

return nil
}
174 changes: 174 additions & 0 deletions tests/fault.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
package tests

import (
"fmt"

"github.com/golang/glog"
"github.com/pingcap/tidb-operator/pkg/client/clientset/versioned"
"github.com/pingcap/tidb-operator/pkg/controller"
"github.com/pingcap/tidb-operator/tests/pkg/fault-trigger/client"
"github.com/pingcap/tidb-operator/tests/pkg/fault-trigger/manager"
"k8s.io/client-go/kubernetes"
)

type FaultTriggerActions interface {
StopNode(physicalNode string, node string) error
StartNode(physicalNode string, node string) error
StopETCD(nodes ...string) error
StartETCD(nodes ...string) error
StopKubelet(node string) error
StartKubelet(node string) error
// TODO: support more faults
// StopKubeAPIServer() error
// StartKubeAPIServer() error
// StopKubeControllerManager() error
// StartKubeControllerManager() error
// StopKubeScheduler() error
// StartKubeScheduler() error
// StopKubeProxy(node string) error
// StartKubeProxy(node string) error
// DiskCorruption(node string) error
// NetworkPartition(fromNode, toNode string) error
// NetworkDelay(fromNode, toNode string) error
// DockerCrash(nodeName string) error
}

func NewFaultTriggerAction(cli versioned.Interface, kubeCli kubernetes.Interface, cfg *Config) FaultTriggerActions {
return &faultTriggerActions{
cli: cli,
kubeCli: kubeCli,
pdControl: controller.NewDefaultPDControl(),
cfg: cfg,
}
}

type faultTriggerActions struct {
cli versioned.Interface
kubeCli kubernetes.Interface
pdControl controller.PDControlInterface
cfg *Config
}

func (fa *faultTriggerActions) StopNode(physicalNode string, node string) error {
faultCli := client.NewClient(client.Config{
Addr: fa.genFaultTriggerAddr(physicalNode),
})

err := faultCli.StopVM(&manager.VM{
IP: node,
})

if err != nil {
glog.Errorf("failed to stop node %s on physical node: %s: %v", node, physicalNode, err)
return err
}

glog.Infof("node %s on physical node %s is stopped", node, physicalNode)

return nil
}

func (fa *faultTriggerActions) StartNode(physicalNode string, node string) error {
faultCli := client.NewClient(client.Config{
Addr: fa.genFaultTriggerAddr(physicalNode),
})

err := faultCli.StartVM(&manager.VM{
IP: node,
})

if err != nil {
glog.Errorf("failed to start node %s on physical node %s: %v", node, physicalNode, err)
return err
}

glog.Infof("node %s on physical node %s is started", physicalNode, node)

return nil
}

// StopETCD stops the etcd service.
// If the `nodes` is empty, StopEtcd will stop all etcd service.
func (fa *faultTriggerActions) StopETCD(nodes ...string) error {
if len(nodes) == 0 {
for _, ns := range fa.cfg.ETCDs {
nodes = append(nodes, ns.Nodes...)
}
}

for _, node := range nodes {
faultCli := client.NewClient(client.Config{
Addr: fa.genFaultTriggerAddr(node),
})

if err := faultCli.StopETCD(); err != nil {
glog.Errorf("failed to stop etcd %s: %v", node, err)
return err
}

glog.Infof("etcd %s is stopped", node)
}

return nil
}

// StartETCD starts the etcd service.
// If the `nodes` is empty, StartETCD will start all etcd service.
func (fa *faultTriggerActions) StartETCD(nodes ...string) error {
if len(nodes) == 0 {
for _, ns := range fa.cfg.ETCDs {
nodes = append(nodes, ns.Nodes...)
}
}

for _, node := range nodes {
faultCli := client.NewClient(client.Config{
Addr: fa.genFaultTriggerAddr(node),
})

if err := faultCli.StartETCD(); err != nil {
glog.Errorf("failed to start etcd %s: %v", node, err)
return err
}

glog.Infof("etcd %s is started", node)
}

return nil
}

// StopKubelet stops the kubelet service.
func (fa *faultTriggerActions) StopKubelet(node string) error {
faultCli := client.NewClient(client.Config{
Addr: fa.genFaultTriggerAddr(node),
})

if err := faultCli.StopKubelet(); err != nil {
glog.Errorf("failed to stop kubelet %s: %v", node, err)
return err
}

glog.Infof("kubelet %s is stopped", node)

return nil
}

// StartKubelet starts the kubelet service.
func (fa *faultTriggerActions) StartKubelet(node string) error {
faultCli := client.NewClient(client.Config{
Addr: node,
})

if err := faultCli.StartKubelet(); err != nil {
glog.Errorf("failed to start kubelet %s: %v", node, err)
return err
}

glog.Infof("kubelet %s is started", node)

return nil
}

func (fa *faultTriggerActions) genFaultTriggerAddr(node string) string {
return fmt.Sprintf("%s:%d", node, fa.cfg.FaultTriggerPort)
}
Loading

0 comments on commit b2376e6

Please sign in to comment.