[syncd] Fix status succes on bulk fallback (sonic-net#867)

Metaswitch · Jul 30, 2021 · 0d5f82f · 0d5f82f
1 parent 6921d99
commit 0d5f82f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/src/RedisRemoteSaiInterface.cpp b/lib/src/RedisRemoteSaiInterface.cpp
@@ -1337,7 +1337,7 @@ sai_status_t RedisRemoteSaiInterface::waitForBulkResponse(
 
         if (values.size () != object_count)
         {
-            SWSS_LOG_THROW("wrong number of counters, got %zu, expected %u", values.size(), object_count);
+            SWSS_LOG_THROW("wrong number of statuses, got %zu, expected %u", values.size(), object_count);
         }
 
         // deserialize statuses for all objects

diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp
@@ -1285,6 +1285,8 @@ sai_status_t Syncd::processBulkEntry(
 
     // vendor SAI don't bulk API yet, so execute one by one
 
+    all = SAI_STATUS_SUCCESS;
+
     for (size_t idx = 0; idx < objectIds.size(); ++idx)
     {
         sai_object_meta_key_t metaKey;
@@ -1585,6 +1587,10 @@ sai_status_t Syncd::processBulkOid(
         }
     }
 
+    // vendor SAI don't bulk API yet, so execute one by one
+
+    all = SAI_STATUS_SUCCESS;
+
     for (size_t idx = 0; idx < objectIds.size(); ++idx)
     {
         sai_status_t status = SAI_STATUS_FAILURE;