Zmq new

common/zmqclient.cpp

@@ -18,13 +18,21 @@ namespace swss {
 ZmqClient::ZmqClient(const std::string& endpoint)
 :ZmqClient(endpoint, "")
 {
+//    initialize(endpoint);
 }
 
 ZmqClient::ZmqClient(const std::string& endpoint, const std::string& vrf)
 {
     initialize(endpoint, vrf);
 }
 
+ZmqClient::ZmqClient(const std::string& endpoint, uint32_t waitTimeMs) :
+    m_waitTimeMs(waitTimeMs)
+{
+//    m_waitTimeMs = waitTimeMs;
+    initialize(endpoint);
+}
+
 ZmqClient::~ZmqClient()
 {
     std::lock_guard<std::mutex> lock(m_socketMutex);
@@ -55,6 +63,17 @@ void ZmqClient::initialize(const std::string& endpoint, const std::string& vrf)
 
     connect();
 }
+
+void ZmqClient::initialize(const std::string& endpoint)
+{
+    m_connected = false;
+    m_endpoint = endpoint;
+    m_context = nullptr;
+    m_socket = nullptr;
+    m_sendbuffer.resize(MQ_RESPONSE_MAX_COUNT);
+
+    connect();
+}
 
 bool ZmqClient::isConnected()
 {
@@ -63,6 +82,7 @@ bool ZmqClient::isConnected()
 
 void ZmqClient::connect()
 {
+SWSS_LOG_ERROR("DIV:: Inside function client connect");
     if (m_connected)
     {
         SWSS_LOG_DEBUG("Already connected to endpoint: %s", m_endpoint.c_str());
@@ -88,6 +108,7 @@ void ZmqClient::connect()
     m_context = zmq_ctx_new();
     m_socket = zmq_socket(m_context, ZMQ_PUSH);
 
+    SWSS_LOG_DEBUG("m_socket in client connect() is: %p\n", m_socket);
     // timeout all pending send package, so zmq will not block in dtor of this class: http://api.zeromq.org/master:zmq-setsockopt
     int linger = 0;
     zmq_setsockopt(m_socket, ZMQ_LINGER, &linger, sizeof(linger));
@@ -119,6 +140,7 @@ void ZmqClient::sendMsg(
         const std::string& tableName,
         const std::vector<KeyOpFieldsValuesTuple>& kcos)
 {
+SWSS_LOG_ERROR("DIV:: Inside function client sendMsg");
     int serializedlen = (int)BinarySerializer::serializeBuffer(
                                                         m_sendbuffer.data(),
                                                         m_sendbuffer.size(),
@@ -137,14 +159,14 @@ void ZmqClient::sendMsg(
     int zmq_err = 0;
     int retry_delay = 10;
     int rc = 0;
-    for (int i = 0; i <=  MQ_MAX_RETRY; ++i)
+    for (int i = 0; i <= MQ_MAX_RETRY; ++i)
     {
         {
             // ZMQ socket is not thread safe: http://api.zeromq.org/2-1:zmq
             std::lock_guard<std::mutex> lock(m_socketMutex);
 
             // Use none block mode to use all bandwidth: http://api.zeromq.org/2-1%3Azmq-send
-            rc = zmq_send(m_socket, m_sendbuffer.data(), serializedlen, ZMQ_NOBLOCK);
+        rc = zmq_send(m_socket, m_sendbuffer.data(), serializedlen, ZMQ_NOBLOCK);
         }
 
         if (rc >= 0)
@@ -164,7 +186,7 @@ void ZmqClient::sendMsg(
             //       For example when ZMQ socket still not receive reply message from last sended package.
             //       There was state machine inside ZMQ socket, when the socket is not in ready to send state, this error will happen.
             // for more detail, please check: http://api.zeromq.org/2-1:zmq-send
-            SWSS_LOG_DEBUG("zmq send retry, endpoint: %s, error: %d", m_endpoint.c_str(), zmq_err);
+            SWSS_LOG_WARN("zmq send retry, endpoint: %s, error: %d", m_endpoint.c_str(), zmq_err);
 
             retry_delay = 0;
         }
@@ -183,7 +205,7 @@ void ZmqClient::sendMsg(
         else
         {
             // for other error, send failed immediately.
-            auto message =  "zmq send failed, endpoint: " + m_endpoint + ", error: " + to_string(rc);
+            auto message =  "cli: zmq send failed, endpoint: " + m_endpoint + ", error: " + to_string(rc);
             SWSS_LOG_ERROR("%s", message.c_str());
             throw system_error(make_error_code(errc::io_error), message);
         }
@@ -192,9 +214,80 @@ void ZmqClient::sendMsg(
     }
 
     // failed after retry
-    auto message =  "zmq send failed, endpoint: " + m_endpoint + ", zmqerrno: " + to_string(zmq_err) + ":" + zmq_strerror(zmq_err) + ", msg length:" + to_string(serializedlen);
+    auto message =  "cli: zmq send failed, endpoint: " + m_endpoint + ", zmqerrno: " + to_string(zmq_err) + ":" + zmq_strerror(zmq_err) + ", msg length:" + to_string(serializedlen);
     SWSS_LOG_ERROR("%s", message.c_str());
     throw system_error(make_error_code(errc::io_error), message);
 }
 
+bool ZmqClient::wait(std::string& dbName,
+                     std::string& tableName,
+                     std::vector<std::shared_ptr<KeyOpFieldsValuesTuple>>& kcos)
+{
+SWSS_LOG_ERROR("DIV:: Inside function wait");
+    SWSS_LOG_ENTER();
+
+//    return false;
+
+    zmq_pollitem_t items [1] = { };
+    items[0].socket = m_socket;
+    items[0].events = ZMQ_POLLIN;
+
+/*    zmq_pollitem_t poll_item;
+    poll_item.fd = 0;
+    poll_item.socket = m_socket;
+    poll_item.events = ZMQ_POLLIN;
+    poll_item.revents = 0;*/
+
+    int rc;
+    for (int i = 0; true; ++i)
+    {
+//        rc = zmq_poll(&poll_item, 1, 1000);
+        rc = zmq_poll(items, 1, (int)m_waitTimeMs);
+	SWSS_LOG_DEBUG("cli: rc value is : %d", rc);
+        if (rc == 0)
+        {
+            SWSS_LOG_ERROR("zmq_poll timed out: zmqclient wait");
+            return false;
+//            continue;
+        }
+        if (rc > 0)
+        {
+            break;
+        }
+        if (zmq_errno() == EINTR && i <= MQ_MAX_RETRY)
+        {
+            SWSS_LOG_DEBUG("Checking the 2nd if condition in zmq poll");
+            continue;
+        }
+        SWSS_LOG_ERROR("zmqclient wait : zmq_poll failed, zmqerrno: %d", zmq_errno());
+    } 
+
+    for (int i = 0; true; ++i)
+    {
+        rc = zmq_recv(m_socket, m_sendbuffer.data(), m_sendbuffer.size(), ZMQ_DONTWAIT);
+        if (rc < 0)
+        {
+            if (zmq_errno() == EINTR && i <= MQ_MAX_RETRY)
+            {
+            SWSS_LOG_DEBUG("Checking the 2nd if condition in zmq receive");
+                continue;
+            }
+            SWSS_LOG_ERROR("zmqclient wait : zmq_recv failed, zmqerrno: %d", zmq_errno());
+            return false;
+        }
+        if (rc >= (int)m_sendbuffer.size())
+        {
+            SWSS_LOG_ERROR(
+                "zmq_recv message was truncated (over %d bytes, received %d), increase buffer size, message DROPPED",
+                (int)m_sendbuffer.size(), rc);
+//            return false;
+        }
+        break;
+    }
+    m_sendbuffer.at(rc) = 0; // make sure that we end string with zero before parse
+    kcos.clear();
+    BinarySerializer::deserializeBuffer(m_sendbuffer.data(), m_sendbuffer.size(), dbName, tableName, kcos);
+    return true;
+}
+
 }

common/zmqclient.h

@@ -12,8 +12,10 @@ namespace swss {
 class ZmqClient
 {
 public:
+
     ZmqClient(const std::string& endpoint);
     ZmqClient(const std::string& endpoint, const std::string& vrf);
+    ZmqClient(const std::string& endpoint, uint32_t waitTimeMs);
     ~ZmqClient();
 
     bool isConnected();
@@ -23,8 +25,14 @@ class ZmqClient
     void sendMsg(const std::string& dbName,
                  const std::string& tableName,
                  const std::vector<KeyOpFieldsValuesTuple>& kcos);
+
+    bool wait(std::string& dbName,
+              std::string& tableName,
+              std::vector<std::shared_ptr<KeyOpFieldsValuesTuple>>& kcos);
+
 private:
     void initialize(const std::string& endpoint, const std::string& vrf);
+    void initialize(const std::string& endpoint);
 
     std::string m_endpoint;
 
@@ -36,9 +44,11 @@ class ZmqClient
 
     bool m_connected;
 
+    uint32_t m_waitTimeMs;
+
     std::mutex m_socketMutex;
-    
-    std::vector<char> m_sendbuffer;
+
+    std::vector<char> m_sendbuffer;    
 };
 
 }

common/zmqproducerstatetable.cpp

@@ -148,6 +148,7 @@ void ZmqProducerStateTable::del(const std::vector<std::string> &keys)
 
 void ZmqProducerStateTable::send(const std::vector<KeyOpFieldsValuesTuple> &kcos)
 {
+SWSS_LOG_DEBUG("DIV:: Inside function ZmqProducerStateTable::send");
     m_zmqClient.sendMsg(
                         m_dbName,
                         m_tableNameStr,
@@ -164,6 +165,18 @@ void ZmqProducerStateTable::send(const std::vector<KeyOpFieldsValuesTuple> &kcos
     }
 }
 
+bool ZmqProducerStateTable::wait(std::string& dbName,
+
+              std::string& tableName,
+
+              std::vector<std::shared_ptr<KeyOpFieldsValuesTuple>>& kcos)
+
+{
+SWSS_LOG_DEBUG("DIV:: Inside function ZmqProducerStateTable::wait");
+    return m_zmqClient.wait(dbName, tableName, kcos);
+
+}
+
 size_t ZmqProducerStateTable::dbUpdaterQueueSize()
 {
     if (m_asyncDBUpdater == nullptr)

common/zmqproducerstatetable.h

@@ -37,6 +37,14 @@ class ZmqProducerStateTable : public ProducerStateTable
     // Batched send that can include both SET and DEL requests.
     virtual void send(const std::vector<KeyOpFieldsValuesTuple> &kcos);
 
+    // This method should only be used if the ZmqClient enables one-to-one sync.
+
+    virtual bool wait(std::string& dbName,
+
+              std::string& tableName,
+
+              std::vector<std::shared_ptr<KeyOpFieldsValuesTuple>>& kcos);
+
     size_t dbUpdaterQueueSize();
 private:
     void initialize(DBConnector *db, const std::string &tableName, bool dbPersistence);