Add Tx and Rx drop stats in pysandesh

- Update drop stats in Tx and Rx path - Unit test for sandesh_stats module Change-Id: I9d38c51740cb054828f9f98cbe63d9b277be5f05 Partial-Bug: #1472106
Juniper · Jul 28, 2015 · a1acb24 · a1acb24
1 parent 0808b1d
commit a1acb24
Show file tree

Hide file tree

Showing 22 changed files with 563 additions and 180 deletions.
diff --git a/compiler/generate/t_cpp_generator.cc b/compiler/generate/t_cpp_generator.cc
@@ -1217,7 +1217,7 @@ void t_cpp_generator::generate_sandesh_async_creators(ofstream &out, t_sandesh *
     out << indent() << "if (level >= SendingLevel()) {" << endl;
     indent_up();
     out << indent() << "UpdateTxMsgFailStats(\"" << tsandesh->get_name() <<
-        "\", 0, Sandesh::DropReason::Send::QueueLevel);" << endl;
+        "\", 0, SandeshTxDropReason::QueueLevel);" << endl;
     if (!is_flow) {
         out << indent() << "DropLog" <<
             generate_sandesh_async_creator(tsandesh, false, false, false, "", "", false, false) <<

diff --git a/library/common/sandesh.sandesh b/library/common/sandesh.sandesh
@@ -57,6 +57,33 @@ enum SandeshLevel {
       INVALID = 0x7fffffff  
 }
 
+enum SandeshTxDropReason {
+    MinDropReason = 0,
+    NoDrop,
+    ValidationFailed,
+    QueueLevel,
+    NoClient,
+    NoSession,
+    NoQueue,
+    ClientSendFailed,
+    HeaderWriteFailed,
+    WriteFailed,
+    SessionNotConnected,
+    WrongClientSMState,
+    MaxDropReason
+}
+
+enum SandeshRxDropReason {
+    MinDropReason = 0,
+    NoDrop,
+    QueueLevel,
+    NoQueue,
+    ControlMsgFailed,
+    CreateFailed,
+    DecodingFailed,
+    MaxDropReason
+}
+
 const i32 SANDESH_KEY_HINT = 0x1
 const i32 SANDESH_CONTROL_HINT = 0x2
 const i32 SANDESH_SYNC_HINT = 0x4

diff --git a/library/common/sandesh_uve.sandesh b/library/common/sandesh_uve.sandesh
@@ -30,6 +30,7 @@ struct SandeshMessageStats {
     57: u64 messages_sent_dropped_header_write_failed;
     58: u64 messages_sent_dropped_write_failed;
     59: u64 messages_sent_dropped_wrong_client_sm_state;
+    60: u64 messages_sent_dropped_validation_failed;
     // Bytes
     81: u64 bytes_sent_dropped_no_queue;
     82: u64 bytes_sent_dropped_no_client;
@@ -40,6 +41,7 @@ struct SandeshMessageStats {
     87: u64 bytes_sent_dropped_header_write_failed;
     88: u64 bytes_sent_dropped_write_failed;
     89: u64 bytes_sent_dropped_wrong_client_sm_state;
+    90: u64 bytes_sent_dropped_validation_failed;
     // Receive
     // Messages
     101: u64 messages_received_dropped_no_queue;

diff --git a/library/cpp/sandesh.cc b/library/cpp/sandesh.cc
@@ -447,7 +447,7 @@ bool Sandesh::Enqueue(SandeshQueue *queue) {
             SANDESH_LOG(ERROR, __func__ << ": SandeshQueue NULL : Dropping Message: "
                 << ToString());
         }
-        UpdateTxMsgFailStats(name_, 0, Sandesh::DropReason::Send::NoQueue);
+        UpdateTxMsgFailStats(name_, 0, SandeshTxDropReason::NoQueue);
         Release();
         return false;
     }
@@ -584,7 +584,7 @@ bool Sandesh::SendEnqueue() {
                 Log();
             }
         }
-        UpdateTxMsgFailStats(name_, 0, Sandesh::DropReason::Send::NoClient);
+        UpdateTxMsgFailStats(name_, 0, SandeshTxDropReason::NoClient);
         Release();
         return false;        
     } 
@@ -593,7 +593,7 @@ bool Sandesh::SendEnqueue() {
             SANDESH_LOG(ERROR, "SANDESH: Send FAILED: " << ToString());
         }
         UpdateTxMsgFailStats(name_, 0,
-            Sandesh::DropReason::Send::ClientSendFailed);
+            SandeshTxDropReason::ClientSendFailed);
         Release();
         return false;
     }
@@ -648,7 +648,7 @@ bool SandeshUVE::Dispatch(SandeshConnection * sconn) {
         if (!client_->SendSandeshUVE(this)) {
             SANDESH_LOG(ERROR, "SandeshUVE : Send FAILED: " << ToString());
             UpdateTxMsgFailStats(Name(), 0,
-                Sandesh::DropReason::Send::ClientSendFailed);
+                SandeshTxDropReason::ClientSendFailed);
             Release();
             return false;
         }
