X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4e26efd8ee2d1896e329dc32488346341557a15b..b958c247cba0cc0a9b13dfd4fbc10c1a807b5074:/services/keepstore/keepstore.go?ds=inline

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 175897cd28..3dfdce20e3 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -54,7 +54,7 @@ var data_manager_token string
 
 // never_delete can be used to prevent the DELETE handler from
 // actually deleting anything.
-var never_delete = false
+var never_delete = true
 
 var maxBuffers = 128
 var bufs *bufferPool
@@ -232,7 +232,7 @@ func main() {
 	flag.BoolVar(
 		&never_delete,
 		"never-delete",
-		false,
+		true,
 		"If set, nothing will be deleted. HTTP 405 will be returned "+
 			"for valid DELETE requests.")
 	flag.StringVar(
@@ -288,17 +288,21 @@ 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.")
 	}
 	bufs = newBufferPool(maxBuffers, BLOCKSIZE)
 
 	if pidfile != "" {
-		f, err := os.OpenFile(pidfile, os.O_RDWR | os.O_CREATE, 0777)
+		f, err := os.OpenFile(pidfile, os.O_RDWR|os.O_CREATE, 0777)
 		if err != nil {
 			log.Fatalf("open pidfile (%s): %s", pidfile, err)
 		}
-		err = syscall.Flock(int(f.Fd()), syscall.LOCK_EX | syscall.LOCK_NB)
+		err = syscall.Flock(int(f.Fd()), syscall.LOCK_EX|syscall.LOCK_NB)
 		if err != nil {
 			log.Fatalf("flock pidfile (%s): %s", pidfile, err)
 		}
@@ -355,7 +359,7 @@ func main() {
 			log.Println("Running without a PermissionSecret. Block locators " +
 				"returned by this server will not be signed, and will be rejected " +
 				"by a server that enforces permissions.")
-			log.Println("To fix this, use the -permission-key-file flag " +
+			log.Println("To fix this, use the -blob-signing-key-file flag " +
 				"to specify the file containing the permission key.")
 		}
 	}