projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7121-fix-deadlock' closes #7121
[arvados.git]
/
services
/
keepstore
/
keepstore.go
diff --git
a/services/keepstore/keepstore.go
b/services/keepstore/keepstore.go
index 3dfdce20e321bfe61ffb9b9f119e10f189ee2c48..53cf7be6ca09c62828787f1c9229cce13193b480 100644
(file)
--- a/
services/keepstore/keepstore.go
+++ b/
services/keepstore/keepstore.go
@@
-14,6
+14,7
@@
import (
"os"
"os/signal"
"strings"
"os"
"os/signal"
"strings"
+ "sync"
"syscall"
"time"
)
"syscall"
"time"
)
@@
-132,10
+133,14
@@
func (vs *volumeSet) Set(value string) error {
if _, err := os.Stat(value); err != nil {
return err
}
if _, err := os.Stat(value); err != nil {
return err
}
+ var locker sync.Locker
+ if flagSerializeIO {
+ locker = &sync.Mutex{}
+ }
*vs = append(*vs, &UnixVolume{
*vs = append(*vs, &UnixVolume{
- root:
value,
-
serialize: flagSerializeIO
,
- readonly:
flagReadonly,
+ root: value,
+
locker: locker
,
+ readonly: flagReadonly,
})
return nil
}
})
return nil
}