@@ -659,15 +659,15 @@ bool SandeshUVE::Dispatch(SandeshConnection * sconn) {
     } else {
         Log();
     }
-    UpdateTxMsgFailStats(Name(), 0, Sandesh::DropReason::Send::NoClient);
+    UpdateTxMsgFailStats(Name(), 0, SandeshTxDropReason::NoClient);
     Release();
     return false;
 }
 
 bool SandeshRequest::Enqueue(SandeshRxQueue *queue) {
     if (!queue) {
         SANDESH_LOG(ERROR, "SandeshRequest: No RxQueue: " << ToString());
-        UpdateRxMsgFailStats(Name(), 0, Sandesh::DropReason::Recv::NoQueue);
+        UpdateRxMsgFailStats(Name(), 0, SandeshRxDropReason::NoQueue);
         Release();
         return false;
     }
@@ -733,7 +733,7 @@ void Sandesh::UpdateRxMsgStats(const std::string &msg_name,
 }
 
 void Sandesh::UpdateRxMsgFailStats(const std::string &msg_name,
-    uint64_t bytes, Sandesh::DropReason::Recv::type dreason) {
+    uint64_t bytes, SandeshRxDropReason::type dreason) {
     tbb::mutex::scoped_lock lock(stats_mutex_);
     msg_stats_.UpdateRecvFailed(msg_name, bytes, dreason);
 }
@@ -745,7 +745,7 @@ void Sandesh::UpdateTxMsgStats(const std::string &msg_name,
 }
 
 void Sandesh::UpdateTxMsgFailStats(const std::string &msg_name,
-    uint64_t bytes, Sandesh::DropReason::Send::type dreason) {
+    uint64_t bytes, SandeshTxDropReason::type dreason) {
     tbb::mutex::scoped_lock lock(stats_mutex_);
     msg_stats_.UpdateSendFailed(msg_name, bytes, dreason);
 }

diff --git a/library/cpp/sandesh.h b/library/cpp/sandesh.h
@@ -137,37 +137,6 @@ class Sandesh {
             Test,
         };
     };
-    struct DropReason {
-        struct Send {
-            enum type {
-                MinDropReason,
-                NoDrop = MinDropReason,
-                QueueLevel,
-                NoClient,
-                NoSession,
-                NoQueue,
-                ClientSendFailed,
-                HeaderWriteFailed,
-                WriteFailed,
-                SessionNotConnected,
-                WrongClientSMState,
-                MaxDropReason,
-            };
-        };
-        struct Recv {
-            enum type {
-                MinDropReason,
-                NoDrop = MinDropReason,
-                QueueLevel,
-                NoQueue,
-                ControlMsgFailed,
-                CreateFailed,
-                DecodingFailed,
-                MaxDropReason,
-            };
-        };
-    };
-
     typedef boost::tuple<size_t, SandeshLevel::type, bool, bool> QueueWaterMarkInfo;
     typedef boost::function<void (std::string serviceName, uint8_t numbOfInstances,
             DiscoveryServiceClient::ServiceHandler)> CollectorSubFn;
@@ -252,10 +221,10 @@ class Sandesh {
     static bool SendReady(SandeshConnection * sconn = NULL);
     static void UpdateRxMsgStats(const std::string &msg_name, uint64_t bytes);
     static void UpdateRxMsgFailStats(const std::string &msg_name,
-        uint64_t bytes, DropReason::Recv::type dreason);
+        uint64_t bytes, SandeshRxDropReason::type dreason);
     static void UpdateTxMsgStats(const std::string &msg_name, uint64_t bytes);
     static void UpdateTxMsgFailStats(const std::string &msg_name,
-        uint64_t bytes, DropReason::Send::type dreason);
+        uint64_t bytes, SandeshTxDropReason::type dreason);
     static void GetMsgStats(
         std::vector<SandeshMessageTypeStats> *mtype_stats,
         SandeshMessageStats *magg_stats);

diff --git a/library/cpp/sandesh_client.cc b/library/cpp/sandesh_client.cc
@@ -161,7 +161,7 @@ bool SandeshClient::ReceiveMsg(const std::string& msg,
             Sandesh::UpdateRxMsgStats(sandesh_name, msg.size());
         } else {
             Sandesh::UpdateRxMsgFailStats(sandesh_name, msg.size(),
-                Sandesh::DropReason::Recv::ControlMsgFailed);
+                SandeshRxDropReason::ControlMsgFailed);
         }
         return success;
     }
@@ -171,7 +171,7 @@ bool SandeshClient::ReceiveMsg(const std::string& msg,
     if (sandesh == NULL) {
         SANDESH_LOG(ERROR, __func__ << ": Unknown sandesh: " << sandesh_name);
         Sandesh::UpdateRxMsgFailStats(sandesh_name, msg.size(),
-            Sandesh::DropReason::Recv::CreateFailed);
+            SandeshRxDropReason::CreateFailed);
         return true;
     }
     boost::shared_ptr<sandesh_trans::TMemoryBuffer> btrans =
