update e2e lifecycle test to test store reconciliation on every node

This commit is contained in:
Pavel Sviderski
2024-12-02 17:21:06 +10:00
parent 349dd0d2ef
commit 6a4a7f2e6a
2 changed files with 57 additions and 12 deletions
+1 -1
View File
@@ -474,7 +474,7 @@ func (m *Machine) configureCorrosion() error {
Plaintext: true,
},
API: corroservice.APIConfig{
Addr: netip.AddrPortFrom(netip.AddrFrom4([4]byte{127, 0, 0, 1}), corroservice.DefaultAPIPort),
Addr: m.config.CorrosionAPIAddr,
},
Admin: corroservice.AdminConfig{
Path: filepath.Join(m.config.CorrosionDir, "admin.sock"),
+55 -10
View File
@@ -2,25 +2,33 @@ package e2e
import (
"context"
"github.com/docker/docker/client"
dockerclient "github.com/docker/docker/client"
"github.com/stretchr/testify/require"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/emptypb"
"testing"
"time"
"uncloud/internal/cli/client"
"uncloud/internal/cli/client/connector"
"uncloud/internal/machine/api/pb"
"uncloud/internal/ucind"
)
func createTestCluster(t *testing.T, name string, opts ucind.CreateClusterOptions) (*ucind.Provisioner, ucind.Cluster) {
dockerCli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
dockerCli, err := dockerclient.NewClientWithOpts(dockerclient.FromEnv, dockerclient.WithAPIVersionNegotiation())
require.NoError(t, err)
p := ucind.NewProvisioner(dockerCli, nil)
ctx := context.Background()
// Remove the cluster if it already exists. It could be left from a previous interrupted test run.
require.NoError(t, p.RemoveCluster(ctx, name))
c, err := p.CreateCluster(ctx, name, opts)
require.NoError(t, err)
t.Cleanup(func() {
err = p.RemoveCluster(ctx, name)
require.NoError(t, err)
require.NoError(t, p.RemoveCluster(ctx, name))
})
return p, c
@@ -32,15 +40,52 @@ func TestClusterLifecycle(t *testing.T) {
var (
name = "test-cluster-lifecycle"
ctx = context.Background()
p *ucind.Provisioner
c ucind.Cluster
)
t.Run("create", func(t *testing.T) {
p, c = createTestCluster(t, name, ucind.CreateClusterOptions{Machines: 3})
p, c := createTestCluster(t, name, ucind.CreateClusterOptions{Machines: 3})
require.Equal(t, name, c.Name)
require.Len(t, c.Machines, 3)
t.Run("each machine reconciled cluster store", func(t *testing.T) {
var err error
// Create a client for each machine and wait for it to be ready.
clients := make([]*client.Client, len(c.Machines))
for i, m := range c.Machines {
require.NoError(t, p.WaitMachineReady(ctx, m))
clients[i], err = client.New(ctx, connector.NewTCPConnector(m.APIAddress))
require.NoError(t, err)
//goland:noinspection GoDeferInLoop
defer clients[i].Close()
}
// Any machine should work as a cluster API endpoint, e.g. be able to list all machines in the cluster.
for _, cli := range clients {
// Wait for the machine to reconcile the cluster store.
require.Eventually(t, func() bool {
machines, err := cli.ListMachines(ctx, &emptypb.Empty{})
if err != nil {
// FailedPrecondition "cluster is not initialised" is expected until the store is reconciled.
if s, ok := status.FromError(err); ok {
if s.Code() == codes.FailedPrecondition {
return false
}
}
require.NoError(t, err)
}
if len(machines.Machines) != 3 {
return false
}
for _, m := range machines.Machines {
if pb.MachineMember_UP != m.State {
return false
}
}
return true
}, 15*time.Second, 50*time.Millisecond)
}
})
t.Run("remove", func(t *testing.T) {