Sflow fixes during DEL processing (#1427)

Sudharsan D.G · dgsudharsan · web-flow · commit 65f63c1647f5 · 2020-09-04T09:34:05.000-07:00
Co-authored-by: dgsudharsan &lt;sudharsan_gopalarat@dell.com&gt;
diff --git a/cfgmgr/sflowmgr.cpp b/cfgmgr/sflowmgr.cpp
@@ -328,7 +328,10 @@ void SflowMgr::doTask(Consumer &consumer)
                     }
                     sflowCheckAndFillValues(key,values);
                     m_sflowPortConfMap[key].local_conf = true;
-                    m_appSflowSessionTable.set(key, values);
+                    if (m_gEnable)
+                    {
+                        m_appSflowSessionTable.set(key, values);
+                    }
                 }
             }
         }
@@ -340,6 +343,7 @@ void SflowMgr::doTask(Consumer &consumer)
                 {
                     sflowHandleService(false);
                     sflowHandleSessionAll(false);
+                    sflowHandleSessionLocal(false);
                 }
                 m_gEnable = false;
                 m_appSflowTable.del(key);
@@ -350,7 +354,10 @@ void SflowMgr::doTask(Consumer &consumer)
                 {
                     if (!m_intfAllConf)
                     {
-                        sflowHandleSessionAll(true);
+                        if (m_gEnable)
+                        {
+                            sflowHandleSessionAll(true);
+                        }
                     }
                     m_intfAllConf = true;
                 }

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,10 @@ void SflowMgr::doTask(Consumer &consumer)`
`328`	`328`	`}`
`329`	`329`	`sflowCheckAndFillValues(key,values);`
`330`	`330`	`m_sflowPortConfMap[key].local_conf = true;`
`331`		`- m_appSflowSessionTable.set(key, values);`
	`331`	`+ if (m_gEnable)`
	`332`	`+ {`
	`333`	`+ m_appSflowSessionTable.set(key, values);`
	`334`	`+ }`
`332`	`335`	`}`
`333`	`336`	`}`
`334`	`337`	`}`
`@@ -340,6 +343,7 @@ void SflowMgr::doTask(Consumer &consumer)`
`340`	`343`	`{`
`341`	`344`	`sflowHandleService(false);`
`342`	`345`	`sflowHandleSessionAll(false);`
	`346`	`+ sflowHandleSessionLocal(false);`
`343`	`347`	`}`
`344`	`348`	`m_gEnable = false;`
`345`	`349`	`m_appSflowTable.del(key);`
`@@ -350,7 +354,10 @@ void SflowMgr::doTask(Consumer &consumer)`
`350`	`354`	`{`
`351`	`355`	`if (!m_intfAllConf)`
`352`	`356`	`{`
`353`		`- sflowHandleSessionAll(true);`
	`357`	`+ if (m_gEnable)`
	`358`	`+ {`
	`359`	`+ sflowHandleSessionAll(true);`
	`360`	`+ }`
`354`	`361`	`}`
`355`	`362`	`m_intfAllConf = true;`
`356`	`363`	`}`