From 63d9f6a6d68ceef57e72f02e37c91d140ae32196 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Fri, 14 Oct 2022 11:18:26 -0700
Subject: [PATCH] Ensure ordering between received messages and status

---
 packages/grpc-js/src/load-balancing-call.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/grpc-js/src/load-balancing-call.ts b/packages/grpc-js/src/load-balancing-call.ts
index 36af8b68..73c1fa9f 100644
--- a/packages/grpc-js/src/load-balancing-call.ts
+++ b/packages/grpc-js/src/load-balancing-call.ts
@@ -44,6 +44,8 @@ export class LoadBalancingCall implements Call {
   private writeFilterPending = false;
   private pendingMessage: {context: MessageContext, message: Buffer} | null = null;
   private pendingHalfClose = false;
+  private readFilterPending = false;
+  private pendingChildStatus: StatusObject | null = null;
   private ended = false;
   private serviceUrl: string;
   private filterStack: FilterStack;
@@ -153,14 +155,23 @@ export class LoadBalancingCall implements Call {
                   this.listener!.onReceiveMetadata(this.filterStack.receiveMetadata(metadata));
                 },
                 onReceiveMessage: message => {
+                  this.readFilterPending = true;
                   this.filterStack.receiveMessage(message).then(filteredMesssage => {
+                    this.readFilterPending = false;
                     this.listener!.onReceiveMessage(filteredMesssage);
+                    if (this.pendingChildStatus) {
+                      this.outputStatus(this.pendingChildStatus, 'PROCESSED');
+                    }
                   }, (status: StatusObject) => {
                     this.cancelWithStatus(status.code, status.details);
                   });
                 },
                 onReceiveStatus: status => {
-                  this.outputStatus(status, 'PROCESSED');
+                  if (this.readFilterPending) {
+                    this.pendingChildStatus = status;
+                  } else {
+                    this.outputStatus(status, 'PROCESSED');
+                  }
                 }
               });
             } catch (error) {