From 07bbd841f6d8e5e7b435526ec4981e158b890790 Mon Sep 17 00:00:00 2001
From: Katherine Yang <katheriney@nvidia.com>
Date: Wed, 17 Apr 2024 10:53:33 -0700
Subject: [PATCH 1/3] fix test

---
 qa/L0_grpc/test.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qa/L0_grpc/test.sh b/qa/L0_grpc/test.sh
index 8f7d89d722..50cf5a6f91 100755
--- a/qa/L0_grpc/test.sh
+++ b/qa/L0_grpc/test.sh
@@ -312,8 +312,8 @@ for i in \
             cat $CLIENT_LOG.c++.${SUFFIX}
             RET=1
         fi
-        if [ `grep -c "${CACHED_CHANNEL_STRING_NONE}" ${CLIENT_LOG}.c++.${SUFFIX}` != "2" ]; then
-            echo -e "\n***\n*** Failed. Expected 0 cached channels\n***"
+        if [ `grep -c "${CACHED_CHANNEL_STRING_ONE}" ${CLIENT_LOG}.c++.${SUFFIX}` != "2" ]; then
+            echo -e "\n***\n*** Failed. Expected 1 cached channel\n***"
             cat $CLIENT_LOG.c++.${SUFFIX}
             RET=1
         fi
@@ -328,8 +328,8 @@ for i in \
             cat $CLIENT_LOG.c++.${SUFFIX}
             RET=1
         fi
-        if [ `grep -c "${CACHED_CHANNEL_STRING_ONE}" ${CLIENT_LOG}.c++.${SUFFIX}` != "2" ]; then
-            echo -e "\n***\n*** Failed. Expected 1 cached channels\n***"
+        if [ `grep -c "${CACHED_CHANNEL_STRING_NONE}" ${CLIENT_LOG}.c++.${SUFFIX}` != "2" ]; then
+            echo -e "\n***\n*** Failed. Expected 0 cached channels\n***"
             cat $CLIENT_LOG.c++.${SUFFIX}
             RET=1
         fi

From e52d2931a2a8dae63bfe1caa7967587e8b7040e4 Mon Sep 17 00:00:00 2001
From: Katherine Yang <katheriney@nvidia.com>
Date: Thu, 18 Apr 2024 11:25:42 -0700
Subject: [PATCH 2/3] fix windows build as well

---
 src/shared_memory_manager.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/shared_memory_manager.cc b/src/shared_memory_manager.cc
index bc5245cab7..1064982669 100644
--- a/src/shared_memory_manager.cc
+++ b/src/shared_memory_manager.cc
@@ -67,8 +67,9 @@ SharedMemoryManager::GetCUDAHandle(
 
 TRITONSERVER_Error*
 SharedMemoryManager::GetMemoryInfo(
-    const std::string& name, size_t offset, void** shm_mapped_addr,
-    TRITONSERVER_MemoryType* memory_type, int64_t* device_id)
+    const std::string& name, size_t offset, size_t byte_size,
+    void** shm_mapped_addr, TRITONSERVER_MemoryType* memory_type,
+    int64_t* device_id)
 {
   return TRITONSERVER_ErrorNew(
       TRITONSERVER_ERROR_UNSUPPORTED,

From fbefb19be4d35479233ff0044af33219c63223b7 Mon Sep 17 00:00:00 2001
From: Katherine Yang <katheriney@nvidia.com>
Date: Thu, 18 Apr 2024 15:27:46 -0700
Subject: [PATCH 3/3] Revert "fix test"

This reverts commit 07bbd841f6d8e5e7b435526ec4981e158b890790.
---
 qa/L0_grpc/test.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qa/L0_grpc/test.sh b/qa/L0_grpc/test.sh
index 50cf5a6f91..8f7d89d722 100755
--- a/qa/L0_grpc/test.sh
+++ b/qa/L0_grpc/test.sh
@@ -312,8 +312,8 @@ for i in \
             cat $CLIENT_LOG.c++.${SUFFIX}
             RET=1
         fi
-        if [ `grep -c "${CACHED_CHANNEL_STRING_ONE}" ${CLIENT_LOG}.c++.${SUFFIX}` != "2" ]; then
-            echo -e "\n***\n*** Failed. Expected 1 cached channel\n***"
+        if [ `grep -c "${CACHED_CHANNEL_STRING_NONE}" ${CLIENT_LOG}.c++.${SUFFIX}` != "2" ]; then
+            echo -e "\n***\n*** Failed. Expected 0 cached channels\n***"
             cat $CLIENT_LOG.c++.${SUFFIX}
             RET=1
         fi
@@ -328,8 +328,8 @@ for i in \
             cat $CLIENT_LOG.c++.${SUFFIX}
             RET=1
         fi
-        if [ `grep -c "${CACHED_CHANNEL_STRING_NONE}" ${CLIENT_LOG}.c++.${SUFFIX}` != "2" ]; then
-            echo -e "\n***\n*** Failed. Expected 0 cached channels\n***"
+        if [ `grep -c "${CACHED_CHANNEL_STRING_ONE}" ${CLIENT_LOG}.c++.${SUFFIX}` != "2" ]; then
+            echo -e "\n***\n*** Failed. Expected 1 cached channels\n***"
             cat $CLIENT_LOG.c++.${SUFFIX}
             RET=1
         fi