Fix yet an other error and remove a redundant variable

Signed-off-by: Stephen Sun <stephens@nvidia.com>
sonic-net · Nov 13, 2020 · dd13ec8 · dd13ec8
1 parent 751ff99
commit dd13ec8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/cfgmgr/buffermgrdyn.cpp b/cfgmgr/buffermgrdyn.cpp
@@ -343,25 +343,15 @@ void BufferMgrDynamic::recalculateSharedBufferPool()
 
                 auto &poolSizeStr = pairs[1];
                 unsigned long poolSizeNum = atol(poolSizeStr.c_str());
-                if (m_mmuSizeNumber > 0 && m_mmuSizeNumber >= poolSizeNum)
-                {
-                    pool.total_size = poolSizeStr;
-                }
-                else
+                if (m_mmuSizeNumber > 0 && m_mmuSizeNumber < poolSizeNum)
                 {
                     SWSS_LOG_ERROR("Buffer pool %s: Invalid size %s, exceeding the mmu size %s",
                                    poolName.c_str(), poolSizeStr.c_str(), m_mmuSize.c_str());
+                    continue;
                 }
 
-                if (pool.initialized)
-                {
-                    updateBufferPoolToDb(poolName, pool);
-                }
-                else
-                {
-                    updateBufferPoolToDb(poolName, pool);
-                    pool.initialized = true;
-                }
+                pool.total_size = poolSizeStr;
+                updateBufferPoolToDb(poolName, pool);
 
                 SWSS_LOG_NOTICE("Buffer pool %s had been updated with new size [%s]", poolName.c_str(), pool.total_size.c_str());
             }
@@ -1170,7 +1160,6 @@ task_process_status BufferMgrDynamic::handleBufferPoolTable(Consumer &consumer)
         // 2. Record the table in the internal cache m_bufferPoolLookup
         buffer_pool_t &bufferPool = m_bufferPoolLookup[pool];
 
-        bufferPool.initialized = false;
         bufferPool.dynamic_size = true;
         for (auto i = kfvFieldsValues(tuple).begin(); i != kfvFieldsValues(tuple).end(); i++)
         {
@@ -1199,7 +1188,6 @@ task_process_status BufferMgrDynamic::handleBufferPoolTable(Consumer &consumer)
         }
         if (!bufferPool.dynamic_size)
         {
-            bufferPool.initialized = true;
             m_applBufferPoolTable.set(pool, fvVector);
             m_stateBufferPoolTable.set(pool, fvVector);
         }

diff --git a/cfgmgr/buffermgrdyn.h b/cfgmgr/buffermgrdyn.h
@@ -19,7 +19,6 @@ namespace swss {
 typedef struct {
     bool ingress;
     bool dynamic_size;
-    bool initialized;
     std::string total_size;
     std::string mode;
     std::string xoff;