Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=21619 hash MEs on RDMA portal
[fs/lustre-release.git]
/
lnet
/
lnet
/
peer.c
diff --git
a/lnet/lnet/peer.c
b/lnet/lnet/peer.c
index
c8ad591
..
8baf199
100644
(file)
--- a/
lnet/lnet/peer.c
+++ b/
lnet/lnet/peer.c
@@
-122,6
+122,7
@@
lnet_destroy_peer_locked (lnet_peer_t *lp)
LASSERT (lp->lp_rtr_refcount == 0);
LASSERT (list_empty(&lp->lp_txq));
LASSERT (lp->lp_txqnob == 0);
LASSERT (lp->lp_rtr_refcount == 0);
LASSERT (list_empty(&lp->lp_txq));
LASSERT (lp->lp_txqnob == 0);
+ LASSERT (lp->lp_rcd == NULL);
LIBCFS_FREE(lp, sizeof(*lp));
LIBCFS_FREE(lp, sizeof(*lp));
@@
-186,8
+187,8
@@
lnet_nid2peer_locked(lnet_peer_t **lpp, lnet_nid_t nid)
lp->lp_alive_count = 0;
lp->lp_timestamp = 0;
lp->lp_alive = !lnet_peers_start_down(); /* 1 bit!! */
lp->lp_alive_count = 0;
lp->lp_timestamp = 0;
lp->lp_alive = !lnet_peers_start_down(); /* 1 bit!! */
- lp->lp_last_alive = cfs_time_current
_sec
(); /* assumes alive */
- lp->lp_last_query = 0; /*
didn't ask LND
yet */
+ lp->lp_last_alive = cfs_time_current(); /* assumes alive */
+ lp->lp_last_query = 0; /*
haven't asked NI
yet */
lp->lp_ping_timestamp = 0;
lp->lp_nid = nid;
lp->lp_refcount = 2; /* 1 for caller; 1 for hash */
lp->lp_ping_timestamp = 0;
lp->lp_nid = nid;
lp->lp_refcount = 2; /* 1 for caller; 1 for hash */
@@
-221,15
+222,13
@@
lnet_nid2peer_locked(lnet_peer_t **lpp, lnet_nid_t nid)
return the_lnet.ln_shutdown ? -ESHUTDOWN : -EHOSTUNREACH;
}
return the_lnet.ln_shutdown ? -ESHUTDOWN : -EHOSTUNREACH;
}
- lp->lp_txcredits =
- lp->lp_mintxcredits = lp->lp_ni->ni_peertxcredits;
+ lp->lp_txcredits =
+ lp->lp_mintxcredits = lp->lp_ni->ni_peertxcredits;
+ lp->lp_rtrcredits =
+ lp->lp_minrtrcredits = lnet_peer_buffer_credits(lp->lp_ni);
- /* As a first approximation; allow this peer the same number of router
- * buffers as it is allowed outstanding sends */
- lp->lp_rtrcredits = lp->lp_minrtrcredits = lp->lp_txcredits;
-
- LASSERT (!the_lnet.ln_shutdown);
/* can't add peers after shutdown starts */
/* can't add peers after shutdown starts */
+ LASSERT (!the_lnet.ln_shutdown);
list_add_tail(&lp->lp_hashlist, lnet_nid2peerhash(nid));
the_lnet.ln_npeers++;
list_add_tail(&lp->lp_hashlist, lnet_nid2peerhash(nid));
the_lnet.ln_npeers++;
@@
-254,7
+253,7
@@
lnet_debug_peer(lnet_nid_t nid)
return;
}
return;
}
- if (lnet_isrouter(lp) || l
p->lp_ni->ni_peertimeout > 0
)
+ if (lnet_isrouter(lp) || l
net_peer_aliveness_enabled(lp)
)
aliveness = lp->lp_alive ? "up" : "down";
CDEBUG(D_WARNING, "%-24s %4d %5s %5d %5d %5d %5d %5d %ld\n",
aliveness = lp->lp_alive ? "up" : "down";
CDEBUG(D_WARNING, "%-24s %4d %5s %5d %5d %5d %5d %5d %ld\n",