X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3da10f0c0f5a0c0c91d49436a5995c890b03d228..e2197875b3fa58b235268a86170fec582c1a7f59:/services/keepstore/keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 2528f6d6a6..96a887fecb 100644
--- 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
 
-// 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"
 
@@ -159,8 +155,9 @@ func main() {
 		&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",
@@ -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 != "" {
@@ -302,7 +300,6 @@ func main() {
 	keepClient := &keepclient.KeepClient{
 		Arvados:       nil,
 		Want_replicas: 1,
-		Using_proxy:   true,
 		Client:        &http.Client{},
 	}