瀏覽代碼

HPCC-12169 Minor MP/Jsocket tracing improvements

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Jake Smith 10 年之前
父節點
當前提交
f65a603a37
共有 2 個文件被更改,包括 14 次插入9 次删除
  1. 2 1
      system/jlib/jsocket.cpp
  2. 12 8
      system/mp/mpcomm.cpp

+ 2 - 1
system/jlib/jsocket.cpp

@@ -1543,7 +1543,8 @@ EintrRetry:
                 goto EintrRetry;
             }
             else {
-                LOGERR2(err,1,"readtms");
+                VStringBuffer errMsg("readtms(timeoutms=%d)", timeoutms);
+                LOGERR2(err,1,errMsg.str());
                 if ((err==ECONNRESET)||(err==EINTRCALL)||(err==ECONNABORTED)) {
                     errclose();
                     err = JSOCKERR_broken_pipe;

+ 12 - 8
system/mp/mpcomm.cpp

@@ -1667,7 +1667,11 @@ int CMPConnectThread::run()
                 sock->readtms(&id[0],sizeof(id),sizeof(id),rd,CONFIRM_TIMEOUT); 
                 if (rd != sizeof(id))
                 {
-                    FLLOG(MCoperatorWarning, unknownJob, "MP Connect Thread: invalid number of connection bytes serialized");
+                    StringBuffer errMsg("MP Connect Thread: invalid number of connection bytes serialized from ");
+                    SocketEndpoint ep;
+                    sock->getPeerEndpoint(ep);
+                    ep.getUrlStr(errMsg);
+                    FLLOG(MCoperatorWarning, unknownJob, "%s", errMsg.str());
                     sock->close();
                     continue;
                 }
@@ -1676,7 +1680,11 @@ int CMPConnectThread::run()
                 if (remoteep.isNull() || hostep.isNull())
                 {
                     // JCSMORE, I think remoteep really must/should match a IP of this local host
-                    FLLOG(MCoperatorWarning, unknownJob, "MP Connect Thread: invalid remote and/or host ep serialized");
+                    StringBuffer errMsg("MP Connect Thread: invalid remote and/or host ep serialized from ");
+                    SocketEndpoint ep;
+                    sock->getPeerEndpoint(ep);
+                    ep.getUrlStr(errMsg);
+                    FLLOG(MCoperatorWarning, unknownJob, "%s", errMsg.str());
                     sock->close();
                     continue;
                 }
@@ -2220,9 +2228,7 @@ public:
                 const SocketEndpoint &ep = e->queryEndpoint();
                 if (src && (ep == src->endpoint()))
                     throw;
-                StringBuffer epStr;
-                ep.getUrlStr(epStr);
-                FLLOG(MCoperatorWarning, unknownJob, "CInterCommunicator: ignoring closed endpoint: %s", epStr.str());
+                // ignoring closed endpoint
                 e->Release();
                 // loop around and recv again
             }
@@ -2459,9 +2465,7 @@ public:
                 const SocketEndpoint &ep = e->queryEndpoint();
                 if (RANK_NULL != group->rank(ep))
                     throw;
-                StringBuffer epStr;
-                ep.getUrlStr(epStr);
-                FLLOG(MCoperatorWarning, unknownJob, "CCommunicator: ignoring closed endpoint from outside the communicator group: %s", epStr.str());
+                // ignoring closed endpoint from outside the communicator group
                 e->Release();
                 // loop around and recv again
             }