From 4e32706df75ea87b2d09016ae8f4980a94ee62ad Mon Sep 17 00:00:00 2001
From: Jipan Yang <jipan.yang@alibaba-inc.com>
Date: Thu, 12 Oct 2017 23:07:26 -0700
Subject: [PATCH] Fix orchagent hang problem caused by erase operation on empty
 map

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
---
 orchagent/switchorch.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/orchagent/switchorch.cpp b/orchagent/switchorch.cpp
index ab74bb8ad1..975469a582 100644
--- a/orchagent/switchorch.cpp
+++ b/orchagent/switchorch.cpp
@@ -43,6 +43,8 @@ void SwitchOrch::doTask(Consumer &consumer)
 
         if (op == SET_COMMAND)
         {
+            bool retry = false;
+
             for (auto i : kfvFieldsValues(t))
             {
                 auto attribute = fvField(i);
@@ -50,8 +52,7 @@ void SwitchOrch::doTask(Consumer &consumer)
                 if (switch_attribute_map.find(attribute) == switch_attribute_map.end())
                 {
                     SWSS_LOG_ERROR("Unsupported switch attribute %s", attribute.c_str());
-                    it = consumer.m_toSync.erase(it);
-                    continue;
+                    break;
                 }
 
                 auto value = fvValue(i);
@@ -59,6 +60,7 @@ void SwitchOrch::doTask(Consumer &consumer)
                 sai_attribute_t attr;
                 attr.id = switch_attribute_map.at(attribute);
 
+                bool invalid_attr = false;
                 switch (attr.id)
                 {
                     case SAI_SWITCH_ATTR_FDB_UNICAST_MISS_PACKET_ACTION:
@@ -67,8 +69,8 @@ void SwitchOrch::doTask(Consumer &consumer)
                         if (packet_action_map.find(value) == packet_action_map.end())
                         {
                             SWSS_LOG_ERROR("Unsupported packet action %s", value.c_str());
-                            it = consumer.m_toSync.erase(it);
-                            continue;
+                            invalid_attr = true;
+                            break;
                         }
                         attr.value.s32 = packet_action_map.at(value);
                         break;
@@ -79,19 +81,32 @@ void SwitchOrch::doTask(Consumer &consumer)
                         break;
 
                     default:
+                        invalid_attr = true;
                         break;
                 }
+                if (invalid_attr)
+                {
+                    /* break from kfvFieldsValues for loop */
+                    break;
+                }
 
                 sai_status_t status = sai_switch_api->set_switch_attribute(gSwitchId, &attr);
                 if (status != SAI_STATUS_SUCCESS)
                 {
                     SWSS_LOG_ERROR("Failed to set switch attribute %s to %s, rv:%d",
                             attribute.c_str(), value.c_str(), status);
-                    it++;
-                    continue;
+                    retry = true;
+                    break;
                 }
 
                 SWSS_LOG_NOTICE("Set switch attribute %s to %s", attribute.c_str(), value.c_str());
+            }
+            if (retry == true)
+            {
+                it++;
+            }
+            else
+            {
                 it = consumer.m_toSync.erase(it);
             }
         }