* discovery disabled, we need to reflect that in our
* representation of the peer.
*/
- if (!(lp->lp_state & LNET_PEER_NO_DISCOVERY))
+ if (!(lp->lp_state & (LNET_PEER_NO_DISCOVERY |
+ LNET_PEER_DISCOVERING)))
lp->lp_state |= LNET_PEER_MARK_DELETION;
lp->lp_state |= LNET_PEER_NO_DISCOVERY;
} else if (lp->lp_state & LNET_PEER_NO_DISCOVERY) {
} else {
CDEBUG(D_NET, "Peer %s has discovery disabled\n",
libcfs_nid2str(lp->lp_primary_nid));
- /*
- * If the peer is going from discovery enabled to
- * discovery disabled, we need to reflect that in our
- * representation of the peer.
- */
- if (!(lp->lp_state & LNET_PEER_NO_DISCOVERY))
- lp->lp_state |= LNET_PEER_MARK_DELETION;
lp->lp_state |= LNET_PEER_NO_DISCOVERY;
}
init_logging
ALWAYS_EXCEPT="$SANITY_SEC_EXCEPT "
-# bug number for skipped test: LU-12312
-ALWAYS_EXCEPT+=" 31"
+# bug number for skipped test:
+ALWAYS_EXCEPT+=" "
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
[ "$SLOW" = "no" ] && EXCEPT_SLOW="26"