Merge "Move active_flows from VrouterStatsAgent to VrouterStatsAgent.…

…flow_rate" into R2.22.x
Juniper · Apr 19, 2016 · 9b69ed7 · 9b69ed7
2 parents 562a243 + d8e5f35
commit 9b69ed7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/analytics/viz.sandesh b/src/analytics/viz.sandesh
@@ -1306,7 +1306,8 @@ const list<stat_table> _STAT_TABLES  = [
           { 'name' : 'flow_rate.min_flow_adds_per_second', 'datatype' : 'int', 'index' : false },
           { 'name' : 'flow_rate.deleted_flows', 'datatype' : 'int', 'index' : false },
           { 'name' : 'flow_rate.max_flow_deletes_per_second', 'datatype' : 'int', 'index' : false },
-          { 'name' : 'flow_rate.min_flow_deletes_per_second', 'datatype' : 'int', 'index' : false }
+          { 'name' : 'flow_rate.min_flow_deletes_per_second', 'datatype' : 'int', 'index' : false },
+          { 'name' : 'flow_rate.active_flows', 'datatype' : 'int', 'index' : false }
         ]
     }
 ]

diff --git a/src/vnsw/agent/uve/vrouter.sandesh b/src/vnsw/agent/uve/vrouter.sandesh
@@ -175,6 +175,7 @@ struct VrouterFlowRate {
     4: u32 deleted_flows;
     5: u32 max_flow_deletes_per_second;
     6: u32 min_flow_deletes_per_second;
+    7: optional u64 active_flows; //'dial' type. So no diff. Always aggregate
 }
 
 struct VrouterStatsAgent {  // Agent stats
@@ -214,7 +215,6 @@ struct VrouterStatsAgent {  // Agent stats
     18: optional u64 exception_packets_denied; 
     19: optional u64 exception_packets_allowed; 
     20: optional u64 total_flows; 
-    21: optional u64 active_flows; 
     22: optional u64 aged_flows; 
     23: optional u64 aged_flows_dp; 
     24: optional u64 active_flows_dp; 

diff --git a/src/vnsw/agent/uve/vrouter_uve_entry.cc b/src/vnsw/agent/uve/vrouter_uve_entry.cc
@@ -110,13 +110,6 @@ bool VrouterUveEntry::SendVrouterMsg() {
         change = true;
     }
 
-    uint64_t active_flow_count = agent_->pkt()->flow_table()->Size();
-    if (prev_stats_.get_active_flows() != active_flow_count || first) {
-        stats.set_active_flows(active_flow_count);
-        prev_stats_.set_active_flows(active_flow_count);
-        change = true;
-    }
-
     if (prev_stats_.get_aged_flows() !=
             agent_->stats()->flow_aged() || first) {
         stats.set_aged_flows(agent_->stats()->flow_aged());
@@ -244,6 +237,7 @@ bool VrouterUveEntry::SendVrouterMsg() {
             flow_rate.set_deleted_flows(aged_flows);
             flow_rate.set_max_flow_deletes_per_second(max_del_rate);
             flow_rate.set_min_flow_deletes_per_second(min_del_rate);
+            flow_rate.set_active_flows(agent_->pkt()->flow_table()->Size());
             stats.set_flow_rate(flow_rate);
             change = true;
             agent_->stats()->ResetFlowAddMinMaxStats(cur_time);