From d2fc70548ad1149b1aedca1046db9a6404d8d48e Mon Sep 17 00:00:00 2001
From: Kuat Yessenov <kuat@google.com>
Date: Wed, 24 Jun 2026 19:55:54 +0000
Subject: [PATCH] xds mux: harden queueing

Change-Id: I83367169d4e37e14370d1dd764e1baef052e27c9
Signed-off-by: Kuat Yessenov <kuat@google.com>
---
 source/extensions/config_subscription/grpc/grpc_mux_impl.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/extensions/config_subscription/grpc/grpc_mux_impl.cc b/source/extensions/config_subscription/grpc/grpc_mux_impl.cc
index bcb06a415d81f..a7d7a1153fbc3 100644
--- a/source/extensions/config_subscription/grpc/grpc_mux_impl.cc
+++ b/source/extensions/config_subscription/grpc/grpc_mux_impl.cc
@@ -597,6 +597,9 @@ void GrpcMuxImpl::onEstablishmentFailure(bool) {
 }
 
 void GrpcMuxImpl::queueDiscoveryRequest(absl::string_view queue_item) {
+  if (shutdown_) {
+    return;
+  }
   if (!grpc_stream_->grpcStreamAvailable()) {
     ENVOY_LOG(debug, "No stream available to queueDiscoveryRequest for {}", queue_item);
     return; // Drop this request; the reconnect will enqueue a new one.