status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

consul: Adding support for QueryMeta on all queries

This commit is contained in:
Armon Dadgar 2014-04-18 17:37:19 -07:00
parent fa90f1cd0d
commit afa6a1ae49
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
consul/catalog_endpoint.go
View File

@ -100,6 +100,7 @@ func (c *Catalog) ListNodes(args *structs.DCSpecificRequest, reply *structs.Inde
return c.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("Nodes"),
func() (uint64, error) {
c.srv.setQueryMeta(&reply.QueryMeta)
reply.Index, reply.Nodes = state.Nodes()
return reply.Index, nil
})
@ -116,6 +117,7 @@ func (c *Catalog) ListServices(args *structs.DCSpecificRequest, reply *structs.I
return c.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("Services"),
func() (uint64, error) {
c.srv.setQueryMeta(&reply.QueryMeta)
reply.Index, reply.Services = state.Services()
return reply.Index, nil
})
@ -137,6 +139,7 @@ func (c *Catalog) ServiceNodes(args *structs.ServiceSpecificRequest, reply *stru
err := c.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("ServiceNodes"),
func() (uint64, error) {
c.srv.setQueryMeta(&reply.QueryMeta)
if args.TagFilter {
reply.Index, reply.ServiceNodes = state.ServiceTagNodes(args.ServiceName, args.ServiceTag)
} else {
@ -174,6 +177,7 @@ func (c *Catalog) NodeServices(args *structs.NodeSpecificRequest, reply *structs
return c.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("NodeServices"),
func() (uint64, error) {
c.srv.setQueryMeta(&reply.QueryMeta)
reply.Index, reply.NodeServices = state.NodeServices(args.Node)
return reply.Index, nil
})

4
consul/health_endpoint.go
View File

@ -23,6 +23,7 @@ func (h *Health) ChecksInState(args *structs.ChecksInStateRequest,
return h.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("ChecksInState"),
func() (uint64, error) {
h.srv.setQueryMeta(&reply.QueryMeta)
reply.Index, reply.HealthChecks = state.ChecksInState(args.State)
return reply.Index, nil
})
@ -40,6 +41,7 @@ func (h *Health) NodeChecks(args *structs.NodeSpecificRequest,
return h.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("NodeChecks"),
func() (uint64, error) {
h.srv.setQueryMeta(&reply.QueryMeta)
reply.Index, reply.HealthChecks = state.NodeChecks(args.Node)
return reply.Index, nil
})
@ -63,6 +65,7 @@ func (h *Health) ServiceChecks(args *structs.ServiceSpecificRequest,
return h.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("ServiceChecks"),
func() (uint64, error) {
h.srv.setQueryMeta(&reply.QueryMeta)
reply.Index, reply.HealthChecks = state.ServiceChecks(args.ServiceName)
return reply.Index, nil
})
@ -84,6 +87,7 @@ func (h *Health) ServiceNodes(args *structs.ServiceSpecificRequest, reply *struc
err := h.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("CheckServiceNodes"),
func() (uint64, error) {
h.srv.setQueryMeta(&reply.QueryMeta)
if args.TagFilter {
reply.Index, reply.Nodes = state.CheckServiceTagNodes(args.ServiceName, args.ServiceTag)
} else {

2
consul/kvs_endpoint.go
View File

@ -53,6 +53,7 @@ func (k *KVS) Get(args *structs.KeyRequest, reply *structs.IndexedDirEntries) er
return k.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("KVSGet"),
func() (uint64, error) {
k.srv.setQueryMeta(&reply.QueryMeta)
index, ent, err := state.KVSGet(args.Key)
if err != nil {
return 0, err
@ -85,6 +86,7 @@ func (k *KVS) List(args *structs.KeyRequest, reply *structs.IndexedDirEntries) e
return k.srv.blockingRPC(&args.BlockingQuery,
state.QueryTables("KVSList"),
func() (uint64, error) {
k.srv.setQueryMeta(&reply.QueryMeta)
index, ent, err := state.KVSList(args.Key)
if err != nil {
return 0, err

11
consul/rpc.go
View File

@ -253,3 +253,14 @@ RUN_QUERY:
}
return err
}
// setQueryMeta is used to populate the QueryMeta data for an RPC call
func (s *Server) setQueryMeta(m *structs.QueryMeta) {
if s.IsLeader() {
m.LastContact = 0
m.KnownLeader = true
} else {
m.LastContact = time.Now().Sub(s.raft.LastContact())
m.KnownLeader = (s.raft.Leader() != nil)
}
}