luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

consul/state: support check lookups by service name

This commit is contained in:
Ryan Uber 2015-08-29 16:39:32 -07:00 committed by James Phillips
parent 9fe029abc3
commit 2249bec117
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
consul/state/state_store.go
View File

@ -457,6 +457,15 @@ func (s *StateStore) NodeChecks(nodeID string) (uint64, structs.HealthChecks, er
return s.parseChecks(tx.Get("checks", "node", nodeID)) return s.parseChecks(tx.Get("checks", "node", nodeID))
} }
// ServiceChecks is used to get all checks associated with a
// given service ID. The query is performed against a service
// _name_ instead of a service ID.
func (s *StateStore) ServiceChecks(serviceName string) (uint64, structs.HealthChecks, error) {
tx := s.db.Txn(false)
defer tx.Abort()
return s.parseChecks(tx.Get("checks", "service", serviceName))
}
// parseChecks is a helper function used to deduplicate some // parseChecks is a helper function used to deduplicate some
// repetitive code for returning health checks. // repetitive code for returning health checks.
func (s *StateStore) parseChecks(iter memdb.ResultIterator, err error) (uint64, structs.HealthChecks, error) { func (s *StateStore) parseChecks(iter memdb.ResultIterator, err error) (uint64, structs.HealthChecks, error) {

32
consul/state/state_store_test.go
View File

@ -40,6 +40,7 @@ func testRegisterNode(t *testing.T, s *StateStore, idx uint64, nodeID string) {
func testRegisterService(t *testing.T, s *StateStore, idx uint64, nodeID, serviceID string) { func testRegisterService(t *testing.T, s *StateStore, idx uint64, nodeID, serviceID string) {
svc := &structs.NodeService{ svc := &structs.NodeService{
ID: serviceID, ID: serviceID,
Service: serviceID,
Address: "1.1.1.1", Address: "1.1.1.1",
Port: 1111, Port: 1111,
} }
@ -79,7 +80,7 @@ func testRegisterCheck(t *testing.T, s *StateStore, idx uint64, nodeID, serviceI
} }
} }
func TestStateStore_EnsureNode_GetNode(t *testing.T) { func TestStateStore_EnsureNode(t *testing.T) {
s := testStateStore(t) s := testStateStore(t)
// Fetching a non-existent node returns nil // Fetching a non-existent node returns nil
@ -232,7 +233,7 @@ func TestStateStore_DeleteNode(t *testing.T) {
} }
} }
func TestStateStore_EnsureService_NodeServices(t *testing.T) { func TestStateStore_EnsureService(t *testing.T) {
s := testStateStore(t) s := testStateStore(t)
// Fetching services for a node with none returns nil // Fetching services for a node with none returns nil
@ -427,6 +428,33 @@ func TestStateStore_EnsureCheck(t *testing.T) {
} }
} }
func TestStateStore_ServiceChecks(t *testing.T) {
s := testStateStore(t)
// Create the first node and service with some checks
testRegisterNode(t, s, 0, "node1")
testRegisterService(t, s, 1, "node1", "service1")
testRegisterCheck(t, s, 2, "node1", "service1", "check1")
testRegisterCheck(t, s, 3, "node1", "service1", "check2")
// Create a second node/service with a different set of checks
testRegisterNode(t, s, 4, "node2")
testRegisterService(t, s, 5, "node2", "service2")
testRegisterCheck(t, s, 6, "node2", "service2", "check3")
// Try querying for all checks associated with service1
idx, checks, err := s.ServiceChecks("service1")
if err != nil {
t.Fatalf("err: %s", err)
}
if idx != 3 {
t.Fatalf("bad index: %d", idx)
}
if len(checks) != 2 || checks[0].CheckID != "check1" || checks[1].CheckID != "check2" {
t.Fatalf("bad checks: %#v", checks)
}
}
func TestStateStore_DeleteCheck(t *testing.T) { func TestStateStore_DeleteCheck(t *testing.T) {
s := testStateStore(t) s := testStateStore(t)