@@ -184,7 +184,7 @@ bool SandeshClient::ReceiveMsg(const std::string& msg,
     if (xfer < 0) {
         SANDESH_LOG(ERROR, __func__ << ": Decoding " << sandesh_name << " FAILED");
         Sandesh::UpdateRxMsgFailStats(sandesh_name, msg.size(),
-            Sandesh::DropReason::Recv::DecodingFailed);
+            SandeshRxDropReason::DecodingFailed);
         return false;
     }
 

diff --git a/library/cpp/sandesh_client_sm.cc b/library/cpp/sandesh_client_sm.cc
@@ -500,7 +500,7 @@ struct ClientInit : public sc::state<ClientInit, SandeshClientSMImpl> {
                     snh->ToString());
             }
             Sandesh::UpdateTxMsgFailStats(snh->Name(), 0,
-                Sandesh::DropReason::Send::WrongClientSMState);
+                SandeshTxDropReason::WrongClientSMState);
             SM_LOG(INFO, "Received UVE message in wrong state : " << snh->Name());
             snh->Release();
             return discard_event(); 
@@ -672,7 +672,7 @@ void SandeshClientSMImpl::ReleaseSandesh(const Ev &event) {
         SANDESH_LOG(ERROR, "SANDESH: Send FAILED: " << snh->ToString());
     }
     Sandesh::UpdateTxMsgFailStats(snh->Name(), 0,
-        Sandesh::DropReason::Send::WrongClientSMState);
+        SandeshTxDropReason::WrongClientSMState);
     SM_LOG(DEBUG, "Wrong state: " << StateName() << " for event: " <<
        event.Name() << " message: " << snh->Name());
     snh->Release();

diff --git a/library/cpp/sandesh_session.cc b/library/cpp/sandesh_session.cc
@@ -106,7 +106,7 @@ void SandeshWriter::SendMsg(Sandesh *sandesh, bool more) {
             " Sequence Number:" << sandesh->seqnum());
         session_->increment_send_msg_fail();
         Sandesh::UpdateTxMsgFailStats(sandesh->Name(), 0,
-            Sandesh::DropReason::Send::HeaderWriteFailed);
+            SandeshTxDropReason::HeaderWriteFailed);
         sandesh->Release();
         return;
     }
@@ -119,7 +119,7 @@ void SandeshWriter::SendMsg(Sandesh *sandesh, bool more) {
             " Sequence Number:" << sandesh->seqnum());
         session_->increment_send_msg_fail();
         Sandesh::UpdateTxMsgFailStats(sandesh->Name(), 0,
-            Sandesh::DropReason::Send::WriteFailed);
+            SandeshTxDropReason::WriteFailed);
         sandesh->Release();
         return;
     }
@@ -359,7 +359,7 @@ bool SandeshSession::SendMsg(Sandesh *sandesh) {
         }
         increment_send_msg_fail();
         Sandesh::UpdateTxMsgFailStats(sandesh->Name(), 0,
-            Sandesh::DropReason::Send::SessionNotConnected);
+            SandeshTxDropReason::SessionNotConnected);
         sandesh->Release();
         return true;
     }

diff --git a/library/cpp/sandesh_state_machine.cc b/library/cpp/sandesh_state_machine.cc
@@ -610,7 +610,7 @@ void SandeshStateMachine::UpdateRxMsgStats(const std::string &msg_name,
 }
 
 void SandeshStateMachine::UpdateRxMsgFailStats(const std::string &msg_name,
-    size_t msg_size, Sandesh::DropReason::Recv::type dreason) {
+    size_t msg_size, SandeshRxDropReason::type dreason) {
     tbb::mutex::scoped_lock lock(smutex_);
     message_stats_.UpdateRecvFailed(msg_name, msg_size, dreason);
 }
@@ -626,7 +626,7 @@ void SandeshStateMachine::OnSandeshMessage(SandeshSession *session,
     if (DoDropSandeshMessage(header, message_drop_level_)) {
         // Update message statistics
         UpdateRxMsgFailStats(message_type, msg.size(),
-            Sandesh::DropReason::Recv::QueueLevel);
+            SandeshRxDropReason::QueueLevel);
         delete xmessage;
         return;
     }
@@ -643,7 +643,7 @@ void SandeshStateMachine::OnSandeshMessage(SandeshSession *session,
                 << ret << ")");
             // Update message statistics
             UpdateRxMsgFailStats(message_type, msg.size(),
-                Sandesh::DropReason::Recv::ControlMsgFailed);
+                SandeshRxDropReason::ControlMsgFailed);
             delete xmessage;
             return;
         } 

diff --git a/library/cpp/sandesh_state_machine.h b/library/cpp/sandesh_state_machine.h
@@ -176,7 +176,7 @@ class SandeshStateMachine :
     void UpdateRxMsgStats(const std::string &msg_name,
         size_t msg_size);
     void UpdateRxMsgFailStats(const std::string &msg_name,
-        size_t msg_size, Sandesh::DropReason::Recv::type dreason);
+        size_t msg_size, SandeshRxDropReason::type dreason);
     void UpdateEventDequeue(const sc::event_base &event);
     void UpdateEventDequeueFail(const sc::event_base &event);
     void UpdateEventEnqueue(const sc::event_base &event);