From 41e808ec654dc30881772bcddf563096b7fdd1ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 26 Nov 2013 16:35:57 -0400 Subject: [PATCH 01/14] no more OSX bz2 --- Makefile | 3 --- doc/install/OSX.mdwn | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5651bdd052..92c5f6dcc6 100644 --- a/Makefile +++ b/Makefile @@ -164,9 +164,6 @@ osxapp: Build/Standalone Build/OSXMkLibs rm -f tmp/git-annex.dmg hdiutil create -format UDBZ -srcfolder tmp/build-dmg \ -volname git-annex -o tmp/git-annex.dmg - # temporarily still create compressed image too - rm -f tmp/git-annex.dmg.bz2 - bzip2 --fast < tmp/git-annex.dmg > tmp/git-annex.dmg.bz2 ANDROID_FLAGS?= # Cross compile for Android. diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index 21c727168b..e3b15069d4 100644 --- a/doc/install/OSX.mdwn +++ b/doc/install/OSX.mdwn @@ -23,7 +23,7 @@ several more. Handy if you don't otherwise have git installed. [Jimmy Tang](http://www.sgenomics.org/~jtang/) autobuilds the app for OSX Lion. -* [autobuild of git-annex.dmg.bz2](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/ref/master/git-annex.dmg.bz2) ([build logs](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/)) +* [autobuild of git-annex.dmg](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/ref/master/git-annex.dmg.bz2) ([build logs](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/)) * [past builds](http://www.sgenomics.org/~jtang/gitbuilder-git-annex-x00-x86_64-apple-darwin10.8.0-binary/sha1/) -- directories are named from the commitid's [[Joey]] autobuilds the app for Mavericks. From 7f995104a6e5c27831e11f6d435be7f41d184b15 Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Tue, 26 Nov 2013 20:42:07 +0000 Subject: [PATCH 02/14] Added a comment --- ..._1e29bcf568f02765c48f0eac6c640673._comment | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_2_1e29bcf568f02765c48f0eac6c640673._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_2_1e29bcf568f02765c48f0eac6c640673._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_2_1e29bcf568f02765c48f0eac6c640673._comment new file mode 100644 index 0000000000..ab0cd9c9d4 --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_2_1e29bcf568f02765c48f0eac6c640673._comment @@ -0,0 +1,45 @@ +[[!comment format=mdwn + username="TroisSinges" + ip="82.227.207.5" + subject="comment 2" + date="2013-11-26T20:42:03Z" + content=""" +My problem isn't solved. I cloned the repository from my netbook to the SMD drive, and added a file in this new direct annex repository : + + [3singes:/Volumes/Video/Videos/Films] $ git annex add MyFamily.mkv --debug + [2013-11-26 19:52:59 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"ls-files\",\"--others\",\"--exclude-standard\",\"-z\",\"--\",\"MyFamily.mkv\"] + [2013-11-26 19:52:59 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"ls-files\",\"--modified\",\"-z\",\"--\",\"MyFamily.mkv\"] + [2013-11-26 19:52:59 CET] chat: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"cat-file\",\"--batch\"] + add MyFamily.mkv [2013-11-26 19:52:59 CET] chat: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"check-attr\",\"-z\",\"--stdin\",\"annex.backend\",\"annex.numcopies\",\"--\"] + (checksum...) [2013-11-26 19:52:59 CET] read: gsha256sum [\"MyFamily.mkv\"] + [2013-11-26 20:55:35 CET] chat: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"cat-file\",\"--batch\"] + [2013-11-26 20:55:35 CET] chat: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"hash-object\",\"-t\",\"blob\",\"-w\",\"--stdin\",\"--no-filters\"] + ok + (Recording state in git...) + [2013-11-26 20:55:35 CET] feed: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"update-index\",\"-z\",\"--index-info\"] + [2013-11-26 20:55:35 CET] chat: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"hash-object\",\"-w\",\"--stdin-paths\",\"--no-filters\"] + [2013-11-26 20:55:35 CET] feed: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"update-index\",\"-z\",\"--index-info\"] + [2013-11-26 20:55:35 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"] + [2013-11-26 20:55:36 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"write-tree\"] + [2013-11-26 20:55:36 CET] chat: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"commit-tree\",\"9bdb7b18b44020441ec8dc179e676120e769ff32\",\"-p\",\"refs/heads/git-annex\"] + [2013-11-26 20:55:37 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"update-ref\",\"refs/heads/git-annex\",\"293332232ca4e7428090171b52dcc5b3b80d1df6\"] + +Let's try to sync to my macbookpro annex repository: + + [3singes:/Volumes/Video/Videos/Films] $ git annex sync macbookpro --debug + [2013-11-26 20:57:48 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"git-annex\"] + [2013-11-26 20:57:48 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"] + [2013-11-26 20:57:49 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/git-annex..293332232ca4e7428090171b52dcc5b3b80d1df6\",\"--oneline\",\"-n1\"] + [2013-11-26 20:57:49 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/git-annex..b2146cf0abc7d6a7e5c79d3b133181b56cd77461\",\"--oneline\",\"-n1\"] + [2013-11-26 20:57:49 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/git-annex..c2cf7488b4745d4168491d8e62f5bdc354869133\",\"--oneline\",\"-n1\"] + [2013-11-26 20:57:49 CET] chat: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"cat-file\",\"--batch\"] + [2013-11-26 20:57:49 CET] read: git [\"config\",\"--null\",\"--list\"] + [2013-11-26 20:57:49 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"ls-files\",\"--stage\",\"-z\",\"--others\",\"--exclude-standard\",\"--\",\"/Volumes/Video/Videos\"] + [2013-11-26 20:57:50 CET] chat: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"cat-file\",\"--batch\"] + (Recording state in git...) + [2013-11-26 20:57:55 CET] feed: xargs [\"-0\",\"git\",\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"add\",\"-f\"] + commit + [2013-11-26 20:57:55 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"commit\",\"-m\",\"git-annex automatic sync\"] + +Now it's 21:41 CET, and it's been stuck for circa 1 hour. +"""]] From ef0f09a5877d694bd22b56e40e7b5ec30ca1d490 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 26 Nov 2013 20:52:00 +0000 Subject: [PATCH 03/14] Added a comment --- ...comment_3_9ea6803a94b1de15079a3fa20d59c9af._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_3_9ea6803a94b1de15079a3fa20d59c9af._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_3_9ea6803a94b1de15079a3fa20d59c9af._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_3_9ea6803a94b1de15079a3fa20d59c9af._comment new file mode 100644 index 0000000000..f2c4fd77e1 --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_3_9ea6803a94b1de15079a3fa20d59c9af._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.64" + subject="comment 3" + date="2013-11-26T20:51:59Z" + content=""" +The problem you reported *is* solved. You were not talking about syncing before. + +If your setup is such that `git commit` takes a long time to run, then `git annex sync` is also necessarily going to take a long time to run. +"""]] From 873448c7abf1ae2ac70422db017ad5c3212a62e4 Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Tue, 26 Nov 2013 20:55:40 +0000 Subject: [PATCH 04/14] Added a comment --- .../comment_4_3fae5a7fa5d99d0eb4473adb43e7f6f5._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_4_3fae5a7fa5d99d0eb4473adb43e7f6f5._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_4_3fae5a7fa5d99d0eb4473adb43e7f6f5._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_4_3fae5a7fa5d99d0eb4473adb43e7f6f5._comment new file mode 100644 index 0000000000..e9b7655cf7 --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_4_3fae5a7fa5d99d0eb4473adb43e7f6f5._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="TroisSinges" + ip="82.227.207.5" + subject="comment 4" + date="2013-11-26T20:55:39Z" + content=""" +Thanks for your answer. On the second part of my problem, *why* should `git commit` be slow? It's only committing a file with a line (../.git/annex/...), isn't it? +"""]] From 5a47358f96462fe34f60ca14c801482de8598cae Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Tue, 26 Nov 2013 21:02:17 +0000 Subject: [PATCH 05/14] Added a comment --- .../comment_5_57a5b73cff480266355e75c7bdc762c2._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_5_57a5b73cff480266355e75c7bdc762c2._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_5_57a5b73cff480266355e75c7bdc762c2._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_5_57a5b73cff480266355e75c7bdc762c2._comment new file mode 100644 index 0000000000..51e31d9b4e --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_5_57a5b73cff480266355e75c7bdc762c2._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="TroisSinges" + ip="82.227.207.5" + subject="comment 5" + date="2013-11-26T21:02:17Z" + content=""" +Err, I read my post again, and I definitely *was* talking about syncing ;-) +"""]] From 609cfa97f8b7dc63cc4c4b4d8ab0c622946f2ca6 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 26 Nov 2013 21:04:44 +0000 Subject: [PATCH 06/14] Added a comment --- ...t_6_bbcf5e863c8f152e1079536e9011a404._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_6_bbcf5e863c8f152e1079536e9011a404._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_6_bbcf5e863c8f152e1079536e9011a404._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_6_bbcf5e863c8f152e1079536e9011a404._comment new file mode 100644 index 0000000000..4640a91bfc --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_6_bbcf5e863c8f152e1079536e9011a404._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.64" + subject="comment 6" + date="2013-11-26T21:04:44Z" + content=""" +I think the most likely reason for git commit to be slow on your setup is that it probably rewrites .git/index. If you have a lot of files in your repository, the index file will be large and rewriting the index file will involve re-transferring it all over the network to the SMB share. + +It's also possible that git commit scans the whole work tree, although I don't think it should -- it's not been told to with -a. + +You may be able to find what's taking a long time by + + strace git --git-dir=/Volumes/Video/Videos/.git --work-tree=/Volumes/Video/Videos -c core.bare=false commit -m \"git-annex automatic sync\" + +(or ltrace) +"""]] From 863b20a93913ba9e30aff57abbd8707fdbdb4a4d Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 26 Nov 2013 21:07:12 +0000 Subject: [PATCH 07/14] Added a comment --- .../comment_7_fdcd144c22601bdf98ff844254b0120d._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_7_fdcd144c22601bdf98ff844254b0120d._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_7_fdcd144c22601bdf98ff844254b0120d._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_7_fdcd144c22601bdf98ff844254b0120d._comment new file mode 100644 index 0000000000..033a1af45a --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_7_fdcd144c22601bdf98ff844254b0120d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.64" + subject="comment 7" + date="2013-11-26T21:07:12Z" + content=""" +If you kept your git repository on your local disk, and used a [[directory special remote|special_remotes/directory]] on the SMB share, you could then `git annex copy --to smbshare` and `git annex get --from smbshare` as desired, which would probably be much more efficient. +"""]] From 4ddf44f4383d65176116910aa8ed7c6d1921b6dd Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Tue, 26 Nov 2013 21:17:38 +0000 Subject: [PATCH 08/14] Added a comment --- ..._b77243e765b2af7ba71e963fcb5cbbb1._comment | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_8_b77243e765b2af7ba71e963fcb5cbbb1._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_8_b77243e765b2af7ba71e963fcb5cbbb1._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_8_b77243e765b2af7ba71e963fcb5cbbb1._comment new file mode 100644 index 0000000000..273b9d8e91 --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_8_b77243e765b2af7ba71e963fcb5cbbb1._comment @@ -0,0 +1,71 @@ +[[!comment format=mdwn + username="TroisSinges" + ip="82.227.207.5" + subject="comment 8" + date="2013-11-26T21:17:38Z" + content=""" +Thanks again for your answers. + +`.git/index` is only 30Ko big. It shouldn't be an issue, even through the network. + +However, I ran `lsof`, and strangely it lock the big file I added before (`/Volumes/Video/Videos/Films/MyFamily.mkv`) + + COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME + git 68047 3singes cwd DIR 46,7 16384 5152641528667254045 /Volumes/Video/Videos + git 68047 3singes txt REG 1,4 3035984 77501447 /Applications/git-annex.app/Contents/MacOS/bundle/git + git 68047 3singes txt REG 46,7 8632 9219631544499731818 /Volumes/Video/Videos/.git/objects/pack/pack-99901c82bacfa26c04f505ceb27c4af9ccda414f.idx + git 68047 3singes txt REG 1,4 403392 77501680 /Applications/git-annex.app/Contents/MacOS/bundle/usr/lib/libpcre.0.dylib + git 68047 3singes txt REG 46,7 4012 8204150806531008435 /Volumes/Video/Videos/.git/objects/pack/pack-bb60a2315b13bda720682a4213507e5ee9ba029f.idx + git 68047 3singes txt REG 46,7 15969 12003107822997399035 /Volumes/Video/Videos/.git/objects/pack/pack-bb60a2315b13bda720682a4213507e5ee9ba029f.pack + git 68047 3singes txt REG 1,4 169392 77501683 /Applications/git-annex.app/Contents/MacOS/bundle/usr/lib/libz.1.dylib + git 68047 3singes txt REG 1,4 2088992 77501673 /Applications/git-annex.app/Contents/MacOS/bundle/usr/lib/libiconv.2.dylib + git 68047 3singes txt REG 1,4 600832 72809225 /usr/lib/dyld + git 68047 3singes txt REG 1,4 342937194 75930310 /private/var/db/dyld/dyld_shared_cache_x86_64 + git 68047 3singes 0u CHR 16,10 0t718314 2413 /dev/ttys010 + git 68047 3singes 1w CHR 3,2 0t0 308 /dev/null + git 68047 3singes 2w CHR 3,2 0t0 308 /dev/null + git 68047 3singes 3u REG 46,7 0 17793593705208135594 /Volumes/Video/Videos/.git/index.lock + git 68047 3singes 4r REG 46,7 15581987050 12221620371912261305 /Volumes/Video/Videos/Films/MyFamily.mkv + git 68047 3singes 8w CHR 3,2 0t0 308 /dev/null + +I'm using MacOSX, so I can only use `dtrace`, which I don't know so much. + +**The process is over, after 1H30:** + + ok + [2013-11-26 22:13:48 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"symbolic-ref\",\"HEAD\"] + [2013-11-26 22:13:48 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"refs/heads/annex/direct/master\"] + [2013-11-26 22:13:48 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"--verify\",\"-q\",\"refs/heads/synced/master\"] + [2013-11-26 22:13:49 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/annex/direct/master..refs/heads/synced/master\",\"--oneline\",\"-n1\"] + pull macbookpro + [2013-11-26 22:13:49 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"fetch\",\"macbookpro\"] + From /Users/3singes/Movies/NE PAS SAUVEGARDER/Videos + b2146cf..c2cf748 git-annex -> macbookpro/git-annex + [2013-11-26 22:13:50 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"--verify\",\"-q\",\"refs/remotes/macbookpro/annex/direct/master\"] + [2013-11-26 22:13:50 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"--verify\",\"-q\",\"refs/remotes/macbookpro/synced/master\"] + [2013-11-26 22:13:50 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/synced/master..refs/remotes/macbookpro/synced/master\",\"--oneline\",\"-n1\"] + ok + [2013-11-26 22:13:50 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"git-annex\"] + [2013-11-26 22:13:50 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"] + [2013-11-26 22:13:50 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/git-annex..293332232ca4e7428090171b52dcc5b3b80d1df6\",\"--oneline\",\"-n1\"] + [2013-11-26 22:13:51 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/git-annex..b2146cf0abc7d6a7e5c79d3b133181b56cd77461\",\"--oneline\",\"-n1\"] + [2013-11-26 22:13:51 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/git-annex..c2cf7488b4745d4168491d8e62f5bdc354869133\",\"--oneline\",\"-n1\"] + [2013-11-26 22:13:51 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"branch\",\"-f\",\"synced/master\"] + [2013-11-26 22:13:51 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"branch\",\"-f\",\"master\"] + [2013-11-26 22:13:51 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"--verify\",\"-q\",\"refs/remotes/macbookpro/synced/master\"] + [2013-11-26 22:13:51 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/remotes/macbookpro/synced/master..refs/heads/synced/master\",\"--oneline\",\"-n1\"] + [2013-11-26 22:13:51 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"show-ref\",\"--verify\",\"-q\",\"refs/remotes/macbookpro/git-annex\"] + [2013-11-26 22:13:51 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"log\",\"refs/remotes/macbookpro/git-annex..git-annex\",\"--oneline\",\"-n1\"] + push macbookpro + [2013-11-26 22:13:52 CET] call: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"push\",\"macbookpro\",\"+git-annex:synced/git-annex\",\"annex/direct/master:synced/master\"] + Counting objects: 9, done. + Delta compression using up to 8 threads. + Compressing objects: 100% (4/4), done. + Writing objects: 100% (5/5), 440 bytes | 0 bytes/s, done. + Total 5 (delta 3), reused 0 (delta 0) + To /Users/3singes/Movies/NE PAS SAUVEGARDER/Videos + c2cf748..2933322 git-annex -> synced/git-annex + [2013-11-26 22:13:57 CET] read: git [\"--git-dir=/Volumes/Video/Videos/.git\",\"--work-tree=/Volumes/Video/Videos\",\"-c\",\"core.bare=false\",\"push\",\"macbookpro\",\"master\"] + ok + +"""]] From 16ed52ff6a23e97d2c232919afd14deba9035332 Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Tue, 26 Nov 2013 21:19:42 +0000 Subject: [PATCH 09/14] Added a comment --- .../comment_9_cb0815e96ee211d4778f2e7a4274e855._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_9_cb0815e96ee211d4778f2e7a4274e855._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_9_cb0815e96ee211d4778f2e7a4274e855._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_9_cb0815e96ee211d4778f2e7a4274e855._comment new file mode 100644 index 0000000000..041f3c5477 --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_9_cb0815e96ee211d4778f2e7a4274e855._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="TroisSinges" + ip="82.227.207.5" + subject="comment 9" + date="2013-11-26T21:19:42Z" + content=""" +I thought to a directory special remote, but it doesn't meet my needs: the SMB drive is used by a MediaCenter, so I need the working tree. +"""]] From c7e6916f0f6f5c0460e71fef00e110e8c4b58abd Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 26 Nov 2013 21:48:11 +0000 Subject: [PATCH 10/14] Added a comment --- ..._10_06dae5709750ea1da4f7fdbee4e84efc._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_10_06dae5709750ea1da4f7fdbee4e84efc._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_10_06dae5709750ea1da4f7fdbee4e84efc._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_10_06dae5709750ea1da4f7fdbee4e84efc._comment new file mode 100644 index 0000000000..c8feb05b93 --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_10_06dae5709750ea1da4f7fdbee4e84efc._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.64" + subject="comment 10" + date="2013-11-26T21:48:11Z" + content=""" +Hmm. Seems to me that `git commit` is trying to download the whole big file from the SMB share. Perhaps just to compare it with the symlink it expects to be there? + +When I try this, in a large direct mode repository with some video from *my* family, `git commit` does not open the file (verified with strace), let alone read it, and so finishes in well under 1 second. + +Aha, I was able to reproduce `git commit` doing that with a repo on a FAT filesystem. git opens the file, and mmaps it, and I guess it proceeds to try to diff it against the symlink standin file it expected to be there. + +This is particularly unfortunate, since `git commit` is only, I think, doing this so that it can print out a \"Changes not staged for commit\" message. Which git-annex sync throws away. There seems to be no git commit option that disables this behavior. + +I think that this calls for making `git annex sync` not use `git commit` any longer, and instead manually build the commit using `git-write-tree` and `git-commit-tree`. Since I don't know if I will get to this before the thanksgiving holiday, I am creating a bug: [[bugs/direct_mode_sync_should_avoid_git_commit]] +"""]] From 89c8857cb0dcfd3b9f698fd89a80f20f40ad5760 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 26 Nov 2013 21:50:58 +0000 Subject: [PATCH 11/14] --- .../bugs/direct_mode_sync_should_avoid_git_commit.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/bugs/direct_mode_sync_should_avoid_git_commit.mdwn diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/bugs/direct_mode_sync_should_avoid_git_commit.mdwn b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/bugs/direct_mode_sync_should_avoid_git_commit.mdwn new file mode 100644 index 0000000000..74e1d89c92 --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/bugs/direct_mode_sync_should_avoid_git_commit.mdwn @@ -0,0 +1,3 @@ +Per forum post linking to this bug, git commit can be very slow when run in a filesystem without symlink support, and seems to be reading the content of files just in order to show typechanged messages in the status. + +So, git annex sync should stop using git commit when in direct mode, and intead manually make its own commit. Git.Branch.commit and Git.Branch.update should be able to easily be used for this. From 532948835ebbc9cda83fc1a2fef068d5a8c7a60a Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/bBy7WkgQicYHIiiyj.Vm0TcMbxi2quzbPFef#6f9f7" Date: Tue, 26 Nov 2013 21:57:28 +0000 Subject: [PATCH 12/14] Added a comment --- .../comment_2_5b71785acf16a8d9ea457726599daef3._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights/comment_2_5b71785acf16a8d9ea457726599daef3._comment diff --git a/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights/comment_2_5b71785acf16a8d9ea457726599daef3._comment b/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights/comment_2_5b71785acf16a8d9ea457726599daef3._comment new file mode 100644 index 0000000000..4bd5c2c0ed --- /dev/null +++ b/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights/comment_2_5b71785acf16a8d9ea457726599daef3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/bBy7WkgQicYHIiiyj.Vm0TcMbxi2quzbPFef#6f9f7" + nickname="Frederik Vanrenterghem" + subject="comment 2" + date="2013-11-26T21:57:28Z" + content=""" +Just wondering how git succeeds in installing as non-admin user. The folder it goes in is also read-only. +"""]] From b4955eea8af774030f005aa03ad7cd366ccb9058 Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Tue, 26 Nov 2013 21:57:52 +0000 Subject: [PATCH 13/14] Added a comment --- ...omment_11_2069c5c41882ae0a1973fb7da583b60e._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_11_2069c5c41882ae0a1973fb7da583b60e._comment diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_11_2069c5c41882ae0a1973fb7da583b60e._comment b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_11_2069c5c41882ae0a1973fb7da583b60e._comment new file mode 100644 index 0000000000..76ecd13c2a --- /dev/null +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/comment_11_2069c5c41882ae0a1973fb7da583b60e._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="TroisSinges" + ip="82.227.207.5" + subject="comment 11" + date="2013-11-26T21:57:52Z" + content=""" +Awesome! Thanks for your very efficient investigations. I'll stay tuned to the bug report. + +Happy Thanksgiving! +"""]] From d07cdfbc5e232a45fe93b474fa2c376969c7d6d6 Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Tue, 26 Nov 2013 21:59:29 +0000 Subject: [PATCH 14/14] typo --- .../bugs/direct_mode_sync_should_avoid_git_commit.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/bugs/direct_mode_sync_should_avoid_git_commit.mdwn b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/bugs/direct_mode_sync_should_avoid_git_commit.mdwn index 74e1d89c92..63c90a0318 100644 --- a/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/bugs/direct_mode_sync_should_avoid_git_commit.mdwn +++ b/doc/forum/Actions_very_slow_on_a_direct___40__and_crippled__41___annex_repository/bugs/direct_mode_sync_should_avoid_git_commit.mdwn @@ -1,3 +1,3 @@ Per forum post linking to this bug, git commit can be very slow when run in a filesystem without symlink support, and seems to be reading the content of files just in order to show typechanged messages in the status. -So, git annex sync should stop using git commit when in direct mode, and intead manually make its own commit. Git.Branch.commit and Git.Branch.update should be able to easily be used for this. +So, git annex sync should stop using git commit when in direct mode, and instead manually make its own commit. Git.Branch.commit and Git.Branch.update should be able to easily be used for this.