projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7711: Store cloud node size id and price in properties of Arvados node record.
[arvados.git]
/
services
/
keepstore
/
keepstore.go
diff --git
a/services/keepstore/keepstore.go
b/services/keepstore/keepstore.go
index 2528f6d6a6c4dbf2f4b509e670c834aa10b9e618..7525441aaec995d4a524a7ff20f954ee06ae50c9 100644
(file)
--- a/
services/keepstore/keepstore.go
+++ b/
services/keepstore/keepstore.go
@@
-33,10
+33,6
@@
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"
@@
-159,8
+155,9
@@
func main() {
&neverDelete,
"never-delete",
true,
&neverDelete,
"never-delete",
true,
- "If set, nothing will be deleted. HTTP 405 will be returned "+
- "for valid DELETE requests.")
+ "If true, nothing will be deleted. "+
+ "Warning: the relevant features in keepstore and data manager have not been extensively tested. "+
+ "You should leave this option alone unless you can afford to lose data.")
flag.StringVar(
&blobSigningKeyFile,
"permission-key-file",
flag.StringVar(
&blobSigningKeyFile,
"permission-key-file",
@@
-257,8
+254,9
@@
func main() {
}
}
}
}
- if neverDelete != true && dataManagerToken != TestDataManagerToken {
- log.Fatal("never_delete must be true, see #6221")
+ if neverDelete != true {
+ log.Print("never-delete is not set. Warning: the relevant features in keepstore and data manager have not " +
+ "been extensively tested. You should leave this option alone unless you can afford to lose data.")
}
if blobSigningKeyFile != "" {
}
if blobSigningKeyFile != "" {