X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/66380d0e89c00559123ceda8e74e3b1487f4a95a..3400559165e50e3d62adf6d45f9970a13450d907:/services/keepstore/keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index e55e0ef841..53cf7be6ca 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -14,6 +14,7 @@ import (
 	"os"
 	"os/signal"
 	"strings"
+	"sync"
 	"syscall"
 	"time"
 )
@@ -132,10 +133,14 @@ func (vs *volumeSet) Set(value string) error {
 	if _, err := os.Stat(value); err != nil {
 		return err
 	}
+	var locker sync.Locker
+	if flagSerializeIO {
+		locker = &sync.Mutex{}
+	}
 	*vs = append(*vs, &UnixVolume{
-		root:      value,
-		serialize: flagSerializeIO,
-		readonly:  flagReadonly,
+		root:     value,
+		locker:   locker,
+		readonly: flagReadonly,
 	})
 	return nil
 }
@@ -288,6 +293,10 @@ func main() {
 
 	flag.Parse()
 
+	if never_delete != true {
+		log.Fatal("never_delete must be true, see #6221")
+	}
+
 	if maxBuffers < 0 {
 		log.Fatal("-max-buffers must be greater than zero.")
 	}