Merge branch 'master' of ssh://git-annex.branchable.com

2013-02-28 15:33:55 -04:00 · 2013-02-28 15:33:55 -04:00 · 0745215736
commit 0745215736
parent e69cb08264 7c45f01777
5 changed files with 119 additions and 0 deletions
--- a/doc/bugs/39client39_repo_starts_pulling_in_39archive39_content.mdwn
+++ b/doc/bugs/39client39_repo_starts_pulling_in_39archive39_content.mdwn
@ -0,0 +1,22 @@
+What steps will reproduce the problem?
+
+running the assistant on my setup, which is a central 'client' repo, and two 'backup' repos on a USB drive and an ssh connection to another server.  Both of those backup repos are non-bare, and I occasionally manually run 'git annex sync' on them to keep them up to date.  I have 'numcopies' set to 2.
+
+
+What is the expected output? What do you see instead?
+
+I expect everything to be copied to the 'backup' repos and content in the 'archive' subdirectories of the 'client' repo to be dropped.
+
+What happened instead: This morning, I started up the assistant without the USB drive present.  I added one file to my client repo.  The assistant began copying it to the SSH backup repo.  I then plugged in the USB drive, and it began copying it to the USB repo; however, it *also* queued up large amounts of content in 'archive' subdirectories and started copying it down onto my client repo, which is unacceptable because there is not actually enough disk space on the client machine to hold everything in the 'archive' subdirectories!  I stopped the assistant and started it up again.  It started doing the same thing (queueing up archive content to transfer to client), and in addition started dropping content from my USB drive.  This seems very similar to the bug in the previous version, where the globbing was broken.  It's acting as if my usb remote preferred no content at all, and it transfers everything away from it and drops it -- and at the same time, brings in content which is not supposed to be there on my client machine.  Strangely it's not doing the same thing on the ssh remote -- the ssh remote is fine.  No anomalies there -- it has not been trying to drop content from there.
+
+This is just happening this morning -- I compiled 4.20130227 last night and ran the assistant and it behaved correctly, with no bugs at all.  Now when I run it, it's going crazy.
+
+What version of git-annex are you using? On what operating system?
+
+4.20130227 on OS X.
+
+
+Please provide any additional information below.
+
+One thing that would be incredibly helpful with the kinds of bugs I've seen in the assistant is if the daemon.log contained info about *why* it is dropping or transferring content.  "transferring content because there was only 1 copy and we need to fulfill numcopies" "transferring content because it matches such-and-such a preferred content expresson" "dropping content because it does not match this preferred content expression" -- that would remove a lot of mystery about the way the assistant is working.
+
--- a/doc/bugs/tests_failed_to_build_-_after_an_update_of_haskell_platform/comment_3_014474a133c7ff0131029d8721afc710._comment
+++ b/doc/bugs/tests_failed_to_build_-_after_an_update_of_haskell_platform/comment_3_014474a133c7ff0131029d8721afc710._comment
@ -0,0 +1,46 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM"
+ nickname="Karsten"
+ subject="Testpack install fails on ubuntu 12.04"
+ date="2013-02-28T10:42:36Z"
+ content="""
+The current release (git-annex-4.20130227, via cabal) fails to install because testpack-2.1.2 fails to install:
+
+    karsten@vdr1:~$ cabal install --bindir $HOME/bin git-annex
+    Resolving dependencies...
+    Configuring testpack-2.1.2...
+    Building testpack-2.1.2...
+    Preprocessing library testpack-2.1.2...
+    [1 of 3] Compiling Test.QuickCheck.Instances ( src/Test/QuickCheck/Instances.hs, dist/build/Test/QuickCheck/Instances.o )
+    [2 of 3] Compiling Test.QuickCheck.Tools ( src/Test/QuickCheck/Tools.hs, dist/build/Test/QuickCheck/Tools.o )
+    
+    src/Test/QuickCheck/Tools.hs:33:9:
+        Warning: Fields of `MkResult' not initialised: abort
+        In the expression:
+          MkResult
+            {ok = Just (expected == actual), expect = True,
+             interrupted = False,
+             reason = \"Result: expected \"
+                      ++ show expected ++ \", got \" ++ show actual,
+             stamp = [], callbacks = []}
+        In an equation for `@=?':
+            expected @=? actual
+              = MkResult
+                  {ok = Just (expected == actual), expect = True,
+                   interrupted = False,
+                   reason = \"Result: expected \"
+                            ++ show expected ++ \", got \" ++ show actual,
+                   stamp = [], callbacks = []}
+    [3 of 3] Compiling Test.HUnit.Tools ( src/Test/HUnit/Tools.hs, dist/build/Test/HUnit/Tools.o )
+    
+    src/Test/HUnit/Tools.hs:131:57:
+        `maxDiscard' is not a (visible) constructor field name
+    
+    src/Test/HUnit/Tools.hs:177:40: Not in scope: `maxDiscard'
+    cabal: Error: some packages failed to install:
+    git-annex-4.20130227 depends on testpack-2.1.2 which failed to install.
+    testpack-2.1.2 failed during the building phase. The exception was:
+    ExitFailure 1
+
+Manually installing testpack gives Version testpack-2.1.2.1 which installs correctly. Maybe the dependencies should be updated?
+"""]]
--- a/doc/design/assistant/blog/day_200__release_day/comment_2_39d3ad0a029fe56e96f97d28d17fbbd2._comment
+++ b/doc/design/assistant/blog/day_200__release_day/comment_2_39d3ad0a029fe56e96f97d28d17fbbd2._comment
@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://meep.pl/"
+ ip="193.23.174.18"
+ subject="comment 2"
+ date="2013-02-28T06:13:21Z"
+ content="""
+Maybe it's the build changes? Android apk disappeared from <http://downloads.kitenet.net/git-annex/android/current/>
+"""]]
--- a/doc/design/assistant/blog/day_200__release_day/comment_3_5b752d6a8d74e61190f09384b6108206._comment
+++ b/doc/design/assistant/blog/day_200__release_day/comment_3_5b752d6a8d74e61190f09384b6108206._comment
@ -0,0 +1,31 @@
+[[!comment format=c
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA"
+ nickname="Laszlo"
+ subject="comment 3"
+ date="2013-02-28T08:40:46Z"
+ content="""
+Two suggestion:
+1. Possibility to restrict CPU usage (a 10-20% would be nice, or a slider)
+2. Pager on Dashboard
+
+I have a directory, it is 741MB, and contains 23381 files. 
+This directory is pretty much everything needed for my daily job.
+
+I added a copy of this directory to annex, then I created a backup dir of annex, 
+and my laptop is using almost 100%CPU al the time, it is running since 1 hour already, and 
+only 140MB was copied over to the backup directory.
+
+Don't get me wrong, this application just blows my mind, and it seems to *work* for the first time for real.
+
+The suggestion is simply a slider in resource manager (preferably inside dashboard):
+Restrict CPU usage [0---X---100]34%
+Restrict upload bandwith [0-X----800]9kB/s
+Restrict download bandwith [0-X----800]80kB/s
+
+Also the pager is musthave in dashboard, because it renders firefox unusable with that many entries (21000).
+
+Nice work, thank you for the release!
+
+Laszlo
+
+"""]]
--- a/doc/design/assistant/blog/day_200__release_day/comment_4_881274ae0d6230bb4cafa4151ad72b49._comment
+++ b/doc/design/assistant/blog/day_200__release_day/comment_4_881274ae0d6230bb4cafa4151ad72b49._comment
@ -0,0 +1,12 @@
+[[!comment format=Makefile
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA"
+ nickname="Laszlo"
+ subject="lot of stuck git processes"
+ date="2013-02-28T09:01:25Z"
+ content="""
+Oh, and here is how it looks 
+ps -e |grep git 
+command after git-annex has been stopped (from the gui):
+(54 process, from which 50 process <defunct>)
+http://pastebin.com/5u74qTNU
+"""]]