diff options
| -rw-r--r-- | README/index.html | 100 | ||||
| -rw-r--r-- | README/index.txt | 1 | ||||
| -rw-r--r-- | README/src/git/ssh-multiplex.html | 724 | ||||
| -rw-r--r-- | README/src/git/ssh-multiplex.txt | 113 |
4 files changed, 937 insertions, 1 deletions
diff --git a/README/index.html b/README/index.html index 172692da5..7e37211f5 100644 --- a/README/index.html +++ b/README/index.html @@ -938,13 +938,111 @@ resolve the situation.</p></div> <span class="na">mergeoptions</span> <span class="o">=</span> <span class="s">--ff-only</span> </pre></div></div></div> </div> +<div class="sect2"> +<h3 id="_set_up_ssh_mulitplexing_for_speed">2.6. Set up SSH Mulitplexing for Speed</h3> +<div class="paragraph"><p>This is one of my most convenient tricks. The slowest parts of <tt>git pull</tt> and +<tt>git push</tt> are starting up the SSH connection. However, there is a way to +eliminate this problem simply by opening a persistent tunnel, which <tt>git pull</tt> +and <tt>git push</tt> automatically reuse.</p></div> +<div class="sect3"> +<h4 id="_ssh_config">2.6.1. ~/.ssh/config</h4> +<div class="paragraph"><p>Enter the ControlMaster option for OpenSSH.</p></div> +<div class="quoteblock"> +<div class="content"> +<div class="paragraph"><p><strong>ControlMaster</strong></p></div> +<div class="paragraph"><p>Enables the sharing of multiple sessions over a single network connection. +When set to “yes”, ssh(1) will listen for connections on a control socket +specified using the ControlPath argument. Additional sessions can connect to +this socket using the same <strong>ControlPath</strong> with <strong>ControlMaster</strong> set to “no” +(the default).</p></div> +<div class="paragraph"><p>These sessions will try to reuse the master instance’s network connection +rather than initiating new ones, but will fall back to connecting normally if +the control socket does not exist, or is not listening.</p></div> +<div class="paragraph"><p>Setting this to “ask” will cause ssh to listen for control connections, but +require confirmation using the SSH_ASKPASS program before they are accepted +(see ssh-add(1) for details). If the <strong>ControlPath</strong> cannot be opened, ssh will +continue without connecting to a master instance.</p></div> +<div class="paragraph"><p>X11 and ssh-agent(1) forwarding is supported over these multiplexed +connections, however the display and agent forwarded will be the one belonging +to the master connection i.e. it is not possible to forward multiple displays +or agents.</p></div> +<div class="paragraph"><p>Two additional options allow for opportunistic multiplexing: try to use a +master connection but fall back to creating a new one if one does not already +exist. These options are: “auto” and “autoask”. The latter requires +confirmation like the “ask” option.</p></div> +</div> +<div class="attribution"> +</div></div> +<div class="paragraph"><p>So I set up my ~/.ssh/config as follows.</p></div> +<div class="listingblock"> +<div class="content"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1 +2 +3 +4 +5 +6</pre></div></td><td class="code"><div class="highlight"><pre><span class="c">#~/.ssh/config</span> +ControlMaster auto +ControlPath ~/.ssh/pool/%r@%h +ServerAliveCountMax 6 +ServerAliveInterval 10 +TCPKeepAlive yes +</pre></div> +</td></tr></table></div></div> +<div class="paragraph"><p>And we’re set!.</p></div> +</div> +<div class="sect3"> +<h4 id="_first_a_few_benchmarks">2.6.2. First, a few benchmarks</h4> +<div class="paragraph"><p>First, lets see how fast it is without the magic:</p></div> +<div class="listingblock"> +<div class="content"><div class="highlight"><pre>> <span class="nb">time </span><span class="k">for </span>i in <span class="k">$(</span> seq 0 10 <span class="k">)</span> ; <span class="k">do </span>git fetch github; <span class="k">done</span> + +real 0m47.798s +user 0m0.226s +sys 0m0.236s + +> <span class="nb">time </span><span class="k">for </span>i in <span class="k">$(</span> seq 0 10 <span class="k">)</span> ; <span class="k">do </span>git fetch origin; <span class="k">done</span> + +real 0m48.444s +user 0m0.235s +sys 0m0.250s +</pre></div></div></div> +<div class="paragraph"><p>Averaging about 4.34s per fetch to Github, 4.40s to gentoo overlays.</p></div> +<div class="paragraph"><p>SLOOW.</p></div> +</div> +<div class="sect3"> +<h4 id="_start_a_background_connection">2.6.3. Start a background connection</h4> +<div class="paragraph"><p>With ControlMaster, you set up a long-lived SSH connection.</p></div> +<div class="listingblock"> +<div class="content"><div class="highlight"><pre>> ssh -fNn git@github.com +> ssh -fNn git@git.overlays.gentoo.org +</pre></div></div></div> +<div class="paragraph"><p>And we’re truely really to start cooking with petrol.</p></div> +</div> +<div class="sect3"> +<h4 id="_post_configuration_benchmarks">2.6.4. Post Configuration Benchmarks</h4> +<div class="listingblock"> +<div class="content"><div class="highlight"><pre>> <span class="nb">time </span><span class="k">for </span>i in <span class="k">$(</span> seq 0 10 <span class="k">)</span> ; <span class="k">do </span>git fetch github; <span class="k">done</span> + +real 0m12.935s +user 0m0.093s +sys 0m0.193s + +> <span class="nb">time </span><span class="k">for </span>i in <span class="k">$(</span> seq 0 10 <span class="k">)</span> ; <span class="k">do </span>git fetch origin; <span class="k">done</span> + +real 0m11.597s +user 0m0.099s +sys 0m0.191s +</pre></div></div></div> +<div class="paragraph"><p>O_o. Averaging about 1.175s and 1.05s respectively.</p></div> +</div> +</div> </div> </div> </div> <div id="footnotes"><hr/></div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-29 13:27:58 NZDT +Last updated 2010-09-29 14:37:13 NZDT </div> <div id="footer-badges"> <a href="http://validator.w3.org/check?uri=referer"> diff --git a/README/index.txt b/README/index.txt index ed4518e4b..c4f04dd52 100644 --- a/README/index.txt +++ b/README/index.txt @@ -14,3 +14,4 @@ include::src/git/contribution-order.txt[] include::src/git/linearize-commits.txt[] include::src/git/work-in-a-branch.txt[] include::src/git/disable-merge-pull.txt[] +include::src/git/ssh-multiplex.txt[] diff --git a/README/src/git/ssh-multiplex.html b/README/src/git/ssh-multiplex.html new file mode 100644 index 000000000..7fdcef13f --- /dev/null +++ b/README/src/git/ssh-multiplex.html @@ -0,0 +1,724 @@ +<?xml version="1.0"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/> +<meta name="generator" content="AsciiDoc 8.6.1"/> +<title>Set up SSH Mulitplexing for Speed</title> +<style type="text/css"> +/*<![CDATA[*/ +/* Debug borders */ +p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { +/* + border: 1px solid red; +*/ +} + +body { + margin: 1em 5% 1em 5%; +} + +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} + +em { + font-style: italic; + color: navy; +} + +strong { + font-weight: bold; + color: #083194; +} + +tt { + color: navy; +} + +h1, h2, h3, h4, h5, h6 { + color: #527bbd; + font-family: sans-serif; + margin-top: 1.2em; + margin-bottom: 0.5em; + line-height: 1.3; +} + +h1, h2, h3 { + border-bottom: 2px solid silver; +} +h2 { + padding-top: 0.5em; +} +h3 { + float: left; +} +h3 + * { + clear: left; +} + +div.sectionbody { + font-family: serif; + margin-left: 0; +} + +hr { + border: 1px solid silver; +} + +p { + margin-top: 0.5em; + margin-bottom: 0.5em; +} + +ul, ol, li > p { + margin-top: 0; +} + +pre { + padding: 0; + margin: 0; +} + +span#author { + color: #527bbd; + font-family: sans-serif; + font-weight: bold; + font-size: 1.1em; +} +span#email { +} +span#revnumber, span#revdate, span#revremark { + font-family: sans-serif; +} + +div#footer { + font-family: sans-serif; + font-size: small; + border-top: 2px solid silver; + padding-top: 0.5em; + margin-top: 4.0em; +} +div#footer-text { + float: left; + padding-bottom: 0.5em; +} +div#footer-badges { + float: right; + padding-bottom: 0.5em; +} + +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} +div.tableblock, div.imageblock, div.exampleblock, div.verseblock, +div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, +div.admonitionblock { + margin-top: 1.0em; + margin-bottom: 1.5em; +} +div.admonitionblock { + margin-top: 2.0em; + margin-bottom: 2.0em; + margin-right: 10%; + color: #606060; +} + +div.content { /* Block element content. */ + padding: 0; +} + +/* Block element titles. */ +div.title, caption.title { + color: #527bbd; + font-family: sans-serif; + font-weight: bold; + text-align: left; + margin-top: 1.0em; + margin-bottom: 0.5em; +} +div.title + * { + margin-top: 0; +} + +td div.title:first-child { + margin-top: 0.0em; +} +div.content div.title:first-child { + margin-top: 0.0em; +} +div.content + div.title { + margin-top: 0.0em; +} + +div.sidebarblock > div.content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} + +div.listingblock > div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock, div.verseblock { + padding-left: 1.0em; + margin-left: 1.0em; + margin-right: 10%; + border-left: 5px solid #dddddd; + color: #777777; +} + +div.quoteblock > div.attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock > pre.content { + font-family: inherit; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ +div.verseblock + div.attribution { + text-align: left; +} + +div.admonitionblock .icon { + vertical-align: top; + font-size: 1.1em; + font-weight: bold; + text-decoration: underline; + color: #527bbd; + padding-right: 0.5em; +} +div.admonitionblock td.content { + padding-left: 0.5em; + border-left: 3px solid #dddddd; +} + +div.exampleblock > div.content { + border-left: 3px solid #dddddd; + padding-left: 0.5em; +} + +div.imageblock div.content { padding-left: 0; } +span.image img { border-style: none; } +a.image:visited { color: white; } + +dl { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +dt { + margin-top: 0.5em; + margin-bottom: 0; + font-style: normal; + color: navy; +} +dd > *:first-child { + margin-top: 0.1em; +} + +ul, ol { + list-style-position: outside; +} +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { + list-style-type: lower-alpha; +} +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} + +div.tableblock > table { + border: 3px solid #527bbd; +} +thead, p.table.header { + font-family: sans-serif; + font-weight: bold; + color: #527bbd; +} +tfoot { + font-weight: bold; +} +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} + + +div.hdlist { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +div.hdlist tr { + padding-bottom: 15px; +} +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { + vertical-align: top; + font-style: normal; + padding-right: 0.8em; + color: navy; +} +td.hdlist2 { + vertical-align: top; +} +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} + +.footnote, .footnoteref { + font-size: 0.8em; +} + +span.footnote, span.footnoteref { + vertical-align: super; +} + +#footnotes { + margin: 20px 0 20px 0; + padding: 7px 0 0 0; +} + +#footnotes div.footnote { + margin: 0 0 5px 0; +} + +#footnotes hr { + border: none; + border-top: 1px solid silver; + height: 1px; + text-align: left; + margin-left: 0; + width: 20%; + min-width: 100px; +} + +div.colist td { + padding-right: 0.5em; + padding-bottom: 0.3em; + vertical-align: top; +} +div.colist td img { + margin-top: 0.3em; +} + +@media print { + div#footer-badges { display: none; } +} + +div#toc { + margin-bottom: 2.5em; +} + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} + +/* + pygmentize filter +*/ +.highlight .hll { background-color: #ffffcc } +.highlight { background: #f4f4f4; } +.highlight .c { color: #008800; font-style: italic } /* Comment */ +.highlight .err { border: 1px solid #FF0000 } /* Error */ +.highlight .k { color: #AA22FF; font-weight: bold } /* Keyword */ +.highlight .o { color: #666666 } /* Operator */ +.highlight .cm { color: #008800; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #008800 } /* Comment.Preproc */ +.highlight .c1 { color: #008800; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #008800; font-weight: bold } /* Comment.Special */ +.highlight .gd { color: #A00000 } /* Generic.Deleted */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gr { color: #FF0000 } /* Generic.Error */ +.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.highlight .gi { color: #00A000 } /* Generic.Inserted */ +.highlight .go { color: #808080 } /* Generic.Output */ +.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.highlight .gs { font-weight: bold } /* Generic.Strong */ +.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.highlight .gt { color: #0040D0 } /* Generic.Traceback */ +.highlight .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */ +.highlight .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */ +.highlight .kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */ +.highlight .kp { color: #AA22FF } /* Keyword.Pseudo */ +.highlight .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */ +.highlight .kt { color: #00BB00; font-weight: bold } /* Keyword.Type */ +.highlight .m { color: #666666 } /* Literal.Number */ +.highlight .s { color: #BB4444 } /* Literal.String */ +.highlight .na { color: #BB4444 } /* Name.Attribute */ +.highlight .nb { color: #AA22FF } /* Name.Builtin */ +.highlight .nc { color: #0000FF } /* Name.Class */ +.highlight .no { color: #880000 } /* Name.Constant */ +.highlight .nd { color: #AA22FF } /* Name.Decorator */ +.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ +.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.highlight .nf { color: #00A000 } /* Name.Function */ +.highlight .nl { color: #A0A000 } /* Name.Label */ +.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */ +.highlight .nv { color: #B8860B } /* Name.Variable */ +.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.highlight .mf { color: #666666 } /* Literal.Number.Float */ +.highlight .mh { color: #666666 } /* Literal.Number.Hex */ +.highlight .mi { color: #666666 } /* Literal.Number.Integer */ +.highlight .mo { color: #666666 } /* Literal.Number.Oct */ +.highlight .sb { color: #BB4444 } /* Literal.String.Backtick */ +.highlight .sc { color: #BB4444 } /* Literal.String.Char */ +.highlight .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */ +.highlight .s2 { color: #BB4444 } /* Literal.String.Double */ +.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.highlight .sh { color: #BB4444 } /* Literal.String.Heredoc */ +.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.highlight .sx { color: #008000 } /* Literal.String.Other */ +.highlight .sr { color: #BB6688 } /* Literal.String.Regex */ +.highlight .s1 { color: #BB4444 } /* Literal.String.Single */ +.highlight .ss { color: #B8860B } /* Literal.String.Symbol */ +.highlight .bp { color: #AA22FF } /* Name.Builtin.Pseudo */ +.highlight .vc { color: #B8860B } /* Name.Variable.Class */ +.highlight .vg { color: #B8860B } /* Name.Variable.Global */ +.highlight .vi { color: #B8860B } /* Name.Variable.Instance */ +.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */ + +/*]]>*/ +</style> +<script type="text/javascript"> +/*<+'])'); + // Function that scans the DOM tree for header elements (the DOM2 + // nodeIterator API would be a better technique but not supported by all + // browsers). + var iterate = function (el) { + for (var i = el.firstChild; i != null; i = i.nextSibling) { + if (i.nodeType == 1 /* Node.ELEMENT_NODE */) { + var mo = re.exec(i.tagName); + if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") { + result[result.length] = new TocEntry(i, getText(i), mo[1]-1); + } + iterate(i); + } + } + } + iterate(el); + return result; + } + + var toc = document.getElementById("toc"); + var entries = tocEntries(document.getElementById("content"), toclevels); + for (var i = 0; i < entries.length; ++i) { + var entry = entries[i]; + if (entry.element.id == "") + entry.element.id = "_toc_" + i; + var a = document.createElement("a"); + a.href = "#" + entry.element.id; + a.appendChild(document.createTextNode(entry.text)); + var div = document.createElement("div"); + div.appendChild(a); + div.className = "toclevel" + entry.toclevel; + toc.appendChild(div); + } + if (entries.length == 0) + toc.parentNode.removeChild(toc); +}, + + +///////////////////////////////////////////////////////////////////// +// Footnotes generator +///////////////////////////////////////////////////////////////////// + +/* Based on footnote generation code from: + * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html + */ + +footnotes: function () { + var cont = document.getElementById("content"); + var noteholder = document.getElementById("footnotes"); + var spans = cont.getElementsByTagName("span"); + var refs = {}; + var n = 0; + for (i=0; i<spans.length; i++) { + if (spans[i].className == "footnote") { + n++; + // Use [\s\S] in place of . so multi-line matches work. + // Because JavaScript has no s (dotall) regex flag. + note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1]; + noteholder.innerHTML += + "<div class='footnote' id='_footnote_" + n + "'>" + + "<a href='#_footnoteref_" + n + "' title='Return to text'>" + + n + "</a>. " + note + "</div>"; + spans[i].innerHTML = + "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n + + "' title='View footnote' class='footnote'>" + n + "</a>]"; + var id =spans[i].getAttribute("id"); + if (id != null) refs["#"+id] = n; + } + } + if (n == 0) + noteholder.parentNode.removeChild(noteholder); + else { + // Process footnoterefs. + for (i=0; i<spans.length; i++) { + if (spans[i].className == "footnoteref") { + var href = spans[i].getElementsByTagName("a")[0].getAttribute("href"); + href = href.match(/#.*/)[0]; // Because IE return full URL. + n = refs[href]; + spans[i].innerHTML = + "[<a href='#_footnote_" + n + + "' title='View footnote' class='footnote'>" + n + "</a>]"; + } + } + } +} + +} +/*]]>*/ +</script> +</head> +<body class="article"> +<div id="header"> +<h1>Set up SSH Mulitplexing for Speed</h1> +<div id="toc"> + <div id="toctitle">Table of Contents</div> + <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript> +</div> +</div> +<div id="content"> +<div id="preamble"> +<div class="sectionbody"> +<div class="paragraph"><p>This is one of my most convenient tricks. The slowest parts of <tt>git pull</tt> and +<tt>git push</tt> are starting up the SSH connection. However, there is a way to +eliminate this problem simply by opening a persistent tunnel, which <tt>git pull</tt> +and <tt>git push</tt> automatically reuse.</p></div> +</div> +</div> +<div class="sect1"> +<h2 id="_ssh_config">1. ~/.ssh/config</h2> +<div class="sectionbody"> +<div class="paragraph"><p>Enter the ControlMaster option for OpenSSH.</p></div> +<div class="quoteblock"> +<div class="content"> +<div class="paragraph"><p><strong>ControlMaster</strong></p></div> +<div class="paragraph"><p>Enables the sharing of multiple sessions over a single network connection. +When set to “yes”, ssh(1) will listen for connections on a control socket +specified using the ControlPath argument. Additional sessions can connect to +this socket using the same <strong>ControlPath</strong> with <strong>ControlMaster</strong> set to “no” +(the default).</p></div> +<div class="paragraph"><p>These sessions will try to reuse the master instance’s network connection +rather than initiating new ones, but will fall back to connecting normally if +the control socket does not exist, or is not listening.</p></div> +<div class="paragraph"><p>Setting this to “ask” will cause ssh to listen for control connections, but +require confirmation using the SSH_ASKPASS program before they are accepted +(see ssh-add(1) for details). If the <strong>ControlPath</strong> cannot be opened, ssh will +continue without connecting to a master instance.</p></div> +<div class="paragraph"><p>X11 and ssh-agent(1) forwarding is supported over these multiplexed +connections, however the display and agent forwarded will be the one belonging +to the master connection i.e. it is not possible to forward multiple displays +or agents.</p></div> +<div class="paragraph"><p>Two additional options allow for opportunistic multiplexing: try to use a +master connection but fall back to creating a new one if one does not already +exist. These options are: “auto” and “autoask”. The latter requires +confirmation like the “ask” option.</p></div> +</div> +<div class="attribution"> +</div></div> +<div class="paragraph"><p>So I set up my ~/.ssh/config as follows.</p></div> +<div class="listingblock"> +<div class="content"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1 +2 +3 +4 +5 +6</pre></div></td><td class="code"><div class="highlight"><pre><span class="c">#~/.ssh/config</span> +ControlMaster auto +ControlPath ~/.ssh/pool/%r@%h +ServerAliveCountMax 6 +ServerAliveInterval 10 +TCPKeepAlive yes +</pre></div> +</td></tr></table></div></div> +<div class="paragraph"><p>And we’re set!.</p></div> +</div> +</div> +<div class="sect1"> +<h2 id="_first_a_few_benchmarks">2. First, a few benchmarks</h2> +<div class="sectionbody"> +<div class="paragraph"><p>First, lets see how fast it is without the magic:</p></div> +<div class="listingblock"> +<div class="content"><div class="highlight"><pre>> <span class="nb">time </span><span class="k">for </span>i in <span class="k">$(</span> seq 0 10 <span class="k">)</span> ; <span class="k">do </span>git fetch github; <span class="k">done</span> + +real 0m47.798s +user 0m0.226s +sys 0m0.236s + +> <span class="nb">time </span><span class="k">for </span>i in <span class="k">$(</span> seq 0 10 <span class="k">)</span> ; <span class="k">do </span>git fetch origin; <span class="k">done</span> + +real 0m48.444s +user 0m0.235s +sys 0m0.250s +</pre></div></div></div> +<div class="paragraph"><p>Averaging about 4.34s per fetch to Github, 4.40s to gentoo overlays.</p></div> +<div class="paragraph"><p>SLOOW.</p></div> +</div> +</div> +<div class="sect1"> +<h2 id="_start_a_background_connection">3. Start a background connection</h2> +<div class="sectionbody"> +<div class="paragraph"><p>With ControlMaster, you set up a long-lived SSH connection.</p></div> +<div class="listingblock"> +<div class="content"><div class="highlight"><pre>> ssh -fNn git@github.com +> ssh -fNn git@git.overlays.gentoo.org +</pre></div></div></div> +<div class="paragraph"><p>And we’re truely really to start cooking with petrol.</p></div> +</div> +</div> +<div class="sect1"> +<h2 id="_post_configuration_benchmarks">4. Post Configuration Benchmarks</h2> +<div class="sectionbody"> +<div class="listingblock"> +<div class="content"><div class="highlight"><pre>> <span class="nb">time </span><span class="k">for </span>i in <span class="k">$(</span> seq 0 10 <span class="k">)</span> ; <span class="k">do </span>git fetch github; <span class="k">done</span> + +real 0m12.935s +user 0m0.093s +sys 0m0.193s + +> <span class="nb">time </span><span class="k">for </span>i in <span class="k">$(</span> seq 0 10 <span class="k">)</span> ; <span class="k">do </span>git fetch origin; <span class="k">done</span> + +real 0m11.597s +user 0m0.099s +sys 0m0.191s +</pre></div></div></div> +<div class="paragraph"><p>O_o. Averaging about 1.175s and 1.05s respectively.</p></div> +</div> +</div> +</div> +<div id="footnotes"><hr/></div> +<div id="footer"> +<div id="footer-text"> +Last updated 2010-09-29 16:52:25 NZDT +</div> +<div id="footer-badges"> +<a href="http://validator.w3.org/check?uri=referer"> + <img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml11-blue" alt="Valid XHTML 1.1" height="31" width="88"/> +</a> +<a href="http://jigsaw.w3.org/css-validator/"> + <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!"/> +</a> +<a href="http://www.mozilla.org/products/firefox/"> + <img style="border:none; width:110px; height:32px;" src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif" alt="Get Firefox!"/> +</a> +</div> +</div> +</body> +</html> diff --git a/README/src/git/ssh-multiplex.txt b/README/src/git/ssh-multiplex.txt new file mode 100644 index 000000000..43f58bfb9 --- /dev/null +++ b/README/src/git/ssh-multiplex.txt @@ -0,0 +1,113 @@ +Set up SSH Mulitplexing for Speed +================================= + +This is one of my most convenient tricks. The slowest parts of `git pull` and +`git push` are starting up the SSH connection. However, there is a way to +eliminate this problem simply by opening a persistent tunnel, which `git pull` +and `git push` automatically reuse. + +~/.ssh/config +------------- + +Enter the ControlMaster option for OpenSSH. + +_________________________ +*ControlMaster* + +Enables the sharing of multiple sessions over a single network connection. +When set to “yes”, ssh(1) will listen for connections on a control socket +specified using the ControlPath argument. Additional sessions can connect to +this socket using the same *ControlPath* with *ControlMaster* set to “no” +(the default). + +These sessions will try to reuse the master instance's network connection +rather than initiating new ones, but will fall back to connecting normally if +the control socket does not exist, or is not listening. + +Setting this to “ask” will cause ssh to listen for control connections, but +require confirmation using the SSH_ASKPASS program before they are accepted +(see ssh-add(1) for details). If the *ControlPath* cannot be opened, ssh will +continue without connecting to a master instance. + +X11 and ssh-agent(1) forwarding is supported over these multiplexed +connections, however the display and agent forwarded will be the one belonging +to the master connection i.e. it is not possible to forward multiple displays +or agents. + +Two additional options allow for opportunistic multiplexing: try to use a +master connection but fall back to creating a new one if one does not already +exist. These options are: “auto” and “autoask”. The latter requires +confirmation like the “ask” option. +_________________________ + +So I set up my ~/.ssh/config as follows. + +[source,bash,numbered] +#~/.ssh/config +ControlMaster auto +ControlPath ~/.ssh/pool/%r@%h +ServerAliveCountMax 6 +ServerAliveInterval 10 +TCPKeepAlive yes + +And we're set!. + +First, a few benchmarks +----------------------- + +First, lets see how fast it is without the magic: + +[source,bash] +------ +> time for i in $( seq 0 10 ) ; do git fetch github; done + +real 0m47.798s +user 0m0.226s +sys 0m0.236s + +> time for i in $( seq 0 10 ) ; do git fetch origin; done + +real 0m48.444s +user 0m0.235s +sys 0m0.250s +------ + +Averaging about 4.34s per fetch to Github, 4.40s to gentoo overlays. + +SLOOW. + +Start a background connection +----------------------------- + +With ControlMaster, you set up a long-lived SSH connection. + +[source,bash] +------ +> ssh -fNn git@github.com +> ssh -fNn git@git.overlays.gentoo.org +------ + +And we're truely really to start cooking with petrol. + +Post Configuration Benchmarks +----------------------------- + +[source,bash] +------ +> time for i in $( seq 0 10 ) ; do git fetch github; done + +real 0m12.935s +user 0m0.093s +sys 0m0.193s + +> time for i in $( seq 0 10 ) ; do git fetch origin; done + +real 0m11.597s +user 0m0.099s +sys 0m0.191s +------ + +O_o. Averaging about 1.175s and 1.05s respectively. + + + |