Add UpdatesOnly query option to fetch data for only changed keys

agent/consul/filter.go

@@ -5,7 +5,9 @@ package consul
 
 import (
 	"github.com/hashicorp/consul/acl"
+	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/go-memdb"
 )
 
 type dirEntFilter struct {
@@ -116,3 +118,19 @@ func FilterEntries(f Filter) int {
 	// Return the size of the slice
 	return dst
 }
+
+func FilterKVList(state *state.Store, ws memdb.WatchSet, prefix string, entMeta *acl.EnterpriseMeta,
+	queryMeta *structs.QueryMeta, queryOptions structs.QueryOptions) (uint64, structs.DirEntries, error) {
+	// If the UpdatesOnly query option is set, utilize MinQueryIndex to only
+	// get back entries that have a ModifyIndex >= than that value.
+	//
+	// MinQueryIndex represents the minimum query index for blocking queries,
+	// corresponding to the index HTTP query parameter and the WaitIndex
+	// client-side parameter, after deserialization.
+	minQueryIndex := uint64(0)
+	if queryOptions.UpdatesOnly {
+		minQueryIndex = queryOptions.MinQueryIndex
+	}
+
+	return state.KVSList(ws, prefix, entMeta, minQueryIndex)
+}

agent/consul/fsm/commands_ce_test.go

@@ -968,7 +968,7 @@ func TestFSM_TombstoneReap(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	idx, _, err := fsm.state.KVSList(nil, "/remove", nil)
+	idx, _, err := fsm.state.KVSList(nil, "/remove", nil, 0)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}

agent/consul/fsm/snapshot_test.go

@@ -172,7 +172,7 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 		Value: []byte("foo"),
 	})
 	fsm.state.KVSDelete(12, "/remove", nil)
-	idx, _, err := fsm.state.KVSList(nil, "/remove", nil)
+	idx, _, err := fsm.state.KVSList(nil, "/remove", nil, 0)
 	require.NoError(t, err)
 	require.EqualValues(t, 12, idx, "bad index")
 

agent/consul/kvs_endpoint.go

@@ -204,16 +204,16 @@ func (k *KVS) List(args *structs.KeyRequest, reply *structs.IndexedDirEntries) e
 		&args.QueryOptions,
 		&reply.QueryMeta,
 		func(ws memdb.WatchSet, state *state.Store) error {
-			index, ent, err := state.KVSList(ws, args.Key, &args.EnterpriseMeta)
+			index, entries, err := FilterKVList(state, ws, args.Key, &args.EnterpriseMeta, &reply.QueryMeta, args.QueryOptions)
 			if err != nil {
 				return err
 			}
 
-			total := len(ent)
-			ent = FilterDirEnt(authz, ent)
-			reply.QueryMeta.ResultsFilteredByACLs = total != len(ent)
+			total := len(entries)
+			entries = FilterDirEnt(authz, entries)
+			reply.QueryMeta.ResultsFilteredByACLs = total != len(entries)
 
-			if len(ent) == 0 {
+			if len(entries) == 0 {
 				// Must provide non-zero index to prevent blocking
 				// Index 1 is impossible anyways (due to Raft internals)
 				if index == 0 {
@@ -224,7 +224,7 @@ func (k *KVS) List(args *structs.KeyRequest, reply *structs.IndexedDirEntries) e
 				reply.Entries = nil
 			} else {
 				reply.Index = index
-				reply.Entries = ent
+				reply.Entries = entries
 			}
 			return nil
 		})
@@ -259,7 +259,7 @@ func (k *KVS) ListKeys(args *structs.KeyListRequest, reply *structs.IndexedKeyLi
 		&args.QueryOptions,
 		&reply.QueryMeta,
 		func(ws memdb.WatchSet, state *state.Store) error {
-			index, entries, err := state.KVSList(ws, args.Prefix, &args.EnterpriseMeta)
+			index, entries, err := FilterKVList(state, ws, args.Prefix, &args.EnterpriseMeta, &reply.QueryMeta, args.QueryOptions)
 			if err != nil {
 				return err
 			}

agent/consul/state/kvs.go

@@ -211,7 +211,7 @@ func kvsGetTxn(tx ReadTxn,
 // is the max index of the returned kvs entries or applicable tombstones, or
 // else it's the full table indexes for kvs and tombstones.
 func (s *Store) KVSList(ws memdb.WatchSet,
-	prefix string, entMeta *acl.EnterpriseMeta) (uint64, structs.DirEntries, error) {
+	prefix string, entMeta *acl.EnterpriseMeta, minQueryIndex uint64) (uint64, structs.DirEntries, error) {
 
 	tx := s.db.Txn(false)
 	defer tx.Abort()
@@ -221,18 +221,18 @@ func (s *Store) KVSList(ws memdb.WatchSet,
 		entMeta = structs.DefaultEnterpriseMetaInDefaultPartition()
 	}
 
-	return s.kvsListTxn(tx, ws, prefix, *entMeta)
+	return s.kvsListTxn(tx, ws, prefix, *entMeta, minQueryIndex)
 }
 
 // kvsListTxn is the inner method that gets a list of KVS entries matching a
 // prefix.
 func (s *Store) kvsListTxn(tx ReadTxn,
-	ws memdb.WatchSet, prefix string, entMeta acl.EnterpriseMeta) (uint64, structs.DirEntries, error) {
+	ws memdb.WatchSet, prefix string, entMeta acl.EnterpriseMeta, minQueryIndex uint64) (uint64, structs.DirEntries, error) {
 
 	// Get the table indexes.
 	idx := kvsMaxIndex(tx, entMeta)
 
-	lindex, entries, err := kvsListEntriesTxn(tx, ws, prefix, entMeta)
+	lindex, entries, err := kvsListEntriesTxn(tx, ws, prefix, entMeta, minQueryIndex)
 	if err != nil {
 		return 0, nil, fmt.Errorf("failed kvs lookup: %s", err)
 	}

agent/consul/state/kvs_ce.go

@@ -59,7 +59,7 @@ func insertKVTxn(tx WriteTxn, entry *structs.DirEntry, updateMax bool, _ bool) e
 	return nil
 }
 
-func kvsListEntriesTxn(tx ReadTxn, ws memdb.WatchSet, prefix string, entMeta acl.EnterpriseMeta) (uint64, structs.DirEntries, error) {
+func kvsListEntriesTxn(tx ReadTxn, ws memdb.WatchSet, prefix string, entMeta acl.EnterpriseMeta, minQueryIndex uint64) (uint64, structs.DirEntries, error) {
 	var ents structs.DirEntries
 	var lindex uint64
 
@@ -72,7 +72,10 @@ func kvsListEntriesTxn(tx ReadTxn, ws memdb.WatchSet, prefix string, entMeta acl
 	// Gather all of the keys found
 	for entry := entries.Next(); entry != nil; entry = entries.Next() {
 		e := entry.(*structs.DirEntry)
-		ents = append(ents, e)
+		// Filter out entries that have an old ModifyIndex (default=0, so keep everything)
+		if e.ModifyIndex >= minQueryIndex {
+			ents = append(ents, e)
+		}
 		if e.ModifyIndex > lindex {
 			lindex = e.ModifyIndex
 		}