LU-16282 lnet: fix debug message in lnet_discovery_event_reply

The message in lnet_discovery_event_reply currently says
"Peer X has discovery disabled" even though the same path
may be taken if discovery is disabled locally.
Change the debug message to indicate whether discovery is
disabled on the peer side or locally.

Test-Parameters: trivial testlist=sanity-lnet
Signed-off-by: Serguei Smirnov <ssmirnov@whamcloud.com>
Change-Id: I9c8be2286693c2bfc3f8cf67b6f3b8ab26f8258b
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/48997
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: Frank Sehr <fsehr@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c
index 7eff033..b93f8dd 100644 (file)
--- a/lnet/lnet/peer.c
+++ b/lnet/lnet/peer.c
@@ -2607,6 +2607,7 @@ lnet_discovery_event_reply(struct lnet_peer *lp, struct lnet_event *ev)
        struct lnet_ping_buffer *pbuf;
        int infobytes;
        int rc;
+       bool ping_feat_disc;
 
        spin_lock(&lp->lp_lock);
 
@@ -2648,10 +2649,12 @@ lnet_discovery_event_reply(struct lnet_peer *lp, struct lnet_event *ev)
         * The peer may have discovery disabled at its end. Set
         * NO_DISCOVERY as appropriate.
         */
-       if (!(pbuf->pb_info.pi_features & LNET_PING_FEAT_DISCOVERY) ||
-           lnet_peer_discovery_disabled) {
-               CDEBUG(D_NET, "Peer %s has discovery disabled\n",
-                      libcfs_nidstr(&lp->lp_primary_nid));
+       ping_feat_disc = pbuf->pb_info.pi_features & LNET_PING_FEAT_DISCOVERY;
+       if (!ping_feat_disc || lnet_peer_discovery_disabled) {
+               CDEBUG(D_NET, "Peer %s has discovery %s, local discovery %s\n",
+                      libcfs_nidstr(&lp->lp_primary_nid),
+                      ping_feat_disc ? "enabled" : "disabled",
+                      lnet_peer_discovery_disabled ? "disabled" : "enabled");
 
                /* Detect whether this peer has toggled discovery from on to
                 * off and whether we can delete and re-create the peer. Peers