From b7891f8fe89664c4a723a82c1bea5ee933129b84 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki@neon.tech>
Date: Tue, 6 May 2025 15:23:30 +0300
Subject: [PATCH] Include 'neon-shard-id' header in client requests

---
 pageserver/client_grpc/src/lib.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pageserver/client_grpc/src/lib.rs b/pageserver/client_grpc/src/lib.rs
index cc627acc2d..3374fcc2dc 100644
--- a/pageserver/client_grpc/src/lib.rs
+++ b/pageserver/client_grpc/src/lib.rs
@@ -286,6 +286,10 @@ impl tonic::service::Interceptor for AuthInterceptor {
     fn call(&mut self, mut req: tonic::Request<()>) -> Result<tonic::Request<()>, tonic::Status> {
         req.metadata_mut()
             .insert("neon-tenant-id", self.tenant_id.clone());
+        if let Some(shard_id) = &self.shard_id {
+            req.metadata_mut()
+                .insert("neon-shard-id", shard_id.clone());
+        }
         req.metadata_mut()
             .insert("neon-timeline-id", self.timeline_id.clone());
         if let Some(auth_header) = &self.auth_header {