t/t5552-skipping-fetch-negotiator.sh

   1 #!/bin/sh
   2
   3 test_description='test skipping fetch negotiator'
   4 . ./test-lib.sh
   5
   6 have_sent () {
   7         while test "$#" -ne 0
   8         do
   9                 grep "fetch> have $(git -C client rev-parse $1)" trace
  10                 if test $? -ne 0
  11                 then
  12                         echo "No have $(git -C client rev-parse $1) ($1)"
  13                         return 1
  14                 fi
  15                 shift
  16         done
  17 }
  18
  19 have_not_sent () {
  20         while test "$#" -ne 0
  21         do
  22                 grep "fetch> have $(git -C client rev-parse $1)" trace
  23                 if test $? -eq 0
  24                 then
  25                         return 1
  26                 fi
  27                 shift
  28         done
  29 }
  30
  31 # trace_fetch <client_dir> <server_dir> [args]
  32 #
  33 # Trace the packet output of fetch, but make sure we disable the variable
  34 # in the child upload-pack, so we don't combine the results in the same file.
  35 trace_fetch () {
  36         client=$1; shift
  37         server=$1; shift
  38         GIT_TRACE_PACKET="$(pwd)/trace" \
  39         git -C "$client" fetch \
  40           --upload-pack 'unset GIT_TRACE_PACKET; git-upload-pack' \
  41           "$server" "$@"
  42 }
  43
  44 test_expect_success 'commits with no parents are sent regardless of skip distance' '
  45         git init server &&
  46         test_commit -C server to_fetch &&
  47
  48         git init client &&
  49         for i in $(test_seq 7)
  50         do
  51                 test_commit -C client c$i
  52         done &&
  53
  54         # We send: "c7" (skip 1) "c5" (skip 2) "c2" (skip 4). After that, since
  55         # "c1" has no parent, it is still sent as "have" even though it would
  56         # normally be skipped.
  57         test_config -C client fetch.negotiationalgorithm skipping &&
  58         trace_fetch client "$(pwd)/server" &&
  59         have_sent c7 c5 c2 c1 &&
  60         have_not_sent c6 c4 c3
  61 '
  62
  63 test_expect_success 'when two skips collide, favor the larger one' '
  64         rm -rf server client trace &&
  65         git init server &&
  66         test_commit -C server to_fetch &&
  67
  68         git init client &&
  69         for i in $(test_seq 11)
  70         do
  71                 test_commit -C client c$i
  72         done &&
  73         git -C client checkout c5 &&
  74         test_commit -C client c5side &&
  75
  76         # Before reaching c5, we send "c5side" (skip 1) and "c11" (skip 1) "c9"
  77         # (skip 2) "c6" (skip 4). The larger skip (skip 4) takes precedence, so
  78         # the next "have" sent will be "c1" (from "c6" skip 4) and not "c4"
  79         # (from "c5side" skip 1).
  80         test_config -C client fetch.negotiationalgorithm skipping &&
  81         trace_fetch client "$(pwd)/server" &&
  82         have_sent c5side c11 c9 c6 c1 &&
  83         have_not_sent c10 c8 c7 c5 c4 c3 c2
  84 '
  85
  86 test_expect_success 'use ref advertisement to filter out commits' '
  87         rm -rf server client trace &&
  88         git init server &&
  89         test_commit -C server c1 &&
  90         test_commit -C server c2 &&
  91         test_commit -C server c3 &&
  92         git -C server tag -d c1 c2 c3 &&
  93
  94         git clone server client &&
  95         test_commit -C client c4 &&
  96         test_commit -C client c5 &&
  97         git -C client checkout c4^^ &&
  98         test_commit -C client c2side &&
  99
 100         git -C server checkout --orphan anotherbranch &&
 101         test_commit -C server to_fetch &&
 102
 103         # The server advertising "c3" (as "refs/heads/master") means that we do
 104         # not need to send any ancestors of "c3", but we still need to send "c3"
 105         # itself.
 106         test_config -C client fetch.negotiationalgorithm skipping &&
 107
 108         # The ref advertisement itself is filtered when protocol v2 is used, so
 109         # use v0.
 110         GIT_TEST_PROTOCOL_VERSION= trace_fetch client origin to_fetch &&
 111         have_sent c5 c4^ c2side &&
 112         have_not_sent c4 c4^^ c4^^^
 113 '
 114
 115 test_expect_success 'handle clock skew' '
 116         rm -rf server client trace &&
 117         git init server &&
 118         test_commit -C server to_fetch &&
 119
 120         git init client &&
 121
 122         # 2 regular commits
 123         test_tick=2000000000 &&
 124         test_commit -C client c1 &&
 125         test_commit -C client c2 &&
 126
 127         # 4 old commits
 128         test_tick=1000000000 &&
 129         git -C client checkout c1 &&
 130         test_commit -C client old1 &&
 131         test_commit -C client old2 &&
 132         test_commit -C client old3 &&
 133         test_commit -C client old4 &&
 134
 135         # "c2" and "c1" are popped first, then "old4" to "old1". "old1" would
 136         # normally be skipped, but is treated as a commit without a parent here
 137         # and sent, because (due to clock skew) its only parent has already been
 138         # popped off the priority queue.
 139         test_config -C client fetch.negotiationalgorithm skipping &&
 140         trace_fetch client "$(pwd)/server" &&
 141         have_sent c2 c1 old4 old2 old1 &&
 142         have_not_sent old3
 143 '
 144
 145 test_expect_success 'do not send "have" with ancestors of commits that server ACKed' '
 146         rm -rf server client trace &&
 147         git init server &&
 148         test_commit -C server to_fetch &&
 149
 150         git init client &&
 151         for i in $(test_seq 8)
 152         do
 153                 git -C client checkout --orphan b$i &&
 154                 test_commit -C client b$i.c0
 155         done &&
 156         for j in $(test_seq 19)
 157         do
 158                 for i in $(test_seq 8)
 159                 do
 160                         git -C client checkout b$i &&
 161                         test_commit -C client b$i.c$j
 162                 done
 163         done &&
 164
 165         # Copy this branch over to the server and add a commit on it so that it
 166         # is reachable but not advertised.
 167         git -C server fetch --no-tags "$(pwd)/client" b1:refs/heads/b1 &&
 168         git -C server checkout b1 &&
 169         test_commit -C server commit-on-b1 &&
 170
 171         test_config -C client fetch.negotiationalgorithm skipping &&
 172         trace_fetch client "$(pwd)/server" to_fetch &&
 173         grep "  fetch" trace &&
 174
 175         # fetch-pack sends 2 requests each containing 16 "have" lines before
 176         # processing the first response. In these 2 requests, 4 commits from
 177         # each branch are sent. Just check the first branch.
 178         have_sent b1.c19 b1.c17 b1.c14 b1.c9 &&
 179         have_not_sent b1.c18 b1.c16 b1.c15 b1.c13 b1.c12 b1.c11 b1.c10 &&
 180
 181         # While fetch-pack is processing the first response, it should read that
 182         # the server ACKs b1.c19 and b1.c17.
 183         grep "fetch< ACK $(git -C client rev-parse b1.c19) common" trace &&
 184         grep "fetch< ACK $(git -C client rev-parse b1.c17) common" trace &&
 185
 186         # fetch-pack should thus not send any more commits in the b1 branch, but
 187         # should still send the others (in this test, just check b2).
 188         for i in $(test_seq 0 8)
 189         do
 190                 have_not_sent b1.c$i
 191         done &&
 192         have_sent b2.c1 b2.c0
 193 '
 194
 195 test_done