fix locking in test

garethgeorge · Oct 13, 2024 · 80f7bfa · 80f7bfa
1 parent f501b67
commit 80f7bfa
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/internal/logstore/logstore.go b/internal/logstore/logstore.go
@@ -409,23 +409,22 @@ func (w *writer) Close() error {
 		defer w.ls.mu.Unlock(w.id)
 		defer w.ls.notify(w.id)
 
+		if e := w.ls.finalizeLogFile(w.id, w.fname); e != nil {
+			err = multierror.Append(err, fmt.Errorf("finalize %v: %w", w.fname, e))
+		} else {
+			w.ls.refcount[w.id]--
+		}
+
 		// manually close all subscribers and delete the subscriber entry from the map; there are no more writes coming.
 		w.ls.trackingMu.Lock()
+		if w.ls.refcount[w.id] == 0 {
+			delete(w.ls.refcount, w.id)
+		}
 		subs := w.ls.subscribers[w.id]
 		for _, ch := range subs {
 			close(ch)
 		}
 		delete(w.ls.subscribers, w.id)
-
-		// try to finalize the log file
-		if e := w.ls.finalizeLogFile(w.id, w.fname); e != nil {
-			err = multierror.Append(err, fmt.Errorf("finalize %v: %w", w.fname, e))
-		} else {
-			w.ls.refcount[w.id]--
-			if w.ls.refcount[w.id] == 0 {
-				delete(w.ls.refcount, w.id)
-			}
-		}
 		w.ls.trackingMu.Unlock()
 		w.ls.maybeReleaseTempFile(w.id, w.fname)
 	})

diff --git a/internal/orchestrator/tasks/taskcheck.go b/internal/orchestrator/tasks/taskcheck.go
@@ -118,6 +118,7 @@ func (t *CheckTask) Run(ctx context.Context, st ScheduledTask, runner TaskRunner
 	if err != nil {
 		return fmt.Errorf("create logref writer: %w", err)
 	}
+	defer writer.Close()
 	opCheck.OperationCheck.OutputLogref = liveID
 
 	if err := runner.UpdateOperation(op); err != nil {

diff --git a/internal/orchestrator/tasks/taskprune.go b/internal/orchestrator/tasks/taskprune.go
@@ -118,6 +118,7 @@ func (t *PruneTask) Run(ctx context.Context, st ScheduledTask, runner TaskRunner
 	if err != nil {
 		return fmt.Errorf("create logref writer: %w", err)
 	}
+	defer writer.Close()
 	opPrune.OperationPrune.OutputLogref = liveID
 
 	if err := runner.UpdateOperation(op); err != nil {

diff --git a/internal/orchestrator/tasks/taskruncommand.go b/internal/orchestrator/tasks/taskruncommand.go
@@ -51,6 +51,8 @@ func runCommandHelper(ctx context.Context, st ScheduledTask, taskRunner TaskRunn
 	if err != nil {
 		return fmt.Errorf("get logref writer: %w", err)
 	}
+	defer writer.Close()
+
 	st.Op.GetOperationRunCommand().OutputLogref = id
 	if err := taskRunner.UpdateOperation(st.Op); err != nil {
 		return fmt.Errorf("update operation: %w", err)

diff --git a/internal/resticinstaller/resticinstaller.go b/internal/resticinstaller/resticinstaller.go
@@ -170,7 +170,7 @@ func downloadFile(url string, downloadPath string) (string, error) {
 }
 
 func installResticIfNotExists(resticInstallPath string) error {
-	lock := flock.New(filepath.Join(env.DataDir(), "install.lock"))
+	lock := flock.New(filepath.Join(filepath.Dir(resticInstallPath), "install.lock"))
 	if err := lock.Lock(); err != nil {
 		return fmt.Errorf("lock %v: %w", lock.Path(), err)
 	}
@@ -254,6 +254,10 @@ func FindOrInstallResticBinary() (string, error) {
 		resticInstallPath, _ = filepath.Abs(path.Join(path.Dir(os.Args[0]), resticBinName))
 	}
 
+	if err := os.MkdirAll(path.Dir(resticInstallPath), 0700); err != nil {
+		return "", fmt.Errorf("create restic install directory %v: %w", path.Dir(resticInstallPath), err)
+	}
+
 	// Install restic if not found.
 	if _, err := os.Stat(resticInstallPath); err != nil {
 		if !errors.Is(err, os.ErrNotExist) {

diff --git a/webui/src/components/OperationList.tsx b/webui/src/components/OperationList.tsx
@@ -90,11 +90,7 @@ export const OperationList = ({
           />
         );
       }}
-      pagination={
-        operationsForDisplay.length > 25
-          ? { position: "both", align: "center", defaultPageSize: 25 }
-          : undefined
-      }
+      pagination={{ position: "both", align: "center", defaultPageSize: 25 }}
     />
   );
 };