mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-09 22:47:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

first attempt at disconnect

Browse Source
This commit is contained in:
William Banfield
2022-11-30 19:00:25 -05:00
parent 01c896d622
commit d2ef43b449
6 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/pkg/infra/digitalocean/digitalocean.go
View File

@@ -42,3 +42,17 @@ func (p Provider) TerminateTendermint(ctx context.Context, n *e2e.Node) error {
func (p Provider) KillTendermint(ctx context.Context, n *e2e.Node) error {
return e2essh.Exec(p.SSHConfig, fmt.Sprintf("%s:%d", n.IP, sshPort), fmt.Sprintf("systemctl -s SIGKILL %s", testappName))
}
func (p Provider) Disconnect(ctx context.Context, n *e2e.Node) error {
return e2essh.MultiExec(p.SSHConfig, fmt.Sprintf("%s:%d", n.IP, sshPort),
"iptables -A INPUT -p tcp --destination-port 26656 -j DROP",
"iptables -A OUTPUT -p tcp --destination-port 26656 -j DROP",
"service iptables save",
)
}
func (p Provider) Connect(ctx context.Context, n *e2e.Node) error {
return e2essh.MultiExec(p.SSHConfig, fmt.Sprintf("%s:%d", n.IP, sshPort),
"iptables -D INPUT -p tcp --destination-port 26656 -j DROP",
"iptables -D OUTPUT -p tcp --destination-port 26656 -j DROP",
"service iptables save",
)
}

6
test/e2e/pkg/infra/docker/docker.go
View File

@@ -47,6 +47,12 @@ func (p Provider) TerminateTendermint(ctx context.Context, n *e2e.Node) error {
func (p Provider) KillTendermint(ctx context.Context, n *e2e.Node) error {
return ExecCompose(ctx, p.Testnet.Dir, "kill", "-s", "SIGKILL", n.Name)
}
func (p Provider) Connect(ctx context.Context, n *e2e.Node) error {
return Exec(ctx, "network", "connect", p.Testnet.Name+"_"+p.Testnet.Name, n.Name)
}
func (p Provider) Disconnect(ctx context.Context, n *e2e.Node) error {
return Exec(ctx, "network", "disconnect", p.Testnet.Name+"_"+p.Testnet.Name, n.Name)
}
// dockerComposeBytes generates a Docker Compose config file for a testnet and returns the
// file as bytes to be written out to disk.

4
test/e2e/pkg/infra/provider.go
View File

@@ -18,6 +18,8 @@ type Provider interface {
StartTendermint(context.Context, *e2e.Node) error
KillTendermint(context.Context, *e2e.Node) error
TerminateTendermint(context.Context, *e2e.Node) error
Connect(context.Context, *e2e.Node) error
Disconnect(context.Context, *e2e.Node) error
}
// NoopProvider implements the provider interface by performing noops for every
@@ -31,5 +33,7 @@ func (NoopProvider) CreateNode(_ context.Context, _ *e2e.Node) error {
func (NoopProvider) StartTendermint(_ context.Context, _ *e2e.Node) error { return nil }
func (NoopProvider) TerminateTendermint(_ context.Context, _ *e2e.Node) error { return nil }
func (NoopProvider) KillTendermint(_ context.Context, _ *e2e.Node) error { return nil }
func (NoopProvider) Connect(_ context.Context, _ *e2e.Node) error { return nil }
func (NoopProvider) Disconnect(_ context.Context, _ *e2e.Node) error { return nil }
var _ Provider = NoopProvider{}

16
test/e2e/pkg/ssh/ssh.go
View File

@@ -27,6 +27,22 @@ func Exec(cfg *ssh.ClientConfig, addr, cmd string) error {
return nil
}
func MultiExec(cfg *ssh.ClientConfig, addr string, cmds ...string) error {
c, err := ssh.Dial("tcp", addr, cfg)
s, err := c.NewSession()
if err != nil {
return err
}
defer s.Close()
for _, cmd := range cmds {
err := s.Run(cmd)
if err != nil {
return err
}
}
return nil
}
func NewClientConfig() (*ssh.ClientConfig, error) {
ss := os.Getenv("SSH_AUTH_SOCK")
if ss == "" {

4
test/e2e/runner/main.go
View File

@@ -137,7 +137,7 @@ func NewCLI() *CLI {
}
if cli.testnet.HasPerturbations() {
if err := Perturb(cli.testnet); err != nil {
if err := Perturb(cli.testnet, cli.infp); err != nil {
return err
}
if err := Wait(cli.testnet, 5); err != nil { // allow some txs to go through
@@ -210,7 +210,7 @@ func NewCLI() *CLI {
Use: "perturb",
Short: "Perturbs the Docker testnet, e.g. by restarting or disconnecting nodes",
RunE: func(cmd *cobra.Command, args []string) error {
return Perturb(cli.testnet)
return Perturb(cli.testnet, cli.infp)
},
})

11
test/e2e/runner/perturb.go
View File

@@ -8,14 +8,15 @@ import (
"github.com/tendermint/tendermint/libs/log"
rpctypes "github.com/tendermint/tendermint/rpc/core/types"
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
"github.com/tendermint/tendermint/test/e2e/pkg/infra"
"github.com/tendermint/tendermint/test/e2e/pkg/infra/docker"
)
// Perturbs a running testnet.
func Perturb(testnet *e2e.Testnet) error {
func Perturb(testnet *e2e.Testnet, ifp infra.Provider) error {
for _, node := range testnet.Nodes {
for _, perturbation := range node.Perturbations {
_, err := PerturbNode(node, perturbation)
_, err := PerturbNode(node, perturbation, ifp)
if err != nil {
return err
}
@@ -27,16 +28,16 @@ func Perturb(testnet *e2e.Testnet) error {
// PerturbNode perturbs a node with a given perturbation, returning its status
// after recovering.
func PerturbNode(node *e2e.Node, perturbation e2e.Perturbation) (*rpctypes.ResultStatus, error) {
func PerturbNode(node *e2e.Node, perturbation e2e.Perturbation, ifp infra.Provider) (*rpctypes.ResultStatus, error) {
testnet := node.Testnet
switch perturbation {
case e2e.PerturbationDisconnect:
logger.Info("perturb node", "msg", log.NewLazySprintf("Disconnecting node %v...", node.Name))
if err := docker.Exec(context.Background(), "network", "disconnect", testnet.Name+"_"+testnet.Name, node.Name) ; err != nil {
if err := ifp.Disconnect(context.Background(), node); err != nil {
return nil, err
}
time.Sleep(10 * time.Second)
if err := docker.Exec(context.Background(), "network", "connect", testnet.Name+"_"+testnet.Name, node.Name) ; err != nil {
if err := ifp.Connect(context.Background(), node); err != nil {
return nil, err
}