[LU-1419] Tracking ticket for gnilnd push

• Type: New Feature
• Resolution: Fixed
• Priority: Minor
• Fix Version/s: Lustre 2.4.0
• Labels: lnet
• Assignee: WC Triage
• Reporter: Chris Horn

Description

Cray is preparing to submit gnilnd for upstream adoption. This ticket is for tracking that work.

Comments

[James A Simmons]

Attached to ticket since JIRA managed my script.

[James A Simmons]

Here is a handy script I used for re-tabbing.After you commit your code just run it and then push it upstream.
.
#!/bin/bash -e
#

1. Rewrite the last commit to remove any trailing whitespace
2. in the new version of changed lines.
3. Then replace space-based indentation with TAB based indentation
4. based on TABS at every eight position
   #
   [[ -z $TRACE ]] || set -x
   trap "rm -f $tmpf" 0
   tmpf1=$TMP/$$.1.diff
   tmpf2=$TMP/$$.2.diff
   git show --binary >$tmpf1
   perl -p -e 's/^{(+.?)[ \t]+$/$1/; while(m/}(+\t)( {1,7}

   \t|

   {8}

   )(.*)/)

   { $_=$1."\t".$3."\n"; }

   ' <$tmpf1 >$tmpf2
   if ! cmp -s $tmpf1 $tmpf2
   then
   git apply --binary --index -R --whitespace=nowarn $tmpf1
   git apply --binary --index $tmpf2
   GIT_EDITOR=true git commit --amend
   else
   echo "No changes"
   fi

[Cory Spitz]

Our push of gnilnd is eminent. However, it was written before we adopted the retab policy. Can we please submit with the old whitespace style? It would help us from touching every single line or keeping our version and the contributed version different. Thoughts or suggestions?

[James A Simmons]

The ticket is in http://jira.whamcloud.com/browse/LU-1422 for this. Want to let you know for peer review. Thanks

[Cory Spitz]

Yes, we'll aim at master. Then, if there is reason to push back, we can do so later.

Other changes that aren't related to the gnilnd should be tracked in a different ticket. James, can you open one for the INITIAL_CONNECT_TIMEOUT problem?

[James A Simmons]

Will this work only be aimed at the master branch? Also during ORNL testing of IR recovery we discovered some old left over code from the catamount days that impacted the recovery time. Should we merge that fix under this ticket? Its just the INITIAL_CONNECT_TIMEOUT in obd_support.h.