tests/test-merge8.t
author Matt Harbison <matt_harbison@yahoo.com>
Tue, 21 Jan 2020 11:32:33 -0500
changeset 44320 43eea17ae7b3
parent 34661 eb586ed5d8ce
permissions -rw-r--r--
lfs: fix the stall and corruption issue when concurrently uploading blobs We've avoided the issue up to this point by gating worker usage with an experimental config. See 10e62d5efa73, and the thread linked there for some of the initial diagnosis, but essentially some data was being read from the blob before an error occurred and `keepalive` retried, but didn't rewind the file pointer. So the leading data was lost from the blob on the server, and the connection stalled, trying to send more data than available. In trying to recreate this, I was unable to do so uploading from Windows to CentOS 7. But it reproduced every time going from CentOS 7 to another CentOS 7 over https. I found recent fixes in the FaceBook repo to address this[1][2]. The commit message for the first is: The KeepAlive HTTP implementation is bugged in it's retry logic, it supports reading from a file pointer, but doesn't support rewinding of the seek cursor when it performs a retry. So it can happen that an upload fails for whatever reason and will then 'hang' on the retry event. The sequence of events that get triggered are: - Upload file A, goes OK. Keep-Alive caches connection. - Upload file B, fails due to (for example) failing Keep-Alive, but LFS file pointer has been consumed for the upload and fd has been closed. - Retry for file B starts, sets the Content-Length properly to the expected file size, but since file pointer has been consumed no data will be uploaded, causing the server to wait for the uploaded data until either client or server reaches a timeout, making it seem as our mercurial process hangs. This is just a stop-gap measure to prevent this behavior from blocking Mercurial (LFS has retry logic). A proper solutions need to be build on top of this stop-gap measure: for upload from file pointers, we should support fseek() on the interface. Since we expect to consume the whole file always anyways, this should be safe. This way we can seek back to the beginning on a retry. I ported those two patches, and it works. But I see that `url._sendfile()` does a rewind on `httpsendfile` objects[3], so maybe it's better to keep this all in one place and avoid a second seek. We may still want the first FaceBook patch as extra protection for this problem in general. The other two uses of `httpsendfile` are in the wire protocol to upload bundles, and to upload largefiles. Neither of these appear to use a worker, and I'm not sure why workers seem to trigger this, or if this could have happened without a worker. Since `httpsendfile` already has a `close()` method, that is dropped. That class also explicitly says there's no `__len__` attribute, so that is removed too. The override for `read()` is necessary to avoid the progressbar usage per file. [1] https://github.com/facebookexperimental/eden/commit/c350d6536d90c044c837abdd3675185644481469 [2] https://github.com/facebookexperimental/eden/commit/77f0d3fd0415e81b63e317e457af9c55c46103ee [3] https://www.mercurial-scm.org/repo/hg/file/5.2.2/mercurial/url.py#l176 Differential Revision: https://phab.mercurial-scm.org/D7962
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11981
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     1
Test for changeset ba7c74081861
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     2
(update dirstate correctly for non-branchmerge updates)
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     3
  $ hg init a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     4
  $ cd a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     5
  $ echo a > a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     6
  $ hg add a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     7
  $ hg commit -m a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     8
  $ cd ..
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     9
  $ hg clone a b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    10
  updating to branch default
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    11
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    12
  $ cd a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    13
  $ hg mv a b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    14
  $ hg commit -m move
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    15
  $ echo b >> b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    16
  $ hg commit -m b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    17
  $ cd ../b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    18
  $ hg pull ../a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    19
  pulling from ../a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    20
  searching for changes
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    21
  adding changesets
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    22
  adding manifests
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    23
  adding file changes
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    24
  added 2 changesets with 2 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 16913
diff changeset
    25
  new changesets e3c9b40284e1:772b37f1ca37
11981
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    26
  (run 'hg update' to get a working copy)
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    27
  $ hg update
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    28
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11981
diff changeset
    29
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11981
diff changeset
    30
  $ cd ..