* Changed LNET "dropped message" CERRORs to D_NETERROR. This is to reduce

   "console chatter" resulting from lustre timeouts racing with RPC
   completion (e.g. BUG 11223)

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index 20eceed..750deb9 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -1640,11 +1640,12 @@ lnet_parse_put(lnet_ni_t *ni, lnet_msg_t *msg)
                 /* fall through */
 
         case LNET_MATCHMD_DROP:
-                CWARN("Dropping PUT from %s portal %d match "LPU64
-                      " offset %d length %d: %d\n",
-                      libcfs_id2str(src), index, 
-                      hdr->msg.put.match_bits, 
-                      hdr->msg.put.offset, rlength, rc);
+                CDEBUG(D_NETERROR,
+                       "Dropping PUT from %s portal %d match "LPU64
+                       " offset %d length %d: %d\n",
+                       libcfs_id2str(src), index, 
+                       hdr->msg.put.match_bits, 
+                       hdr->msg.put.offset, rlength, rc);
                 LNET_UNLOCK();
 
                 return ENOENT;          /* +ve: OK but no match */
@@ -1676,13 +1677,14 @@ lnet_parse_get(lnet_ni_t *ni, lnet_msg_t *msg, int rdma_get)
                            hdr->msg.get.match_bits, msg,
                            &mlength, &offset, &md);
         if (rc == LNET_MATCHMD_DROP) {
-                CWARN("Dropping GET from %s portal %d match "LPU64
-                      " offset %d length %d\n",
-                      libcfs_id2str(src), 
-                      hdr->msg.get.ptl_index, 
-                      hdr->msg.get.match_bits, 
-                      hdr->msg.get.src_offset,
-                      hdr->msg.get.sink_length);
+                CDEBUG(D_NETERROR,
+                       "Dropping GET from %s portal %d match "LPU64
+                       " offset %d length %d\n",
+                       libcfs_id2str(src), 
+                       hdr->msg.get.ptl_index, 
+                       hdr->msg.get.match_bits, 
+                       hdr->msg.get.src_offset,
+                       hdr->msg.get.sink_length);
                 LNET_UNLOCK();
                 return ENOENT;                  /* +ve: OK but no match */
         }
@@ -1743,12 +1745,12 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg)
         /* NB handles only looked up by creator (no flips) */
         md = lnet_wire_handle2md(&hdr->msg.reply.dst_wmd);
         if (md == NULL || md->md_threshold == 0) {
-                CWARN("%s: Dropping REPLY from %s for %s "
-                      "MD "LPX64"."LPX64"\n", 
-                      libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
-                      (md == NULL) ? "invalid" : "inactive",
-                      hdr->msg.reply.dst_wmd.wh_interface_cookie,
-                      hdr->msg.reply.dst_wmd.wh_object_cookie);
+                CDEBUG(D_NETERROR, "%s: Dropping REPLY from %s for %s "
+                       "MD "LPX64"."LPX64"\n", 
+                       libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
+                       (md == NULL) ? "invalid" : "inactive",
+                       hdr->msg.reply.dst_wmd.wh_interface_cookie,
+                       hdr->msg.reply.dst_wmd.wh_object_cookie);
 
                 LNET_UNLOCK();
                 return ENOENT;                  /* +ve: OK but no match */
@@ -1761,9 +1763,9 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg)
 
         if (mlength < rlength &&
             (md->md_options & LNET_MD_TRUNCATE) == 0) {
-                CERROR ("%s: Dropping REPLY from %s length %d "
-                        "for MD "LPX64" would overflow (%d)\n",
-                        libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
+                CDEBUG(D_NETERROR, "%s: Dropping REPLY from %s length %d "
+                       "for MD "LPX64" would overflow (%d)\n",
+                       libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
                         rlength, hdr->msg.reply.dst_wmd.wh_object_cookie,
                         mlength);
                 LNET_UNLOCK();
@@ -1816,14 +1818,13 @@ lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg)
         /* NB handles only looked up by creator (no flips) */
         md = lnet_wire_handle2md(&hdr->msg.ack.dst_wmd);
         if (md == NULL || md->md_threshold == 0) {
-#if 0
                 /* Don't moan; this is expected */
-                CERROR ("%s: Dropping ACK from %s to %s MD "LPX64"."LPX64"\n",
-                        libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
-                        (md == NULL) ? "invalid" : "inactive",
-                        hdr->msg.ack.dst_wmd.wh_interface_cookie,
-                        hdr->msg.ack.dst_wmd.wh_object_cookie);
-#endif
+                CDEBUG(D_NET,
+                       "%s: Dropping ACK from %s to %s MD "LPX64"."LPX64"\n",
+                       libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
+                       (md == NULL) ? "invalid" : "inactive",
+                       hdr->msg.ack.dst_wmd.wh_interface_cookie,
+                       hdr->msg.ack.dst_wmd.wh_object_cookie);
                 LNET_UNLOCK();
                 return ENOENT;                  /* +ve! */
         }