From 3d562bee5c571eaf8eb43703c28afe32feb93b9e Mon Sep 17 00:00:00 2001
From: Matt Keeler <mkeeler@users.noreply.github.com>
Date: Thu, 4 Jul 2019 11:17:49 -0400
Subject: [PATCH] Fix Internal.ServiceDump blocking (#6076)

maxIndexWatchTxn was only watching the IndexEntry of the max index of all the entries. It needed to watch all of them regardless of which was the max.

Also plumbed the query source through in the proxy config to help better track requests.
---
 agent/consul/state/state_store.go | 2 +-
 agent/proxycfg/state.go           | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/agent/consul/state/state_store.go b/agent/consul/state/state_store.go
index 014ec27e81..b907dc3882 100644
--- a/agent/consul/state/state_store.go
+++ b/agent/consul/state/state_store.go
@@ -255,8 +255,8 @@ func maxIndexWatchTxn(tx *memdb.Txn, ws memdb.WatchSet, tables ...string) uint64
 		}
 		if idx, ok := ti.(*IndexEntry); ok && idx.Value > lindex {
 			lindex = idx.Value
-			ws.Add(ch)
 		}
+		ws.Add(ch)
 	}
 	return lindex
 }
diff --git a/agent/proxycfg/state.go b/agent/proxycfg/state.go
index accfe9e4c6..aaca3ebf7b 100644
--- a/agent/proxycfg/state.go
+++ b/agent/proxycfg/state.go
@@ -150,6 +150,7 @@ func (s *state) watchConnectProxyService(ctx context.Context, correlationId stri
 			QueryOptions:   structs.QueryOptions{Token: s.token},
 			ServiceKind:    structs.ServiceKindMeshGateway,
 			UseServiceKind: true,
+			Source:         *s.source,
 		}, correlationId, s.ch)
 	case structs.MeshGatewayModeLocal:
 		return s.cache.Notify(ctx, cachetype.InternalServiceDumpName, &structs.ServiceDumpRequest{
@@ -157,6 +158,7 @@ func (s *state) watchConnectProxyService(ctx context.Context, correlationId stri
 			QueryOptions:   structs.QueryOptions{Token: s.token},
 			ServiceKind:    structs.ServiceKindMeshGateway,
 			UseServiceKind: true,
+			Source:         *s.source,
 		}, correlationId, s.ch)
 	default:
 		// This includes both the None and Default modes on purpose
@@ -171,6 +173,7 @@ func (s *state) watchConnectProxyService(ctx context.Context, correlationId stri
 			// Note that Identifier doesn't type-prefix for service any more as it's
 			// the default and makes metrics and other things much cleaner. It's
 			// simpler for us if we have the type to make things unambiguous.
+			Source: *s.source,
 		}, correlationId, s.ch)
 	}
 }
@@ -182,6 +185,7 @@ func (s *state) initWatchesConnectProxy() error {
 	err := s.cache.Notify(s.ctx, cachetype.ConnectCARootName, &structs.DCSpecificRequest{
 		Datacenter:   s.source.Datacenter,
 		QueryOptions: structs.QueryOptions{Token: s.token},
+		Source:       *s.source,
 	}, rootsWatchID, s.ch)
 	if err != nil {
 		return err
@@ -230,6 +234,7 @@ func (s *state) initWatchesConnectProxy() error {
 				QueryOptions:  structs.QueryOptions{Token: s.token, MaxAge: defaultPreparedQueryPollInterval},
 				QueryIDOrName: u.DestinationName,
 				Connect:       true,
+				Source:        *s.source,
 			}, "upstream:"+u.Identifier(), s.ch)
 		case structs.UpstreamDestTypeService:
 			fallthrough
@@ -290,6 +295,7 @@ func (s *state) initWatchesMeshGateway() error {
 	err := s.cache.Notify(s.ctx, cachetype.ConnectCARootName, &structs.DCSpecificRequest{
 		Datacenter:   s.source.Datacenter,
 		QueryOptions: structs.QueryOptions{Token: s.token},
+		Source:       *s.source,
 	}, rootsWatchID, s.ch)
 	if err != nil {
 		return err
@@ -299,6 +305,7 @@ func (s *state) initWatchesMeshGateway() error {
 	err = s.cache.Notify(s.ctx, cachetype.CatalogListServicesName, &structs.DCSpecificRequest{
 		Datacenter:   s.source.Datacenter,
 		QueryOptions: structs.QueryOptions{Token: s.token},
+		Source:       *s.source,
 	}, serviceListWatchID, s.ch)
 
 	if err != nil {
@@ -721,6 +728,7 @@ func (s *state) handleUpdateMeshGateway(u cache.UpdateEvent, snap *ConfigSnapsho
 					QueryOptions:   structs.QueryOptions{Token: s.token},
 					ServiceKind:    structs.ServiceKindMeshGateway,
 					UseServiceKind: true,
+					Source:         *s.source,
 				}, fmt.Sprintf("mesh-gateway:%s", dc), s.ch)
 
 				if err != nil {