projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7200: Use io.Copy instead of reading all bytes and writing to response. Much improved...
[arvados.git]
/
services
/
keepstore
/
keepstore.go
diff --git
a/services/keepstore/keepstore.go
b/services/keepstore/keepstore.go
index c4a12c5a5c44a9af5ca2360e70fe9ccdf961a330..3e360e1799117e80e773e1e5c58fa3b5560b07ef 100644
(file)
--- a/
services/keepstore/keepstore.go
+++ b/
services/keepstore/keepstore.go
@@
-36,6
+36,10
@@
const BlockSize = 64 * 1024 * 1024
// in order to permit writes.
const MinFreeKilobytes = BlockSize / 1024
// in order to permit writes.
const MinFreeKilobytes = BlockSize / 1024
+// Until #6221 is resolved, never_delete must be true.
+// However, allow it to be false in testing with TestDataManagerToken
+const TestDataManagerToken = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h"
+
// ProcMounts /proc/mounts
var ProcMounts = "/proc/mounts"
// ProcMounts /proc/mounts
var ProcMounts = "/proc/mounts"
@@
-293,10
+297,6
@@
func main() {
flag.Parse()
flag.Parse()
- if neverDelete != true {
- log.Fatal("neverDelete must be true, see #6221")
- }
-
if maxBuffers < 0 {
log.Fatal("-max-buffers must be greater than zero.")
}
if maxBuffers < 0 {
log.Fatal("-max-buffers must be greater than zero.")
}
@@
-347,6
+347,11
@@
func main() {
log.Fatalf("reading data manager token: %s\n", err)
}
}
log.Fatalf("reading data manager token: %s\n", err)
}
}
+
+ if neverDelete != true && dataManagerToken != TestDataManagerToken {
+ log.Fatal("never_delete must be true, see #6221")
+ }
+
if blobSigningKeyFile != "" {
if buf, err := ioutil.ReadFile(blobSigningKeyFile); err == nil {
PermissionSecret = bytes.TrimSpace(buf)
if blobSigningKeyFile != "" {
if buf, err := ioutil.ReadFile(blobSigningKeyFile); err == nil {
PermissionSecret = bytes.TrimSpace(buf)