2020-09-02 15:24:16 +00:00
|
|
|
package state
|
|
|
|
|
|
|
|
import (
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
memdb "github.com/hashicorp/go-memdb"
|
|
|
|
"github.com/stretchr/testify/require"
|
2021-07-23 18:42:23 +00:00
|
|
|
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
2022-07-27 16:08:51 +00:00
|
|
|
"github.com/hashicorp/consul/sdk/testutil"
|
2020-09-02 15:24:16 +00:00
|
|
|
)
|
|
|
|
|
2021-08-18 14:27:15 +00:00
|
|
|
func TestStateStore_Usage_NodeUsage(t *testing.T) {
|
2020-09-02 15:24:16 +00:00
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
// No nodes have been registered, and thus no usage entry exists
|
2021-08-18 14:27:15 +00:00
|
|
|
idx, usage, err := s.NodeUsage()
|
2020-09-02 15:24:16 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(0))
|
2021-08-18 14:27:15 +00:00
|
|
|
require.Equal(t, usage.Nodes, 0)
|
2020-09-02 15:24:16 +00:00
|
|
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
|
2021-08-18 14:27:15 +00:00
|
|
|
idx, usage, err = s.NodeUsage()
|
2020-09-02 15:24:16 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(1))
|
2021-08-18 14:27:15 +00:00
|
|
|
require.Equal(t, usage.Nodes, 2)
|
2020-09-02 15:24:16 +00:00
|
|
|
}
|
|
|
|
|
2021-08-18 14:27:15 +00:00
|
|
|
func TestStateStore_Usage_NodeUsage_Delete(t *testing.T) {
|
2020-09-02 15:24:16 +00:00
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
|
2021-08-18 14:27:15 +00:00
|
|
|
idx, usage, err := s.NodeUsage()
|
2020-09-02 15:24:16 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(1))
|
2021-08-18 14:27:15 +00:00
|
|
|
require.Equal(t, usage.Nodes, 2)
|
2020-09-02 15:24:16 +00:00
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
require.NoError(t, s.DeleteNode(2, "node2", nil, ""))
|
2021-08-18 14:27:15 +00:00
|
|
|
idx, usage, err = s.NodeUsage()
|
2020-09-02 15:24:16 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(2))
|
2021-08-18 14:27:15 +00:00
|
|
|
require.Equal(t, usage.Nodes, 1)
|
2020-09-02 15:24:16 +00:00
|
|
|
}
|
|
|
|
|
2022-07-27 16:08:51 +00:00
|
|
|
// Test that nodes added/deleted from peers are not counted.
|
|
|
|
func TestStateStore_Usage_NodeUsagePeering(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
// Register two nodes, one local, one from a remote peer.
|
|
|
|
testRegisterNodePeer(t, s, 0, "node1", "peer")
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
|
|
|
|
testutil.RunStep(t, "write node", func(t *testing.T) {
|
|
|
|
// Test that we're only tracking the local node.
|
|
|
|
idx, usage, err := s.NodeUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, uint64(1), idx)
|
|
|
|
require.Equal(t, 1, usage.Nodes)
|
|
|
|
})
|
|
|
|
|
|
|
|
testutil.RunStep(t, "delete node", func(t *testing.T) {
|
|
|
|
// Deregister the remote peered node. Count should remain the same.
|
|
|
|
require.NoError(t, s.DeleteNode(2, "node1", nil, "peer"))
|
|
|
|
idx, usage, err := s.NodeUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, uint64(1), idx)
|
|
|
|
require.Equal(t, 1, usage.Nodes)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-09-17 19:36:34 +00:00
|
|
|
func TestStateStore_Usage_KVUsage(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
2021-09-21 15:52:46 +00:00
|
|
|
// No keys have been registered, and thus no usage entry exists
|
2021-09-17 19:36:34 +00:00
|
|
|
idx, usage, err := s.KVUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(0))
|
|
|
|
require.Equal(t, usage.KVCount, 0)
|
|
|
|
|
|
|
|
testSetKey(t, s, 0, "key-1", "0", nil)
|
|
|
|
testSetKey(t, s, 1, "key-2", "0", nil)
|
|
|
|
testSetKey(t, s, 2, "key-2", "1", nil)
|
|
|
|
|
|
|
|
idx, usage, err = s.KVUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(2))
|
|
|
|
require.Equal(t, usage.KVCount, 2)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestStateStore_Usage_KVUsage_Delete(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
testSetKey(t, s, 0, "key-1", "0", nil)
|
|
|
|
testSetKey(t, s, 1, "key-2", "0", nil)
|
|
|
|
testSetKey(t, s, 2, "key-2", "1", nil)
|
|
|
|
|
|
|
|
idx, usage, err := s.KVUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(2))
|
|
|
|
require.Equal(t, usage.KVCount, 2)
|
|
|
|
|
|
|
|
require.NoError(t, s.KVSDelete(3, "key-2", nil))
|
|
|
|
idx, usage, err = s.KVUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(3))
|
|
|
|
require.Equal(t, usage.KVCount, 1)
|
|
|
|
}
|
|
|
|
|
2020-09-02 15:24:16 +00:00
|
|
|
func TestStateStore_Usage_ServiceUsageEmpty(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
// No services have been registered, and thus no usage entry exists
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(0))
|
|
|
|
require.Equal(t, usage.Services, 0)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 0)
|
2021-09-30 21:15:26 +00:00
|
|
|
for k := range usage.ConnectServiceInstances {
|
|
|
|
require.Equal(t, 0, usage.ConnectServiceInstances[k])
|
|
|
|
}
|
2020-09-02 15:24:16 +00:00
|
|
|
}
|
|
|
|
|
2021-08-18 14:27:15 +00:00
|
|
|
func TestStateStore_Usage_ServiceUsage(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
testRegisterService(t, s, 8, "node1", "service1")
|
|
|
|
testRegisterService(t, s, 9, "node2", "service1")
|
|
|
|
testRegisterService(t, s, 10, "node2", "service2")
|
2021-09-30 21:15:26 +00:00
|
|
|
testRegisterSidecarProxy(t, s, 11, "node1", "service1")
|
|
|
|
testRegisterSidecarProxy(t, s, 12, "node2", "service1")
|
2021-09-30 21:48:21 +00:00
|
|
|
testRegisterConnectNativeService(t, s, 13, "node1", "service-native")
|
|
|
|
testRegisterConnectNativeService(t, s, 14, "node2", "service-native")
|
|
|
|
testRegisterConnectNativeService(t, s, 15, "node2", "service-native-1")
|
2021-08-18 14:27:15 +00:00
|
|
|
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, idx, uint64(15))
|
|
|
|
require.Equal(t, 5, usage.Services)
|
|
|
|
require.Equal(t, 8, usage.ServiceInstances)
|
2021-09-30 21:15:26 +00:00
|
|
|
require.Equal(t, 2, usage.ConnectServiceInstances[string(structs.ServiceKindConnectProxy)])
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, 3, usage.ConnectServiceInstances[connectNativeInstancesTable])
|
2021-08-18 14:27:15 +00:00
|
|
|
}
|
|
|
|
|
2021-01-12 21:31:47 +00:00
|
|
|
func TestStateStore_Usage_ServiceUsage_DeleteNode(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
|
|
|
svc1 := &structs.NodeService{
|
|
|
|
ID: "service1",
|
|
|
|
Service: "test",
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
Port: 1111,
|
|
|
|
}
|
|
|
|
svc2 := &structs.NodeService{
|
|
|
|
ID: "service2",
|
|
|
|
Service: "test",
|
2021-09-30 21:15:26 +00:00
|
|
|
Tags: []string{},
|
2021-01-12 21:31:47 +00:00
|
|
|
Address: "1.1.1.1",
|
|
|
|
}
|
|
|
|
|
|
|
|
// Register multiple instances on a single node to test that we do not
|
|
|
|
// double count deletions within the same transaction.
|
|
|
|
require.NoError(t, s.EnsureService(1, "node1", svc1))
|
|
|
|
require.NoError(t, s.EnsureService(2, "node1", svc2))
|
2021-09-30 21:15:26 +00:00
|
|
|
testRegisterSidecarProxy(t, s, 3, "node1", "service2")
|
2021-09-30 21:48:21 +00:00
|
|
|
testRegisterConnectNativeService(t, s, 4, "node1", "service-connect")
|
2021-01-12 21:31:47 +00:00
|
|
|
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, idx, uint64(4))
|
|
|
|
require.Equal(t, 3, usage.Services)
|
|
|
|
require.Equal(t, 4, usage.ServiceInstances)
|
2021-09-30 21:15:26 +00:00
|
|
|
require.Equal(t, 1, usage.ConnectServiceInstances[string(structs.ServiceKindConnectProxy)])
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, 1, usage.ConnectServiceInstances[connectNativeInstancesTable])
|
2021-01-12 21:31:47 +00:00
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
require.NoError(t, s.DeleteNode(4, "node1", nil, ""))
|
2021-01-12 21:31:47 +00:00
|
|
|
|
|
|
|
idx, usage, err = s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, idx, uint64(4))
|
2021-01-12 21:31:47 +00:00
|
|
|
require.Equal(t, usage.Services, 0)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 0)
|
2021-09-30 21:15:26 +00:00
|
|
|
for k := range usage.ConnectServiceInstances {
|
|
|
|
require.Equal(t, 0, usage.ConnectServiceInstances[k])
|
|
|
|
}
|
2021-01-12 21:31:47 +00:00
|
|
|
}
|
|
|
|
|
2022-07-27 16:08:51 +00:00
|
|
|
// Test that services from remote peers aren't counted in writes or deletes.
|
|
|
|
func TestStateStore_Usage_ServiceUsagePeering(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
peerName := "peer"
|
|
|
|
|
|
|
|
// Register remote peer node/services.
|
|
|
|
testRegisterNodePeer(t, s, 0, "node1", peerName)
|
|
|
|
testRegisterServicePeer(t, s, 1, "node1", "service1", peerName)
|
|
|
|
testRegisterSidecarProxyPeer(t, s, 2, "node1", "service1", peerName)
|
|
|
|
testRegisterConnectNativeServicePeer(t, s, 3, "node1", "service-native", peerName)
|
|
|
|
|
|
|
|
// Register local node/services.
|
|
|
|
testRegisterNode(t, s, 4, "node2")
|
|
|
|
testRegisterService(t, s, 5, "node2", "service1")
|
|
|
|
testRegisterSidecarProxy(t, s, 6, "node2", "service1")
|
|
|
|
testRegisterConnectNativeService(t, s, 7, "node2", "service-native")
|
|
|
|
|
|
|
|
testutil.RunStep(t, "writes", func(t *testing.T) {
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, uint64(7), idx)
|
|
|
|
require.Equal(t, 3, usage.Services)
|
|
|
|
require.Equal(t, 3, usage.ServiceInstances)
|
|
|
|
require.Equal(t, 1, usage.ConnectServiceInstances[string(structs.ServiceKindConnectProxy)])
|
|
|
|
require.Equal(t, 1, usage.ConnectServiceInstances[connectNativeInstancesTable])
|
|
|
|
})
|
|
|
|
|
|
|
|
testutil.RunStep(t, "deletes", func(t *testing.T) {
|
|
|
|
require.NoError(t, s.DeleteNode(7, "node1", nil, peerName))
|
|
|
|
require.NoError(t, s.DeleteNode(8, "node2", nil, ""))
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, uint64(8), idx)
|
|
|
|
require.Equal(t, 0, usage.Services)
|
|
|
|
require.Equal(t, 0, usage.ServiceInstances)
|
|
|
|
require.Equal(t, 0, usage.ConnectServiceInstances[string(structs.ServiceKindConnectProxy)])
|
|
|
|
require.Equal(t, 0, usage.ConnectServiceInstances[connectNativeInstancesTable])
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2020-09-02 15:24:16 +00:00
|
|
|
func TestStateStore_Usage_Restore(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
restore := s.Restore()
|
|
|
|
restore.Registration(9, &structs.RegisterRequest{
|
|
|
|
Node: "test-node",
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
ID: "mysql",
|
|
|
|
Service: "mysql",
|
|
|
|
Port: 8080,
|
|
|
|
Address: "198.18.0.2",
|
|
|
|
},
|
|
|
|
})
|
2021-01-12 21:31:47 +00:00
|
|
|
restore.Registration(9, &structs.RegisterRequest{
|
|
|
|
Node: "test-node",
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
ID: "mysql1",
|
|
|
|
Service: "mysql",
|
|
|
|
Port: 8081,
|
|
|
|
Address: "198.18.0.2",
|
|
|
|
},
|
|
|
|
})
|
2020-09-02 15:24:16 +00:00
|
|
|
require.NoError(t, restore.Commit())
|
|
|
|
|
2021-08-18 14:27:15 +00:00
|
|
|
idx, nodeUsage, err := s.NodeUsage()
|
2020-09-02 15:24:16 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(9))
|
2021-08-18 14:27:15 +00:00
|
|
|
require.Equal(t, nodeUsage.Nodes, 1)
|
2021-01-12 21:31:47 +00:00
|
|
|
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(9))
|
|
|
|
require.Equal(t, usage.Services, 1)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 2)
|
2020-09-02 15:24:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestStateStore_Usage_updateUsage_Underflow(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
txn := s.db.WriteTxn(1)
|
|
|
|
|
|
|
|
// A single delete change will cause a negative count
|
|
|
|
changes := Changes{
|
|
|
|
Index: 1,
|
|
|
|
Changes: memdb.Changes{
|
|
|
|
{
|
|
|
|
Table: "nodes",
|
|
|
|
Before: &structs.Node{},
|
|
|
|
After: nil,
|
|
|
|
},
|
2021-09-30 21:15:26 +00:00
|
|
|
{
|
|
|
|
Table: tableServices,
|
|
|
|
Before: &structs.ServiceNode{
|
|
|
|
ID: "service-1-connect-proxy",
|
|
|
|
ServiceKind: structs.ServiceKindConnectProxy,
|
|
|
|
ServiceID: "service-1",
|
|
|
|
ServiceName: "service",
|
|
|
|
},
|
|
|
|
},
|
2020-09-02 15:24:16 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
err := updateUsage(txn, changes)
|
2021-01-12 21:31:47 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
// Check that we do not underflow
|
|
|
|
u, err := txn.First("usage", "id", "nodes")
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, 0, u.(*UsageEntry).Count)
|
2020-09-02 15:24:16 +00:00
|
|
|
|
2021-10-07 21:16:23 +00:00
|
|
|
u, err = txn.First("usage", "id", connectUsageTableName(string(structs.ServiceKindConnectProxy)))
|
2021-09-30 21:15:26 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, 0, u.(*UsageEntry).Count)
|
|
|
|
|
2020-09-02 15:24:16 +00:00
|
|
|
// A insert a change to create a usage entry
|
|
|
|
changes = Changes{
|
|
|
|
Index: 1,
|
|
|
|
Changes: memdb.Changes{
|
|
|
|
{
|
|
|
|
Table: "nodes",
|
|
|
|
Before: nil,
|
|
|
|
After: &structs.Node{},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
err = updateUsage(txn, changes)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
// Two deletes will cause a negative count now
|
|
|
|
changes = Changes{
|
|
|
|
Index: 1,
|
|
|
|
Changes: memdb.Changes{
|
|
|
|
{
|
|
|
|
Table: "nodes",
|
|
|
|
Before: &structs.Node{},
|
|
|
|
After: nil,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Table: "nodes",
|
|
|
|
Before: &structs.Node{},
|
|
|
|
After: nil,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
err = updateUsage(txn, changes)
|
2021-01-12 21:31:47 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
// Check that we do not underflow
|
|
|
|
u, err = txn.First("usage", "id", "nodes")
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, 0, u.(*UsageEntry).Count)
|
2020-09-02 15:24:16 +00:00
|
|
|
}
|
2020-09-02 15:24:21 +00:00
|
|
|
|
2021-09-30 21:48:21 +00:00
|
|
|
func TestStateStore_Usage_ServiceUsage_updatingService(t *testing.T) {
|
2020-09-02 15:24:21 +00:00
|
|
|
s := testStateStore(t)
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
testRegisterService(t, s, 1, "node1", "service1")
|
|
|
|
|
|
|
|
t.Run("rename service with a single instance", func(t *testing.T) {
|
|
|
|
svc := &structs.NodeService{
|
|
|
|
ID: "service1",
|
|
|
|
Service: "after",
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
Port: 1111,
|
|
|
|
}
|
|
|
|
require.NoError(t, s.EnsureService(2, "node1", svc))
|
|
|
|
|
|
|
|
// We renamed a service with a single instance, so we maintain 1 service.
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(2))
|
|
|
|
require.Equal(t, usage.Services, 1)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 1)
|
|
|
|
})
|
|
|
|
|
2021-09-30 21:48:21 +00:00
|
|
|
t.Run("update service to be connect native", func(t *testing.T) {
|
|
|
|
svc := &structs.NodeService{
|
|
|
|
ID: "service1",
|
|
|
|
Service: "after",
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
Port: 1111,
|
|
|
|
Connect: structs.ServiceConnect{
|
|
|
|
Native: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
require.NoError(t, s.EnsureService(3, "node1", svc))
|
|
|
|
|
|
|
|
// We renamed a service with a single instance, so we maintain 1 service.
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(3))
|
|
|
|
require.Equal(t, usage.Services, 1)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 1)
|
|
|
|
require.Equal(t, 1, usage.ConnectServiceInstances[connectNativeInstancesTable])
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("update service to not be connect native", func(t *testing.T) {
|
|
|
|
svc := &structs.NodeService{
|
|
|
|
ID: "service1",
|
|
|
|
Service: "after",
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
Port: 1111,
|
|
|
|
Connect: structs.ServiceConnect{
|
|
|
|
Native: false,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
require.NoError(t, s.EnsureService(4, "node1", svc))
|
|
|
|
|
|
|
|
// We renamed a service with a single instance, so we maintain 1 service.
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(4))
|
|
|
|
require.Equal(t, usage.Services, 1)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 1)
|
|
|
|
require.Equal(t, 0, usage.ConnectServiceInstances[connectNativeInstancesTable])
|
|
|
|
})
|
|
|
|
|
2020-09-02 15:24:21 +00:00
|
|
|
t.Run("rename service with a multiple instances", func(t *testing.T) {
|
|
|
|
svc2 := &structs.NodeService{
|
|
|
|
ID: "service2",
|
|
|
|
Service: "before",
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
Port: 1111,
|
2021-09-30 21:48:21 +00:00
|
|
|
Connect: structs.ServiceConnect{
|
|
|
|
Native: true,
|
|
|
|
},
|
2020-09-02 15:24:21 +00:00
|
|
|
}
|
2021-09-30 21:48:21 +00:00
|
|
|
require.NoError(t, s.EnsureService(5, "node1", svc2))
|
2020-09-02 15:24:21 +00:00
|
|
|
|
|
|
|
svc3 := &structs.NodeService{
|
|
|
|
ID: "service3",
|
|
|
|
Service: "before",
|
|
|
|
Address: "1.1.1.3",
|
|
|
|
Port: 1111,
|
2021-09-30 21:48:21 +00:00
|
|
|
Connect: structs.ServiceConnect{
|
|
|
|
Native: true,
|
|
|
|
},
|
2020-09-02 15:24:21 +00:00
|
|
|
}
|
2021-09-30 21:48:21 +00:00
|
|
|
require.NoError(t, s.EnsureService(6, "node1", svc3))
|
2020-09-02 15:24:21 +00:00
|
|
|
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, idx, uint64(6))
|
2020-09-02 15:24:21 +00:00
|
|
|
require.Equal(t, usage.Services, 2)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 3)
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, 2, usage.ConnectServiceInstances[connectNativeInstancesTable])
|
2020-09-02 15:24:21 +00:00
|
|
|
|
|
|
|
update := &structs.NodeService{
|
|
|
|
ID: "service2",
|
|
|
|
Service: "another-name",
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
Port: 1111,
|
2021-09-30 21:48:21 +00:00
|
|
|
Connect: structs.ServiceConnect{
|
|
|
|
Native: true,
|
|
|
|
},
|
2020-09-02 15:24:21 +00:00
|
|
|
}
|
2021-09-30 21:48:21 +00:00
|
|
|
require.NoError(t, s.EnsureService(7, "node1", update))
|
2020-09-02 15:24:21 +00:00
|
|
|
|
|
|
|
idx, usage, err = s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, idx, uint64(7))
|
2020-09-02 15:24:21 +00:00
|
|
|
require.Equal(t, usage.Services, 3)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 3)
|
2021-09-30 21:48:21 +00:00
|
|
|
require.Equal(t, 2, usage.ConnectServiceInstances[connectNativeInstancesTable])
|
|
|
|
|
2020-09-02 15:24:21 +00:00
|
|
|
})
|
|
|
|
}
|
2021-09-30 21:15:26 +00:00
|
|
|
|
|
|
|
func TestStateStore_Usage_ServiceUsage_updatingConnectProxy(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
testRegisterService(t, s, 1, "node1", "service1")
|
|
|
|
|
|
|
|
t.Run("change service to ConnectProxy", func(t *testing.T) {
|
|
|
|
svc := &structs.NodeService{
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
ID: "service1",
|
|
|
|
Service: "after",
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
Port: 1111,
|
|
|
|
}
|
|
|
|
require.NoError(t, s.EnsureService(2, "node1", svc))
|
|
|
|
|
|
|
|
// We renamed a service with a single instance, so we maintain 1 service.
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(2))
|
|
|
|
require.Equal(t, usage.Services, 1)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 1)
|
|
|
|
require.Equal(t, 1, usage.ConnectServiceInstances[string(structs.ServiceKindConnectProxy)])
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("rename service with a multiple instances", func(t *testing.T) {
|
|
|
|
svc2 := &structs.NodeService{
|
|
|
|
ID: "service2",
|
|
|
|
Service: "before",
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
Port: 1111,
|
|
|
|
}
|
|
|
|
require.NoError(t, s.EnsureService(3, "node1", svc2))
|
|
|
|
|
|
|
|
svc3 := &structs.NodeService{
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
ID: "service3",
|
|
|
|
Service: "before",
|
|
|
|
Address: "1.1.1.3",
|
|
|
|
Port: 1111,
|
|
|
|
}
|
|
|
|
require.NoError(t, s.EnsureService(4, "node1", svc3))
|
|
|
|
|
|
|
|
idx, usage, err := s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(4))
|
|
|
|
require.Equal(t, usage.Services, 2)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 3)
|
|
|
|
require.Equal(t, 2, usage.ConnectServiceInstances[string(structs.ServiceKindConnectProxy)])
|
|
|
|
|
|
|
|
update := &structs.NodeService{
|
|
|
|
ID: "service3",
|
|
|
|
Service: "another-name",
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
Port: 1111,
|
|
|
|
}
|
|
|
|
require.NoError(t, s.EnsureService(5, "node1", update))
|
|
|
|
|
|
|
|
idx, usage, err = s.ServiceUsage()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, idx, uint64(5))
|
|
|
|
require.Equal(t, usage.Services, 3)
|
|
|
|
require.Equal(t, usage.ServiceInstances, 3)
|
|
|
|
require.Equal(t, 1, usage.ConnectServiceInstances[string(structs.ServiceKindConnectProxy)])
|
|
|
|
})
|
|
|
|
}
|
2021-10-01 18:22:30 +00:00
|
|
|
|
|
|
|
func TestStateStore_Usage_ConfigEntries(t *testing.T) {
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
t.Run("empty store", func(t *testing.T) {
|
2021-10-07 21:19:55 +00:00
|
|
|
i, usage, err := s.ConfigEntryUsage()
|
2021-10-01 18:22:30 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, uint64(0), i)
|
|
|
|
for _, kind := range structs.AllConfigEntryKinds {
|
|
|
|
require.Equal(t, 0, usage.ConfigByKind[kind])
|
|
|
|
}
|
|
|
|
})
|
|
|
|
t.Run("with config entries", func(t *testing.T) {
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(1, &structs.ServiceConfigEntry{
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
Name: "web",
|
|
|
|
Protocol: "http",
|
|
|
|
}))
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(2, &structs.ServiceResolverConfigEntry{
|
|
|
|
Kind: structs.ServiceResolver,
|
|
|
|
Name: "web",
|
|
|
|
DefaultSubset: "v1",
|
|
|
|
Subsets: map[string]structs.ServiceResolverSubset{
|
|
|
|
"v1": {
|
|
|
|
Filter: "Service.Meta.version == v1",
|
|
|
|
},
|
|
|
|
"v2": {
|
|
|
|
Filter: "Service.Meta.version == v2",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}))
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(3, &structs.ServiceIntentionsConfigEntry{
|
|
|
|
Kind: structs.ServiceIntentions,
|
|
|
|
Name: "web",
|
|
|
|
}))
|
|
|
|
|
2021-10-07 21:19:55 +00:00
|
|
|
i, usage, err := s.ConfigEntryUsage()
|
2021-10-01 18:22:30 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, uint64(3), i)
|
|
|
|
require.Equal(t, 1, usage.ConfigByKind[structs.ServiceDefaults])
|
|
|
|
require.Equal(t, 1, usage.ConfigByKind[structs.ServiceResolver])
|
|
|
|
require.Equal(t, 1, usage.ConfigByKind[structs.ServiceIntentions])
|
|
|
|
})
|
|
|
|
}
|