diff options
author | Joey Hess <joey@kitenet.net> | 2013-08-26 22:04:47 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-08-26 22:04:47 -0400 |
commit | dd4fef308958723119cad72e84f444ec7b3c4bb8 (patch) | |
tree | 118ccf88011a7870c79eeb5bab3c53ec6f79ba55 /doc | |
parent | 0e9a1e69828343d1919e5bb6eedb2d0fd8d3ce36 (diff) | |
parent | b25fb1bcf2a79d89a11ded93f94a15933466fbc7 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
9 files changed, 50 insertions, 189 deletions
diff --git a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_10_1d841ff0b0ffd814efed2449dc1f35f3._comment b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_10_1d841ff0b0ffd814efed2449dc1f35f3._comment new file mode 100644 index 000000000..892894ad4 --- /dev/null +++ b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_10_1d841ff0b0ffd814efed2449dc1f35f3._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.0.63" + subject="comment 10" + date="2013-08-27T01:46:36Z" + content=""" +This seems to be a reversion instroduced in commit a48d340abdaf3296a2ddacd73c18adc9a13a02ef. With that backed out, I get 0% cpu usage for the terminal app. Even if I run top in the terminal, its CPU sits under 1%. + +Clearly the infinite loop in that patch is running faster than expected! +"""]] diff --git a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_10_cd101e0af45d8f463011fb0d04b3b822._comment b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_10_cd101e0af45d8f463011fb0d04b3b822._comment new file mode 100644 index 000000000..d8ca9fb05 --- /dev/null +++ b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_10_cd101e0af45d8f463011fb0d04b3b822._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="http://edheil.wordpress.com/" + ip="173.162.44.162" + subject="comment 10" + date="2013-08-26T20:19:06Z" + content=""" +Yeah, that would definitely explain both what I'm seeing and why you haven't been seeing it. + +"""]] diff --git a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_4_0f1aeaaf1bb3d79393bb77ea65f81089._comment b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_4_0f1aeaaf1bb3d79393bb77ea65f81089._comment deleted file mode 100644 index 924001bb1..000000000 --- a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_4_0f1aeaaf1bb3d79393bb77ea65f81089._comment +++ /dev/null @@ -1,99 +0,0 @@ -[[!comment format=mdwn - username="http://edheil.wordpress.com/" - ip="173.162.44.162" - subject="comment 4" - date="2013-08-26T19:32:35Z" - content=""" -Wiped out the repository I was using. Cleared my data on the android app completely so I was starting from scratch. Created a new repository on the laptop with a linked XMPP account and a ssh repo. Fired up the android app and gave it the same XMPP credentials and the same ssh repo. - -I did not actually add any files to the repo. - -The application consumed 35% CPU on the Android tablet, idling, and has been ever since. - -This is the log; maybe something in it will explain the problem: - -\"\"\" - -× Synced with ejayaitch -× Synced with edheil.noip.org_androidannex -× Synced with ejayaitch -× Pairing with ejayaitch complete -× Performed startup scan -Here's everything that has been logged by the git-annex assistant, as well as by programs it has run. - -[2013-08-26 15:10:58 EDT] main: starting assistant version 4.20130802-g60ecabd -(scanning...) [2013-08-26 15:10:58 EDT] Watcher: Performing startup scan -(started...) [2013-08-26 15:11:31 EDT] XMPPClient: Pairing with ejayaitch in progress -[2013-08-26 15:11:32 EDT] XMPPSendPack: Syncing with ejayaitch -Already up-to-date. -[2013-08-26 15:11:33 EDT] XMPPReceivePack: Syncing with ejayaitch -[2013-08-26 15:11:33 EDT] XMPPSendPack: Unable to download files from your other devices. -[2013-08-26 15:11:33 EDT] XMPPSendPack: Syncing with ejayaitch -[2013-08-26 15:11:33 EDT] XMPPSendPack: Unable to download files from your other devices. -[2013-08-26 15:11:58 EDT] XMPPSendPack: Syncing with ejayaitch -[2013-08-26 15:11:59 EDT] XMPPSendPack: Unable to download files from your other devices. -[2013-08-26 15:11:59 EDT] XMPPSendPack: Syncing with ejayaitch -[2013-08-26 15:11:59 EDT] XMPPSendPack: Unable to download files from your other devices. -Generating public/private rsa key pair. -Your identification has been saved in /data/data/ga.androidterm/tmp/git-annex-keygen.0/key. -Your public key has been saved in /data/data/ga.androidterm/tmp/git-annex-keygen.0/key.pub. -The key fingerprint is: -bb:85:f2:e7:05:ad:82:62:de:27:32:5b:7a:90:c7:3d u0_a91@localhost -The key's randomart image is: -+--[ RSA 2048]----+ -| | -| | -| | -| . | -| o .S . . | -| o o.Eo o | -| oo+ +.o . | -| oo=oo.+.. | -| +=.ooo. | -+-----------------+ -[2013-08-26 15:13:07 EDT] main: Syncing with edheil.noip.org_androidannex -warning: no common commits -From ssh://git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex -* [new branch] git-annex -> edheil.noip.org_androidannex/git-annex -* [new branch] master -> edheil.noip.org_androidannex/master -* [new branch] synced/git-annex -> edheil.noip.org_androidannex/synced/git-annex -* [new branch] synced/master -> edheil.noip.org_androidannex/synced/master -Already up-to-date! -Merge made by the 'recursive' strategy. -Already up-to-date. -[2013-08-26 15:13:10 EDT] Pusher: Syncing with edheil.noip.org_androidannex -Already up-to-date. -Already up-to-date. -warning: no threads support, ignoring --threads -warning: no threads support, ignoring --threads -To ssh://ed@git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex/ - 54a6ede..b502e21 git-annex -> synced/git-annex - 67690e7..0bdd057 master -> synced/master -error: Ref refs/heads/synced/git-annex is at b502e2176d04a713d49b019e10b13dc9d30835bd but expected 54a6eded4adf9c926a15675351e3feaa0083cf46 -remote: error: failed to lock refs/heads/synced/git-annex[K -error: Ref refs/heads/synced/master is at 0bdd0575caf5c1992015175363e767ab526b5db7 but expected 67690e7d9c6da81792d14e7389e43a75abfd5a36 -remote: error: failed to lock refs/heads/synced/master[K -To ssh://ed@git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex/ -! [remote rejected] git-annex -> synced/git-annex (failed to lock) -! [remote rejected] master -> synced/master (failed to lock) -error: failed to push some refs to 'ssh://ed@git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex/' -Already up-to-date. -Everything up-to-date -fatal: The remote end hung up unexpectedly -[2013-08-26 15:13:33 EDT] XMPPReceivePack: Syncing with ejayaitch -Already up-to-date. -From ssh://git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex - b502e21..5c2452d synced/git-annex -> edheil.noip.org_androidannex/synced/git-annex -[2013-08-26 15:15:10 EDT] read: git [\"--git-dir=/storage/emulated/legacy/annex/.git\",\"--work-tree=/storage/emulated/legacy/annex\",\"ls-tree\",\"-z\",\"--\",\"refs/heads/git-annex\",\"uuid.log\",\"remote.log\",\"trust.log\",\"group.log\",\"preferred-content.log\"] -[2013-08-26 15:15:12 EDT] XMPPClient: received: [\"Unknown message\"] -[2013-08-26 15:15:33 EDT] XMPPClient: received: [\"Pushing \\"e28\\" (ReceivePackDone (ExitFailure 128))\"] -[2013-08-26 15:15:33 EDT] XMPPClient: NetMessager stored Pushing \"e28\" (ReceivePackDone (ExitFailure 128)) in SendPack inbox \"e28\" -[2013-08-26 15:17:12 EDT] XMPPClient: received: [\"Unknown message\"] -[2013-08-26 15:17:33 EDT] XMPPClient: received: [\"Presence from h10/messaging-TalkGadgetwADC317A1 Nothing\"] -[2013-08-26 15:17:42 EDT] XMPPClient: received: [\"Presence from 326/MessagingA7afbdd8d Nothing\"] -[2013-08-26 15:17:42 EDT] XMPPClient: received: [\"Presence from 326/MessagingA7afbdd8d Nothing\"] -[2013-08-26 15:18:25 EDT] XMPPClient: received: [\"Presence from h10/messaging-TalkGadgetwADC317A1 Nothing\"] -[2013-08-26 15:19:12 EDT] XMPPClient: received: [\"Unknown message\"] - -\"\"\" -"""]] diff --git a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_5_30120dee80aeab74d3f480b83b08440b._comment b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_5_30120dee80aeab74d3f480b83b08440b._comment deleted file mode 100644 index 91967aecc..000000000 --- a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_5_30120dee80aeab74d3f480b83b08440b._comment +++ /dev/null @@ -1,90 +0,0 @@ -[[!comment format=mdwn - username="http://edheil.wordpress.com/" - ip="173.162.44.162" - subject="comment 5" - date="2013-08-26T19:34:23Z" - content=""" -hopefully better formatted debug info: - - × Synced with ejayaitch - × Synced with edheil.noip.org_androidannex - × Synced with ejayaitch - × Pairing with ejayaitch complete - × Performed startup scan - Here's everything that has been logged by the git-annex assistant, as well as by programs it has run. - - [2013-08-26 15:10:58 EDT] main: starting assistant version 4.20130802-g60ecabd - (scanning...) [2013-08-26 15:10:58 EDT] Watcher: Performing startup scan - (started...) [2013-08-26 15:11:31 EDT] XMPPClient: Pairing with ejayaitch in progress - [2013-08-26 15:11:32 EDT] XMPPSendPack: Syncing with ejayaitch - Already up-to-date. - [2013-08-26 15:11:33 EDT] XMPPReceivePack: Syncing with ejayaitch - [2013-08-26 15:11:33 EDT] XMPPSendPack: Unable to download files from your other devices. - [2013-08-26 15:11:33 EDT] XMPPSendPack: Syncing with ejayaitch - [2013-08-26 15:11:33 EDT] XMPPSendPack: Unable to download files from your other devices. - [2013-08-26 15:11:58 EDT] XMPPSendPack: Syncing with ejayaitch - [2013-08-26 15:11:59 EDT] XMPPSendPack: Unable to download files from your other devices. - [2013-08-26 15:11:59 EDT] XMPPSendPack: Syncing with ejayaitch - [2013-08-26 15:11:59 EDT] XMPPSendPack: Unable to download files from your other devices. - Generating public/private rsa key pair. - Your identification has been saved in /data/data/ga.androidterm/tmp/git-annex-keygen.0/key. - Your public key has been saved in /data/data/ga.androidterm/tmp/git-annex-keygen.0/key.pub. - The key fingerprint is: - bb:85:f2:e7:05:ad:82:62:de:27:32:5b:7a:90:c7:3d u0_a91@localhost - The key's randomart image is: - +--[ RSA 2048]----+ - | | - | | - | | - | . | - | o .S . . | - | o o.Eo o | - | oo+ +.o . | - | oo=oo.+.. | - | +=.ooo. | - +-----------------+ - [2013-08-26 15:13:07 EDT] main: Syncing with edheil.noip.org_androidannex - warning: no common commits - From ssh://git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex - * [new branch] git-annex -> edheil.noip.org_androidannex/git-annex - * [new branch] master -> edheil.noip.org_androidannex/master - * [new branch] synced/git-annex -> edheil.noip.org_androidannex/synced/git-annex - * [new branch] synced/master -> edheil.noip.org_androidannex/synced/master - Already up-to-date! - Merge made by the 'recursive' strategy. - Already up-to-date. - [2013-08-26 15:13:10 EDT] Pusher: Syncing with edheil.noip.org_androidannex - Already up-to-date. - Already up-to-date. - warning: no threads support, ignoring --threads - warning: no threads support, ignoring --threads - To ssh://ed@git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex/ - 54a6ede..b502e21 git-annex -> synced/git-annex - 67690e7..0bdd057 master -> synced/master - error: Ref refs/heads/synced/git-annex is at b502e2176d04a713d49b019e10b13dc9d30835bd but expected 54a6eded4adf9c926a15675351e3feaa0083cf46 - remote: error: failed to lock refs/heads/synced/git-annex[K - error: Ref refs/heads/synced/master is at 0bdd0575caf5c1992015175363e767ab526b5db7 but expected 67690e7d9c6da81792d14e7389e43a75abfd5a36 - remote: error: failed to lock refs/heads/synced/master[K - To ssh://ed@git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex/ - ! [remote rejected] git-annex -> synced/git-annex (failed to lock) - ! [remote rejected] master -> synced/master (failed to lock) - error: failed to push some refs to 'ssh://ed@git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex/' - Already up-to-date. - Everything up-to-date - fatal: The remote end hung up unexpectedly - [2013-08-26 15:13:33 EDT] XMPPReceivePack: Syncing with ejayaitch - Already up-to-date. - From ssh://git-annex-edheil.no-ip.org-ed_androidannex/~/androidannex - b502e21..5c2452d synced/git-annex -> edheil.noip.org_androidannex/synced/git-annex - [2013-08-26 15:15:10 EDT] read: git [\"--git-dir=/storage/emulated/legacy/annex/.git\",\"--work-tree=/storage/emulated/legacy/annex\",\"ls-tree\",\"-z\",\"--\",\"refs/heads/git-annex\",\"uuid.log\",\"remote.log\",\"trust.log\",\"group.log\",\"preferred-content.log\"] - [2013-08-26 15:15:12 EDT] XMPPClient: received: [\"Unknown message\"] - [2013-08-26 15:15:33 EDT] XMPPClient: received: [\"Pushing \\"e28\\" (ReceivePackDone (ExitFailure 128))\"] - [2013-08-26 15:15:33 EDT] XMPPClient: NetMessager stored Pushing \"e28\" (ReceivePackDone (ExitFailure 128)) in SendPack inbox \"e28\" - [2013-08-26 15:17:12 EDT] XMPPClient: received: [\"Unknown message\"] - [2013-08-26 15:17:33 EDT] XMPPClient: received: [\"Presence from h10/messaging-TalkGadgetwADC317A1 Nothing\"] - [2013-08-26 15:17:42 EDT] XMPPClient: received: [\"Presence from 326/MessagingA7afbdd8d Nothing\"] - [2013-08-26 15:17:42 EDT] XMPPClient: received: [\"Presence from 326/MessagingA7afbdd8d Nothing\"] - [2013-08-26 15:18:25 EDT] XMPPClient: received: [\"Presence from h10/messaging-TalkGadgetwADC317A1 Nothing\"] - [2013-08-26 15:19:12 EDT] XMPPClient: received: [\"Unknown message\"] - -"""]] diff --git a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_8_9bb23e9cbc77ecca4b1209b0f66bc2b0._comment b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_8_9bb23e9cbc77ecca4b1209b0f66bc2b0._comment new file mode 100644 index 000000000..3fce2f21f --- /dev/null +++ b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_8_9bb23e9cbc77ecca4b1209b0f66bc2b0._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.0.63" + subject="oh yeah, i can run top in adb.." + date="2013-08-26T20:14:13Z" + content=""" +So, I can tell that on my tablet, the terminal app is using 82% cpu while idle. +"""]] diff --git a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_9_d1ce7fc251db076da61eed5bb9d71b9a._comment b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_9_d1ce7fc251db076da61eed5bb9d71b9a._comment new file mode 100644 index 000000000..ffd0a44be --- /dev/null +++ b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_9_d1ce7fc251db076da61eed5bb9d71b9a._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="http://edheil.wordpress.com/" + ip="173.162.44.162" + subject="comment 9" + date="2013-08-26T20:49:34Z" + content=""" +(removed my earlier comments with debug info, since it wasn't relevant and I'd just as soon not display my gmail id and home machine's address on the web if I don't need to) + +"""]] diff --git a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_9_feb71c1022ff65d82e66a3958a41dfb2._comment b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_9_feb71c1022ff65d82e66a3958a41dfb2._comment new file mode 100644 index 000000000..8f32df035 --- /dev/null +++ b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit/comment_9_feb71c1022ff65d82e66a3958a41dfb2._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.0.63" + subject="comment 9" + date="2013-08-26T20:16:05Z" + content=""" +Strace doesn't show it doing anything. I suppose I should try building the terminal without the several patches I added to it to support git-annex to see if I somehow made it use all this cpu.. +"""]] diff --git a/doc/todo/wishlist:_Freeing_X_space_on_remote_Y.mdwn b/doc/todo/wishlist:_Freeing_X_space_on_remote_Y.mdwn new file mode 100644 index 000000000..5fec39d98 --- /dev/null +++ b/doc/todo/wishlist:_Freeing_X_space_on_remote_Y.mdwn @@ -0,0 +1 @@ +As suggested during the first Gitify BoF during DebConf13: Adding a way to have on-demand dropping of content in a given remote would allow a user to quickly free up disk space on demand while still heeding numcopies etc. diff --git a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__.mdwn b/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__.mdwn new file mode 100644 index 000000000..626f5a03f --- /dev/null +++ b/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__.mdwn @@ -0,0 +1,5 @@ +Also suggested during the first Gitify BoF during DebConf13: + +`git annex drop` deletes immediately. In some situations a mechanism to tell git-annex "I would like to hold onto this data if possible, but if you need the space, please delete it" could be nice. + +An obvious question would be how to do cleanups. With the assistant, that's easy. On CLI, at the very least `git annex fsck` should list, and optionally delete, that data. |