delay sending keepalive when startup

Author: nmq

bean/RConfig.cpp

@@ -70,7 +70,7 @@ int RConfig::Parse(bool is_server, int argc, const char *const *argv) {
     args::ValueFlag<uint16_t> cap_timeout(opt, "", "pcap timeout(ms). > 0 and <= 50", {"cap_timeout"});
 
     args::ValueFlag<int> keepAlive(opt, "keepalive interval",
-                                   "interval used to send keepalive request. default 2s for client, 4s for server.",
+                                   "interval used to send keepalive request. default 4s.",
                                    {"keepalive"});
     try {
         parser.ParseCLI(argc, argv);

bean/RConfig.h

@@ -50,7 +50,7 @@ struct RConfig {
 #ifdef RSOCK_IS_SERVER_
         int keepAliveIntervalSec = 4;  // default 4s, 3 times
 #else
-        int keepAliveIntervalSec = 2;  // default 2s, 3 times
+        int keepAliveIntervalSec = 4;  // default 2s, 3 times
 #endif
 
         const std::string version = RSOCK_BUILD_TIME;

callbacks/NetConnKeepAlive.cpp

@@ -119,7 +119,7 @@ void NetConnKeepAlive::OnFlush(uint64_t timestamp) {
         // wait until the conn is not new: it has sent some bytes before
         // This check mainly solve the bug: if keepalive packet reaches server before data does, the server will send rst,
         // and this conn will be closed and no more connected.
-        if (!conn->IsNew()) {
+        if (canSendRequest(conn, timestamp)) {
             auto it = mReqMap.find(conn->IntKey());
             if (it != mReqMap.end()) {  // has record, increment number of trials
                 it->second++;
@@ -164,3 +164,15 @@ int NetConnKeepAlive::RemoveAllRequest() {
     mReqMap.clear();
     return 0;
 }
+
+bool NetConnKeepAlive::canSendRequest(INetConn *conn, uint64_t timestampMs) const {
+    if (conn && !conn->IsNew()) {
+        if (timestampMs > conn->EstablishedTimeStampMs()) { // use compare first, in case overflow
+            int df = timestampMs - conn->EstablishedTimeStampMs();
+            if (df >= REQUEST_DELAY) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

callbacks/NetConnKeepAlive.h

@@ -51,13 +51,16 @@ class NetConnKeepAlive : public INetConnKeepAlive, public ITimerObserver {
     // in case some invalid request is still in the pool. remove them
     void removeInvalidRequest();
 
+    bool canSendRequest(INetConn *conn, uint64_t timestampMs) const;
+
 private:
     const int MAX_RETRY = 3;
     const uint32_t FLUSH_INTERVAL = 0;  // shoud be same with RConfig.keepAlive
     KeepAliveRouteObserver *mRouteObserver = nullptr;
     IAppGroup *mAppGroup = nullptr;
     std::map<IntKeyType, int> mReqMap;
     IReset *mReset = nullptr;
+    static const int REQUEST_DELAY = 15000;    // 15s
 };
 
 

conn/INetConn.cpp

@@ -9,7 +9,8 @@
 #include "../util/rsutil.h"
 #include "../src/util/KeyGenerator.h"
 
-INetConn::INetConn(IntKeyType key) : IConn(KeyGenerator::StrForIntKey(key)), mIntKey(key) {
+INetConn::INetConn(IntKeyType key) : IConn(KeyGenerator::StrForIntKey(key)), mIntKey(key),
+                                     mEstablishedTimeStampMs(rsk_now_ms()) {
 }
 
 //INetConn::INetConn(const std::string &key) : IConn(key) {
@@ -84,6 +85,10 @@ bool INetConn::IsNew() const {
 }
 
 bool INetConn::Alive() {
-    return IConn::Alive() && mAlive;
+    return mAlive;
+}
+
+uint64_t INetConn::EstablishedTimeStampMs() const {
+    return mEstablishedTimeStampMs;
 }
 

conn/INetConn.h

@@ -41,6 +41,11 @@ class INetConn : public IConn {
 
     static const std::string BuildPrintableStr(const ConnInfo &info, IntKeyType key);
 
+    /*
+     * return when is the connection established
+     */
+    uint64_t EstablishedTimeStampMs() const;
+
     bool IsNew() const;
 
     IntKeyType IntKey() const;
@@ -54,6 +59,7 @@ class INetConn : public IConn {
     bool mNew = true;
     bool mAlive = true;
     int mErrCode = ERR_NO_ERR;
+    const uint64_t mEstablishedTimeStampMs = 0xffffffff;
 };
 
 #endif //RSOCK_INETCONN_H

net/INetManager.cpp

@@ -36,7 +36,9 @@ IBtmConn *INetManager::BindUdp(const ConnInfo &info) {
 }
 
 void INetManager::closeTcp(uv_tcp_t *tcp) {
-    uv_close((uv_handle_t *) tcp, close_cb);
+    if (tcp) {
+        uv_close((uv_handle_t *) tcp, close_cb);
+    }
 }
 
 bool INetManager::Wait2GetInfo(TcpInfo &info) {

server/ServerNetManager.cpp

@@ -54,6 +54,10 @@ uv_tcp_t *ServerNetManager::GetTcp(TcpInfo &info) {
     auto it = mPool.find(info);
     if (it != mPool.end()) {
         auto tcp = it->second.conn;
+        if (!tcp) {
+            LOGD << "tcp temporarily null, just return";
+            return nullptr;
+        }
         mPool.erase(it);
         bool ok = mTcpAckPool->Wait2TransferInfo(info, BLOCK_WAIT_MS);
         if (ok) {
@@ -62,6 +66,8 @@ uv_tcp_t *ServerNetManager::GetTcp(TcpInfo &info) {
             LOGE << "AckPool has no record in pool: " << info.ToStr();
             closeTcp(tcp);
         }
+    } else {
+        LOGD << "TcpPool has no info: " << info.ToStr();
     }
     int n = mTcpAckPool->RemoveInfo(info);
     LOGD << "Remove the tcpInfo " << ((n > 0) ? "succeeded" : "failed");