Merge branch 'master' of ssh://git-annex.branchable.com into master
This commit is contained in:
Joey Hess
commit
10ec4aa7cb
4 changed files with 96 additions and 0 deletions
|
|
@ -0,0 +1,59 @@
|
|||
[[!comment format=mdwn
|
||||
username="yarikoptic"
|
||||
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
|
||||
subject="comment 3"
|
||||
date="2020-10-06T01:26:59Z"
|
||||
content="""
|
||||
I think it worked wonderfully
|
||||
|
||||
<details>
|
||||
<summary>here is my script I have tried</summary>
|
||||
|
||||
```shell
|
||||
#!/bin/bash
|
||||
|
||||
export PS4='> '
|
||||
set -x
|
||||
set -eu
|
||||
cd \"$(mktemp -d ${TMPDIR:-/tmp}/dl-XXXXXXX)\"
|
||||
|
||||
mkdir d-in d-repo
|
||||
echo content >| d-in/file
|
||||
|
||||
function dance() {
|
||||
git annex import master --from d-in
|
||||
# but we need to merge it
|
||||
git merge d-in/master
|
||||
ls -l
|
||||
grep -e . *
|
||||
}
|
||||
|
||||
(
|
||||
cd d-repo
|
||||
git init
|
||||
git annex init
|
||||
git annex initremote d-in type=directory directory=../d-in exporttree=yes importtree=yes encryption=none
|
||||
|
||||
ls -l ../d-in
|
||||
|
||||
for r in 1 2; do
|
||||
echo \"Run $r\";
|
||||
dance
|
||||
done
|
||||
|
||||
echo \"more\" >> ../d-in/file
|
||||
echo \"new\" > ../d-in/newfile
|
||||
dance
|
||||
|
||||
rm ../d-in/file
|
||||
dance
|
||||
|
||||
)
|
||||
|
||||
```
|
||||
</details>
|
||||
|
||||
and it seemed to do the right job! I have not tried to add some `.gitattributes` into that branch it imports into to tell some files to go to git, but I hope it would just work, and if not -- I will come back! feel welcome to close this issue.
|
||||
|
||||
Cheers
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[[!comment format=mdwn
|
||||
username="yarikoptic"
|
||||
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
|
||||
subject="just comments"
|
||||
date="2020-10-05T23:11:29Z"
|
||||
content="""
|
||||
> git cat-file --batch that this one is missing.
|
||||
|
||||
may be that one already exited \"peacefully\"? I believe I was looking at the moment when we already requested closing that `annex addurl --batch`.
|
||||
|
||||
> But git-annex rarely exec's git-annex, and when it does, it's never with the same params as the parent git-annex was run with
|
||||
|
||||
I wonder if may be `htop` (I believe I pasted process tree from it) somehow may be groupped incorrectly and those are \"independent\" hanging `git annex addurl` processes which got \"folded\"... I don't know..
|
||||
|
||||
Anyways, to hopefully \"shine the light\", I have managed to reproduce (with up to date snapshot of annex, didn't get there with systemwide older git-annex) on smaug using initially stalling datalad-crawler tests (so 100% reproducible): just login as `test` user to `smaug`. There is a screen session with one shell there with python's PDB where we were waiting for batched process to exit but it didn't; then 2nd one shows `ps auxw -H | grep '^test'`. Please `strace` or inspect anything you might find pertinent (IIRC, raising debug level for datalad, or disabling code tests coverage collection, was making the stall going away). FTR the command is `PATH=~/git-annex/20201005-snapshot/:$PATH DATALAD_LOG_LEVEL=WARNING DATALAD_TESTS_TEMP_KEEP=1 python -m nose -s -v --with-cov --cover-package datalad ../datalad_crawler/dbs/tests/test_files.py ../datalad_crawler/nodes/tests/test_annex.py` and it ends up in pdb (python debugger) if batched annex did not exit although we waited.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[[!comment format=mdwn
|
||||
username="yarikoptic"
|
||||
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
|
||||
subject="FTR"
|
||||
date="2020-10-06T00:04:36Z"
|
||||
content="""
|
||||
Thank you Joey! FTR (if I located properly): fixed in [8.20200908-163-gd74d97896](https://git.kitenet.net/index.cgi/git-annex.git/commit/?id=d74d9789688fde1151ece6a751d1c549af87de84)
|
||||
|
||||
If for what \"flavor\" of git-annex build I use -- every day is not like another these days ;) But yeah -- tend to use a year old neurodebian built .deb when I can afford and do not feel adventurous, but I think in these cases was just using a standalone build indeed.
|
||||
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="yarikoptic"
|
||||
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
|
||||
subject="comment 11"
|
||||
date="2020-10-05T23:17:07Z"
|
||||
content="""
|
||||
> .. after the upgrade that would add any, you don't need to worry about them.
|
||||
|
||||
With the datalad pixie dust on top of git-annex, I am never 100% sure ;) I would better worry and do some basic check before proceeding... -- will do later today/tomorrow, God bless BTRFS and its snapshots - I can get a \"sandbox\" clone of the entire filesystem to play with safely.
|
||||
"""]]
|
||||
Loading…
Reference in a new issue