avoid concurrent fetches on events or restarts (#58)

* avoid concurrent fetches on events or restarts

* fix tests

Author: asiyani

.github/workflows/test.yaml

@@ -11,7 +11,7 @@ jobs:
   pkg-test:
     strategy:
       matrix:
-        go-version: [1.23.x, 1.24.x]
+        go-version: [1.24.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:

internal/integration_test/e2e_race_test.go

@@ -57,6 +57,8 @@ func Test_mirror_detect_race_clone(t *testing.T) {
 	t.Log("TEST-2: forward HEAD")
 	fileSHA2 := mustCommit(t, upstream, "file", testName+"-2")
 
+	time.Sleep(2 * time.Second)
+
 	t.Run("clone-test", func(t *testing.T) {
 		wg := &sync.WaitGroup{}
 		// all following assertions will always be true
@@ -170,7 +172,7 @@ func Test_mirror_detect_race_slow_fetch(t *testing.T) {
 
 				ctx := context.Background()
 
-				time.Sleep(time.Second) // wait for repo.Mirror to grab lock
+				time.Sleep(2 * time.Second) // wait for repo.Mirror to grab lock
 
 				gotHash, err := repo.Hash(ctx, "HEAD", "")
 				if err != nil {
@@ -212,7 +214,7 @@ func Test_mirror_detect_race_slow_fetch(t *testing.T) {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
-				time.Sleep(time.Second) // wait for repo.Mirror to grab lock
+				time.Sleep(2 * time.Second) // wait for repo.Mirror to grab lock
 
 				ctx1, cancel1 := context.WithTimeout(context.Background(), 5*time.Second)
 				if _, err := repo.Hash(ctx1, "HEAD", ""); err == nil {
@@ -281,9 +283,9 @@ func Test_mirror_detect_race_repo_pool(t *testing.T) {
 
 	t.Run("add-remove-repo-test", func(t *testing.T) {
 		wg := &sync.WaitGroup{}
-		wg.Add(1)
 
 		// add/remove 2 repositories
+		wg.Add(1)
 		go func() {
 			defer wg.Done()
 			for i := 0; i < 10; i++ {
@@ -315,7 +317,7 @@ func Test_mirror_detect_race_repo_pool(t *testing.T) {
 
 				go func() {
 					for {
-						time.Sleep(1 * time.Second)
+						time.Sleep(2 * time.Second)
 						select {
 						case <-ctx.Done():
 							close(readStopped)
@@ -354,6 +356,7 @@ func Test_mirror_detect_race_repo_pool(t *testing.T) {
 
 		}()
 
+		wg.Add(1)
 		go func() {
 			defer wg.Done()
 			for i := 0; i < 10; i++ {
@@ -385,7 +388,7 @@ func Test_mirror_detect_race_repo_pool(t *testing.T) {
 				// start loop to trigger read on repo pool
 				go func() {
 					for {
-						time.Sleep(1 * time.Second)
+						time.Sleep(2 * time.Second)
 						select {
 						case <-ctx.Done():
 							close(readStopped)

internal/integration_test/e2e_test.go

@@ -1297,13 +1297,13 @@ func Test_mirror_loop(t *testing.T) {
 
 	go repo.StartLoop(txtCtx)
 
-	time.Sleep(testInterval)
+	time.Sleep(testInterval + time.Second)
 	if repo.IsRunning() != true {
 		t.Errorf("repo running state is still false after starting mirror loop")
 	}
 
 	// wait for the mirror
-	time.Sleep(testInterval)
+	time.Sleep(testInterval + time.Second)
 
 	// verify checkout files
 	assertLinkedFile(t, root, link1, "file", t.Name()+"-1")
@@ -1314,7 +1314,7 @@ func Test_mirror_loop(t *testing.T) {
 	mustCommit(t, upstream, "file", t.Name()+"-2")
 
 	// wait for the mirror
-	time.Sleep(testInterval)
+	time.Sleep(testInterval + time.Second)
 
 	assertLinkedFile(t, root, link1, "file", t.Name()+"-2")
 	assertLinkedFile(t, root, link2, "file", t.Name()+"-2")
@@ -1324,7 +1324,7 @@ func Test_mirror_loop(t *testing.T) {
 	mustExec(t, upstream, "git", "reset", "-q", "--hard", "HEAD^")
 
 	// wait for the mirror
-	time.Sleep(testInterval)
+	time.Sleep(testInterval + time.Second)
 
 	assertLinkedFile(t, root, link1, "file", t.Name()+"-1")
 	assertLinkedFile(t, root, link2, "file", t.Name()+"-1")
@@ -1577,7 +1577,7 @@ func Test_RepoPool_Error(t *testing.T) {
 	// start mirror loop
 	rp.StartLoop()
 
-	time.Sleep(time.Second)
+	time.Sleep(2 * time.Second)
 
 	// verify Hash and checked out files
 	if got, err := rp.Hash(txtCtx, remote1, "HEAD", ""); err != nil {

main.go

@@ -192,6 +192,7 @@ func main() {
 
 	// register handler if skip validation flag is set or secret is set
 	if *flagGithubWhSkipValidation || *flagGithubWhSecret != "" {
+		logger.Info("registering github webhook", "path", *flagGithubWhPath)
 		mux.Handle(*flagGithubWhPath, wh)
 	}
 

repository/repository.go

@@ -451,13 +451,16 @@ func (r *Repository) StartLoop(ctx context.Context) {
 	}()
 
 	for {
+		// to avoid concurrent fetches on events or restarts
+		time.Sleep(jitter(r.interval, 0.2))
+
 		// to stop mirror running indefinitely we will use time-out
 		mCtx, cancel := context.WithTimeout(ctx, r.mirrorTimeout)
 		err := r.Mirror(mCtx)
 		cancel()
 		recordGitMirror(r.gitURL.Repo, err == nil)
 
-		t := time.NewTimer(jitter(r.interval, 0.2))
+		t := time.NewTimer(r.interval)
 		select {
 		case <-t.C:
 		case <-r.queueMirror: