Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
dfd9f4e5a1
5 changed files with 170 additions and 0 deletions
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="Ilya_Shlyakhter"
|
||||
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
|
||||
subject="catch-all deadlock breaker"
|
||||
date="2019-11-13T22:33:59Z"
|
||||
content="""
|
||||
Not sure if feasible, but maybe a [[catch-all deadlock breaker|todo/more_extensive_retries_to_mask_transient_failures]] could be implemented to mask this and other deadlocks?
|
||||
|
||||
The moon landings software [[had something|https://www.ibiblio.org/apollo/hrst/archive/1033.pdf]] [[like this|https://history.nasa.gov/computers/Ch2-6.html]], and it worked [[pretty well|https://www.wsj.com/articles/apollo-11-had-a-hidden-hero-software-11563153001]]...
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
### Please describe the problem.
|
||||
|
||||
There were a few changes introduced since then to Makefile (I will not guess which one broke it) which resulted in git within git-annex-standalone of neurodebian to be unable to clone from https://:
|
||||
|
||||
|
||||
[[!format sh """
|
||||
$> /usr/lib/git-annex.linux/git clone https://github.com/afni/afni_ci_test_data.git
|
||||
Cloning into 'afni_ci_test_data'...
|
||||
fatal: unable to find remote helper for 'https'
|
||||
|
||||
"""]]
|
||||
|
||||
<details>
|
||||
<summary>diff between list of files in 7.20190819+git60-gcdb679818 and 7.20191017+git2-g7b13db551 package builds shows many git-* missing</summary>
|
||||
[[!format sh """
|
||||
lena:/tmp
|
||||
$> ls 7.2019*/usr/lib/git-annex.linux/exe/
|
||||
7.20190819/usr/lib/git-annex.linux/exe/:
|
||||
cp@ git-diff-index@ git-mktag@ git-sh-i18n--envsubst@
|
||||
curl@ git-diff-tree@ git-mktree@ git-shell@
|
||||
git@ git-difftool@ git-multi-pack-index@ git-shortlog@
|
||||
git-add@ git-fast-export@ git-mv@ git-show@
|
||||
git-am@ git-fast-import@ git-name-rev@ git-show-branch@
|
||||
git-annex@ git-fetch@ git-notes@ git-show-index@
|
||||
git-annex-shell@ git-fetch-pack@ git-pack-objects@ git-show-ref@
|
||||
git-annotate@ git-fmt-merge-msg@ git-pack-redundant@ git-stage@
|
||||
git-apply@ git-for-each-ref@ git-pack-refs@ git-status@
|
||||
git-archive@ git-format-patch@ git-patch-id@ git-stripspace@
|
||||
git-bisect--helper@ git-fsck@ git-prune@ git-submodule--helper@
|
||||
git-blame@ git-fsck-objects@ git-prune-packed@ git-symbolic-ref@
|
||||
git-branch@ git-gc@ git-pull@ git-tag@
|
||||
git-bundle@ git-get-tar-commit-id@ git-push@ git-unpack-file@
|
||||
git-cat-file@ git-grep@ git-range-diff@ git-unpack-objects@
|
||||
git-check-attr@ git-hash-object@ git-read-tree@ git-update-index@
|
||||
git-check-ignore@ git-help@ git-rebase@ git-update-ref@
|
||||
git-check-mailmap@ git-http-backend@ git-rebase--interactive@ git-update-server-info@
|
||||
git-check-ref-format@ git-http-fetch@ git-receive-pack@ git-upload-archive@
|
||||
git-checkout@ git-http-push@ git-reflog@ git-upload-pack@
|
||||
git-checkout-index@ git-imap-send@ git-remote@ git-var@
|
||||
git-cherry@ git-index-pack@ git-remote-ext@ git-verify-commit@
|
||||
git-cherry-pick@ git-init@ git-remote-fd@ git-verify-pack@
|
||||
git-clean@ git-init-db@ git-remote-ftp@ git-verify-tag@
|
||||
git-clone@ git-interpret-trailers@ git-remote-ftps@ git-whatchanged@
|
||||
git-column@ git-log@ git-remote-http@ git-worktree@
|
||||
git-commit@ git-ls-files@ git-remote-https@ git-write-tree@
|
||||
git-commit-graph@ git-ls-remote@ git-remote-testsvn@ localedef@
|
||||
git-commit-tree@ git-ls-tree@ git-remote-tor-annex@ lsof@
|
||||
git-config@ git-mailinfo@ git-repack@ rsync@
|
||||
git-count-objects@ git-mailsplit@ git-replace@ sh@
|
||||
git-credential@ git-merge@ git-rerere@ ssh@
|
||||
git-credential-cache@ git-merge-base@ git-reset@ ssh-keygen@
|
||||
git-credential-cache--daemon@ git-merge-file@ git-rev-list@ tar@
|
||||
git-credential-store@ git-merge-index@ git-rev-parse@ uname@
|
||||
git-daemon@ git-merge-ours@ git-revert@ xargs@
|
||||
git-describe@ git-merge-recursive@ git-rm@
|
||||
git-diff@ git-merge-subtree@ git-send-pack@
|
||||
git-diff-files@ git-merge-tree@ git-serve@
|
||||
|
||||
7.20191017/usr/lib/git-annex.linux/exe/:
|
||||
cp@ git-credential-cache--daemon@ git-http-push@ git-sh-i18n--envsubst@ sh@
|
||||
curl@ git-credential-store@ git-imap-send@ git-shell@ ssh@
|
||||
git@ git-daemon@ git-receive-pack@ git-upload-pack@ ssh-keygen@
|
||||
git-annex@ git-fast-import@ git-remote-http@ localedef@ tar@
|
||||
git-annex-shell@ git-http-backend@ git-remote-testsvn@ lsof@ uname@
|
||||
git-credential-cache@ git-http-fetch@ git-remote-tor-annex@ rsync@ xargs@
|
||||
|
||||
|
||||
"""]]
|
||||
|
||||
</details>
|
||||
|
||||
so may be that is related.
|
||||
|
||||
Unfortunately in datalad we had no test testing cloning over https, so I added such integration test in https://github.com/datalad/datalad/pull/3867 to at least detect such regressions in the future before hitting the userland
|
||||
|
||||
[[!meta author=yoh]]
|
||||
[[!tag projects/datalad]]
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
Greetings,
|
||||
|
||||
Two more issues have come up.
|
||||
|
||||
1) webapp (and assistant) don't always seem to inherit ssh-agent keys (I've setup a passwordless key for gitlab). It usually takes multiple cycles of killing off ssh and annex-related daemons before a new instance will not fail auth with gitlab - is there a more solid way of doing this?
|
||||
|
||||
2) When I do get auth, the assistant / webui will notice file changes (i.e moving a small file that doesn't match annex.largefiles, but the changes don't get committed to origin (gitlab - metadata only). The log file is below - thougts?
|
||||
|
||||
[2019-11-13 20:24:33.378362] main: starting assistant version 7.20191106
|
||||
[2019-11-13 20:24:33.439501] TransferScanner: Syncing with origin
|
||||
(scanning...) [2019-11-13 20:24:33.529954] Watcher: Performing startup scan
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
fatal: Pathspec 'workflow/cc-archive-exif/LICENSE' is in submodule 'workflow/cc-archive-exif'
|
||||
|
||||
git cat-file EOF: user error
|
||||
|
||||
fd:39: hFlush: resource vanished (Broken pipe)
|
||||
|
||||
fd:39: hFlush: resource vanished (Broken pipe)
|
||||
(started...)
|
||||
[2019-11-13 20:24:34.481957] Committer: Committing changes to git
|
||||
(recording state in git...)
|
||||
> GitLab: Disallowed command
|
||||
ControlSocket .git/annex/ssh/git@gitlab.com already exists, disabling multiplexing
|
||||
[2019-11-13 20:24:35.42995] Pusher: Syncing with origin
|
||||
Everything up-to-date
|
||||
> GitLab: Disallowed command
|
||||
Everything up-to-date
|
||||
> GitLab: Disallowed command
|
||||
> GitLab: Disallowed command
|
||||
> GitLab: Disallowed command
|
||||
> GitLab: Disallowed command
|
||||
> GitLab: Disallowed command
|
||||
|
||||
fd:39: hFlush: resource vanished (Broken pipe)
|
||||
|
||||
fd:39: hFlush: resource vanished (Broken pipe)
|
||||
[2019-11-13 20:26:09.256217] main: Syncing with origin
|
||||
Everything up-to-date
|
||||
> GitLab: Disallowed command
|
||||
|
||||
fd:39: hFlush: resource vanished (Broken pipe)
|
||||
[2019-11-13 20:27:31.922901] Committer: Committing changes to git
|
||||
(recording state in git...)
|
||||
[2019-11-13 20:27:31.956249] Pusher: Syncing with origin
|
||||
Everything up-to-date
|
||||
|
||||
fd:39: hFlush: resource vanished (Broken pipe)
|
||||
[2019-11-13 20:28:35.846741] Committer: Committing changes to git
|
||||
(recording state in git...)
|
||||
[2019-11-13 20:28:35.87987] Pusher: Syncing with origin
|
||||
Everything up-to-date
|
||||
> GitLab: Disallowed command
|
||||
> GitLab: Disallowed command
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[[!comment format=mdwn
|
||||
username="git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f"
|
||||
nickname="git-annex"
|
||||
avatar="http://cdn.libravatar.org/avatar/66e5c6e044d726597ce5a0ad68f86fe4"
|
||||
subject="Sometimes it sorta works"
|
||||
date="2019-11-14T17:24:11Z"
|
||||
content="""
|
||||
So, sometimes (often), it says it synched in the webapp, but no changes show up in any branch on gitlab. However, sometimes it works. For example, sometimes after killing everything off (including any ssh sessions) and restarting the webapp, a file I added to the repo locally as a test will show up in the gitlab repo. When I then move that file, the webapp/assistant wakes up, syncs (says it was successful), and the \"delete\" is processed in the gitlab repo (the old file is deleted), but the \"add\" (the file showing up with a new name) doesn't.
|
||||
|
||||
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
[[!comment format=mdwn
|
||||
username="git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f"
|
||||
nickname="git-annex"
|
||||
avatar="http://cdn.libravatar.org/avatar/66e5c6e044d726597ce5a0ad68f86fe4"
|
||||
subject="comment 2"
|
||||
date="2019-11-14T00:38:56Z"
|
||||
content="""
|
||||
Thank's Joey - that's what I needed.
|
||||
"""]]
|
||||
Loading…
Reference in a new issue