Interrupted clone/fetch leaves .lock files around
Hi,
It used to be possible to continue an interrupted clone when using cg-clone, by cding into the partial repo and run cg-fetch. However, it seems that the recent changes in the ref locking code ends up leaving .lock files around when interrupted.
$ cg clone http://elinks.cz/elinks.git defaulting to local storage area Fetching head... Fetching objects... ... Getting pack c0e265dab40fa34912c3ee6e02ba29686ab84a7b which contains 16f85ec5043966c69e2142198c52e12494dcfc76 progress: 22 objects, 939754 bytes, now fetching c0e265dab40f... (657678 bytes) cg-clone: interrupted $ cd elinks $ cg fetch Recovering from a previously interrupted initial clone... Fetching head... Fetching objects... error: Couldn't open lock file .git/refs/heads/origin.lock: File exists error: Can't lock ref heads/origin progress: 0 objects, 0 bytes cg-fetch: objects fetch failed
Below is my feeble attempt at a (tested) fix.
fetch.c +23 -17
@@ -1,3 +1,5 @@ +#include <signal.h> +#include "fetch.h" #include "cache.h"
@@ -214,9 +216,19 @@ static int mark_complete(const char *patreturn 0 ; } +static struct ref_lock *lock =NULL ; + +static void remove_lockfile_on_signal (int signo) +{ +if (lock) +unlock_ref (lock); + lock =NULL ; +signal (SIGINT ,SIG_DFL ); +raise (signo); +} +int pull (char *target) { -struct ref_lock *lock =NULL ;unsigned char sha1[20 ];char *msg;int ret;
@@ -229,6 +241,7 @@ int pull(char *target)error ("Can't lock ref %s" , write_ref);return -1 ; } +signal (SIGINT , remove_lockfile_on_signal); }if (!get_recover)
@@ -236,22 +249,11 @@ int pull(char *target)if (interpret_target (target, sha1)) {error ("Could not interpret %s as something to pull" , target); -if (lock) -unlock_ref (lock); -return -1 ; - } -if (process (lookup_unknown_object (sha1))) { -if (lock) -unlock_ref (lock); -return -1 ; - } -if (loop ()) { -if (lock) -unlock_ref (lock); -return -1 ; - } -if (write_ref) { + }else if (process (lookup_unknown_object (sha1)) ||loop ()) { + ;/* unlock */ + + }else if (write_ref) {if (write_ref_log_details) { msg =xmalloc (strlen (write_ref_log_details) +12 );sprintf (msg,"fetch from %s" , write_ref_log_details);
@@ -261,6 +263,10 @@ int pull(char *target)if (msg)free (msg);return ret; + }else { +return 0 ; } -return 0 ; + +remove_lockfile_on_signal (0 ); +return -1 ; }
Signature · 1 line
Jonas Fonseca
Jonas Fonseca <[email protected]> wrote Tue, Jun 06, 2006:
Quoted 1 line
Below is my feeble attempt at a (tested) fix.
Ok, so maybe I didn't test it so well, other than continuously interrupting the fetch. ;)
Quoted 25 lines
fetch.c +11
-1@@ -214,9 +216,19 @@ static int mark_complete(const char *patreturn 0 ; } +static struct ref_lock *lock =NULL ; + +static void remove_lockfile_on_signal (int signo) +{ +if (lock) +unlock_ref (lock); + lock =NULL ; +signal (SIGINT ,SIG_DFL ); +raise (signo); +} +int pull (char *target) { -struct ref_lock *lock =NULL ;unsigned char sha1[20 ];char *msg;int ret;
...
fetch.c int pull(char *target) · line 270
Quoted 10 lines
fetch.c +4
-1@@ -261,6 +263,10 @@ int pull(char *target)if (msg)free (msg);return ret; + }else { +return 0 ; } -return 0 ; + +remove_lockfile_on_signal (0 );
This will end up calling raise().
Quoted 2 lines
fetch.c +1
-0+return -1 ; }
Signature · 1 line
Jonas Fonseca
fetch.c line 3
Quoted 10 lines · Jonas Fonseca
Below is my feeble attempt at a (tested) fix.
fetch.c +2
-0@@ -1,3 +1,5 @@ +#include <signal.h> +#include "fetch.h"
I suspect you could do something similar to what we already do for index updates using atexit(). Let me take a look.
Quoted 4 lines · Junio C Hamano
Quoted 2 lines · Jonas Fonseca
Below is my feeble attempt at a (tested) fix.
Quoted 11 lines
fetch.c line 3
Quoted 8 lines
fetch.c +2
-0@@ -1,3 +1,5 @@ +#include <signal.h> +#include "fetch.h" I suspect you could do something similar to what we already do for index updates using
atexit(). Let me take a look.
Indeed it turns out that the signal work Pasky did in index.c is exactly suitable for this. I've pushed out three patches in "next" -- a few more eyeballs are appreciated on this one.