peering: peering partition failover fixes (#16673)

add local source partition for peered upstreams
hashicorp · May 15, 2023 · 598f082 · 598f082
1 parent 9c1ee02
commit 598f082
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.changelog/16673.txt b/.changelog/16673.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+peering: Fixes a bug where the importing partition was not added to peered failover targets, which causes issues when the importing partition is a non-default partition.
+```
diff --git a/agent/proxycfg/upstreams.go b/agent/proxycfg/upstreams.go
@@ -447,6 +447,9 @@ func (s *handlerUpstreams) watchUpstreamTarget(ctx context.Context, snap *Config
 
 	if opts.peer != "" {
 		uid = NewUpstreamIDFromTargetID(opts.chainID)
+		// chainID has the partition stripped. However, when a target is in a cluster peer, the partition should be set
+		// to the local partition (i.e chain.Partition), since the peered target is imported into the local partition.
+		uid.OverridePartition(opts.entMeta.PartitionOrDefault())
 		correlationID = upstreamPeerWatchIDPrefix + uid.String()
 	}