From 598f082206464ee8bb804b9dd8cc0d4d5b078a84 Mon Sep 17 00:00:00 2001 From: Nitya Dhanushkodi Date: Mon, 20 Mar 2023 10:00:29 -0700 Subject: [PATCH] peering: peering partition failover fixes (#16673) add local source partition for peered upstreams --- .changelog/16673.txt | 3 +++ agent/proxycfg/upstreams.go | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 .changelog/16673.txt diff --git a/.changelog/16673.txt b/.changelog/16673.txt new file mode 100644 index 000000000000..f72eedc61c82 --- /dev/null +++ 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 index 7c16e9f7cf74..074463a54f51 100644 --- 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() }