Dedup services.

hashicorp · Jul 28, 2023 · abbea8f · abbea8f
1 parent 3ed5e11
commit abbea8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/agent/consul/state/catalog.go b/agent/consul/state/catalog.go
@@ -4584,6 +4584,7 @@ func (s *Store) combinedServiceNodesTxn(tx ReadTxn, ws memdb.WatchSet, names []s
 		maxIdx uint64
 		resp   structs.CheckServiceNodes
 	)
+	dedupMap := make(map[string]structs.CheckServiceNode)
 	for _, u := range names {
 		// Collect typical then connect instances
 		idx, csn, err := checkServiceNodesTxn(tx, ws, u.Name, false, &u.EnterpriseMeta, peerName)
@@ -4593,7 +4594,9 @@ func (s *Store) combinedServiceNodesTxn(tx ReadTxn, ws memdb.WatchSet, names []s
 		if idx > maxIdx {
 			maxIdx = idx
 		}
-		resp = append(resp, csn...)
+		for _, item := range csn {
+			dedupMap[item.Node.Node+"/"+item.Service.ID] = item
+		}
 
 		idx, csn, err = checkServiceNodesTxn(tx, ws, u.Name, true, &u.EnterpriseMeta, peerName)
 		if err != nil {
@@ -4602,7 +4605,12 @@ func (s *Store) combinedServiceNodesTxn(tx ReadTxn, ws memdb.WatchSet, names []s
 		if idx > maxIdx {
 			maxIdx = idx
 		}
-		resp = append(resp, csn...)
+		for _, item := range csn {
+			dedupMap[item.Node.Node+"/"+item.Service.ID] = item
+		}
+	}
+	for _, item := range dedupMap {
+		resp = append(resp, item)
 	}
 	return maxIdx, resp, nil
 }

diff --git a/agent/ui_endpoint_test.go b/agent/ui_endpoint_test.go
@@ -2165,8 +2165,8 @@ func TestUIServiceTopology(t *testing.T) {
 							Name:           "cproxy",
 							Datacenter:     "dc1",
 							Tags:           []string{"http", "https"},
-							Nodes:          []string{"cnative", "cnative", "cnative"},
-							InstanceCount:  3,
+							Nodes:          []string{"cnative", "cnative"},
+							InstanceCount:  2,
 							ChecksPassing:  3,
 							ChecksWarning:  0,
 							ChecksCritical: 0,