From 7010b9e5c5c1519ba5d87d4c14bc36a01e298e1f Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Sun, 15 May 2011 16:47:53 +0000 Subject: Added a comment --- .../comment_10_435f87d54052f264096a8f23e99eae06._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/walkthrough/recover_data_from_lost+found/comment_10_435f87d54052f264096a8f23e99eae06._comment (limited to 'doc/walkthrough') diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_10_435f87d54052f264096a8f23e99eae06._comment b/doc/walkthrough/recover_data_from_lost+found/comment_10_435f87d54052f264096a8f23e99eae06._comment new file mode 100644 index 000000000..ec24c478d --- /dev/null +++ b/doc/walkthrough/recover_data_from_lost+found/comment_10_435f87d54052f264096a8f23e99eae06._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 10" + date="2011-05-15T16:47:53Z" + content=""" +The key is the basename of the symlink target. +"""]] -- cgit v1.2.3 From 9708940cedcbc4e9f0ce49826bdfb710cfb25e7f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" Date: Sun, 15 May 2011 18:53:27 +0000 Subject: Added a comment --- ...nt_11_9be0aef403a002c1706d17deee45763c._comment | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/walkthrough/recover_data_from_lost+found/comment_11_9be0aef403a002c1706d17deee45763c._comment (limited to 'doc/walkthrough') diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_11_9be0aef403a002c1706d17deee45763c._comment b/doc/walkthrough/recover_data_from_lost+found/comment_11_9be0aef403a002c1706d17deee45763c._comment new file mode 100644 index 000000000..7bc54573e --- /dev/null +++ b/doc/walkthrough/recover_data_from_lost+found/comment_11_9be0aef403a002c1706d17deee45763c._comment @@ -0,0 +1,24 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" + nickname="Richard" + subject="comment 11" + date="2011-05-15T18:53:26Z" + content=""" +It seems the objects are in the remote after all, but the remote is unaware of this fact. No idea where/why the remote lost that info, but.. Anyway, with the SHA backends, wouldn't it make sense to simply return \"OK\" and update the annex logs accordingly, no? + +Local: + + % ls -l foo + lrwxrwxrwx 1 richih richih 312 Apr 3 01:18 foo -> .git/annex/objects/gG/VW/SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491/SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491 + % + +Remote: + + % git-annex-shell recvkey SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491 + git-annex-shell: key is already present in annex + % strace git-annex-shell recvkey /base/git-annex/fun SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491 2>&1 | grep SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491 + stat64(\"/base/git-annex/fun/annex/objects/gG/VW/SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491/SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491\", {st_mode=S_IFREG|0444, st_size=80781, ...}) = 0 + % ls -l /base/git-annex/fun/annex/objects/gG/VW/SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491/SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491 + -r--r--r-- 1 richih richih 80781 2011-04-01 12:44 /base/git-annex/fun/annex/objects/gG/VW/SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491/SHA512-s80781--cef3966a19c7435acceb8fbfbff1feebe6decab7c81a0c197f00932cf9ef0eac330784cc3f0d211bd4acf56a6d16daaebe9b598aa4dfd5bfec73f4e6df3f0491 + % +"""]] -- cgit v1.2.3 From 59ae1df7a0180263c5434c13b01eb4e7e4ed3267 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Sun, 15 May 2011 19:40:47 +0000 Subject: Added a comment --- .../comment_12_26d60661196f63fd01ee4fbb6e2340e7._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/walkthrough/recover_data_from_lost+found/comment_12_26d60661196f63fd01ee4fbb6e2340e7._comment (limited to 'doc/walkthrough') diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_12_26d60661196f63fd01ee4fbb6e2340e7._comment b/doc/walkthrough/recover_data_from_lost+found/comment_12_26d60661196f63fd01ee4fbb6e2340e7._comment new file mode 100644 index 000000000..b458a37b6 --- /dev/null +++ b/doc/walkthrough/recover_data_from_lost+found/comment_12_26d60661196f63fd01ee4fbb6e2340e7._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 12" + date="2011-05-15T19:40:47Z" + content=""" +So, it appears that you're using git annex copy --fast. As documented that assumes the location log is correct. So it avoids directly checking if the bare repo contains the file, and tries to upload it, and the bare repo is all like \"but I've already got this file!\". The only way to improve that behavior might be to let rsync go ahead and retransfer the file, which, with recovery, should require sending little data etc. But I can't say I like the idea much, as the repo already has the content, so unlocking it and letting rsync mess with it is an unnecessary risk. I think it's ok for --force to blow up +if its assumptions turn out to be wrong. + +If you use git annex copy without --fast in this situation, it will do the right thing. +"""]] -- cgit v1.2.3 From 4d140e3901b7e3c8d66a95817d845b9f35ac6b05 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" Date: Sun, 15 May 2011 20:25:25 +0000 Subject: Added a comment --- ...nt_13_ead55b915d3b92a62549b2957ad211c8._comment | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 doc/walkthrough/recover_data_from_lost+found/comment_13_ead55b915d3b92a62549b2957ad211c8._comment (limited to 'doc/walkthrough') diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_13_ead55b915d3b92a62549b2957ad211c8._comment b/doc/walkthrough/recover_data_from_lost+found/comment_13_ead55b915d3b92a62549b2957ad211c8._comment new file mode 100644 index 000000000..d92ecbba0 --- /dev/null +++ b/doc/walkthrough/recover_data_from_lost+found/comment_13_ead55b915d3b92a62549b2957ad211c8._comment @@ -0,0 +1,35 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" + nickname="Richard" + subject="comment 13" + date="2011-05-15T20:25:25Z" + content=""" +Yes, makes sense. I am so used to using --fast, I forgot a non-fast mode existed. I still think it would be a good idea to fall back to non-fast mode if --fast runs into an error from the remote, but as that is well without my abilities how about this patch? + + + From 4855510c7a84eb5d28fdada429580a8a42b7112a Mon Sep 17 00:00:00 2001 + From: Richard Hartmann + Date: Sun, 15 May 2011 22:20:42 +0200 + Subject: [PATCH] Make error in RecvKey.hs suggest possible solution + + --- + Command/RecvKey.hs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + + diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs + index 126608f..b917a1c 100644 + --- a/Command/RecvKey.hs + +++ b/Command/RecvKey.hs + @@ -27,7 +27,7 @@ start :: CommandStartKey + start key = do + present <- inAnnex key + when present $ + - error \"key is already present in annex\" + + error \"key is already present in annex. If you are running copy, try without '--fast'\" + + ok <- getViaTmp key (liftIO . rsyncServerReceive) + if ok + -- + 1.7.4.4 + +"""]] -- cgit v1.2.3 From 120bc4208d45f848e4ab0890b54a255bef6a90bb Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" Date: Sun, 15 May 2011 20:50:27 +0000 Subject: Added a comment --- .../comment_14_191de89d3988083d9cf001799818ff4a._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/walkthrough/recover_data_from_lost+found/comment_14_191de89d3988083d9cf001799818ff4a._comment (limited to 'doc/walkthrough') diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_14_191de89d3988083d9cf001799818ff4a._comment b/doc/walkthrough/recover_data_from_lost+found/comment_14_191de89d3988083d9cf001799818ff4a._comment new file mode 100644 index 000000000..f45bd7046 --- /dev/null +++ b/doc/walkthrough/recover_data_from_lost+found/comment_14_191de89d3988083d9cf001799818ff4a._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" + nickname="Richard" + subject="comment 14" + date="2011-05-15T20:50:26Z" + content=""" +Or, even better, wouldn't it make sense to have SHA backends always default to --fast and only use non-fast when any snags are hit, use non-fast mode for that file. + +Though if we continue here, we should probably move this to its own page. +"""]] -- cgit v1.2.3 From 4c312d8d8fba8840edd86fe8b951b6b20349985f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" Date: Sun, 15 May 2011 21:38:47 +0000 Subject: Added a comment --- .../comment_15_b3e3b338ccfa0a32510c78ba1b1bb617._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/walkthrough/recover_data_from_lost+found/comment_15_b3e3b338ccfa0a32510c78ba1b1bb617._comment (limited to 'doc/walkthrough') diff --git a/doc/walkthrough/recover_data_from_lost+found/comment_15_b3e3b338ccfa0a32510c78ba1b1bb617._comment b/doc/walkthrough/recover_data_from_lost+found/comment_15_b3e3b338ccfa0a32510c78ba1b1bb617._comment new file mode 100644 index 000000000..b4a00bd7e --- /dev/null +++ b/doc/walkthrough/recover_data_from_lost+found/comment_15_b3e3b338ccfa0a32510c78ba1b1bb617._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" + nickname="Richard" + subject="comment 15" + date="2011-05-15T21:38:47Z" + content=""" +PS: Just to make this clear, I am using a custom alias for all my copying needs and thus didn't even see that I used --fast. :p +"""]] -- cgit v1.2.3