X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0041395d00cda5ddeb488dae2d9fae7b6b437c9d..d01d6bdf901b49e8856e199a131fb263f98b370e:/services/keepstore/keepstore.go diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go index 9c84534a02..7525441aae 100644 --- a/services/keepstore/keepstore.go +++ b/services/keepstore/keepstore.go @@ -1,9 +1,7 @@ package main import ( - "bufio" "bytes" - "errors" "flag" "fmt" "git.curoverse.com/arvados.git/sdk/go/keepclient" @@ -14,7 +12,6 @@ import ( "os" "os/signal" "strings" - "sync" "syscall" "time" ) @@ -44,19 +41,19 @@ var ProcMounts = "/proc/mounts" // Initialized by the -enforce-permissions flag. var enforcePermissions bool -// blob_signature_ttl is the time duration for which new permission +// blobSignatureTTL is the time duration for which new permission // signatures (returned by PUT requests) will be valid. // Initialized by the -permission-ttl flag. -var blob_signature_ttl time.Duration +var blobSignatureTTL time.Duration -// data_manager_token represents the API token used by the +// dataManagerToken represents the API token used by the // Data Manager, and is required on certain privileged operations. // Initialized by the -data-manager-token-file flag. -var data_manager_token string +var dataManagerToken string -// never_delete can be used to prevent the DELETE handler from +// neverDelete can be used to prevent the DELETE handler from // actually deleting anything. -var never_delete = true +var neverDelete = true var maxBuffers = 128 var bufs *bufferPool @@ -110,95 +107,16 @@ var KeepVM VolumeManager var pullq *WorkQueue var trashq *WorkQueue +type volumeSet []Volume + var ( flagSerializeIO bool flagReadonly bool + volumes volumeSet ) -type volumeSet []Volume - -func (vs *volumeSet) Set(value string) error { - if dirs := strings.Split(value, ","); len(dirs) > 1 { - log.Print("DEPRECATED: using comma-separated volume list.") - for _, dir := range dirs { - if err := vs.Set(dir); err != nil { - return err - } - } - return nil - } - if len(value) == 0 || value[0] != '/' { - return errors.New("Invalid volume: must begin with '/'.") - } - if _, err := os.Stat(value); err != nil { - return err - } - var locker sync.Locker - if flagSerializeIO { - locker = &sync.Mutex{} - } - *vs = append(*vs, &UnixVolume{ - root: value, - locker: locker, - readonly: flagReadonly, - }) - return nil -} - func (vs *volumeSet) String() string { - s := "[" - for i, v := range *vs { - if i > 0 { - s = s + " " - } - s = s + v.String() - } - return s + "]" -} - -// Discover adds a volume for every directory named "keep" that is -// located at the top level of a device- or tmpfs-backed mount point -// other than "/". It returns the number of volumes added. -func (vs *volumeSet) Discover() int { - added := 0 - f, err := os.Open(ProcMounts) - if err != nil { - log.Fatalf("opening %s: %s", ProcMounts, err) - } - scanner := bufio.NewScanner(f) - for scanner.Scan() { - args := strings.Fields(scanner.Text()) - if err := scanner.Err(); err != nil { - log.Fatalf("reading %s: %s", ProcMounts, err) - } - dev, mount := args[0], args[1] - if mount == "/" { - continue - } - if dev != "tmpfs" && !strings.HasPrefix(dev, "/dev/") { - continue - } - keepdir := mount + "/keep" - if st, err := os.Stat(keepdir); err != nil || !st.IsDir() { - continue - } - // Set the -readonly flag (but only for this volume) - // if the filesystem is mounted readonly. - flagReadonlyWas := flagReadonly - for _, fsopt := range strings.Split(args[3], ",") { - if fsopt == "ro" { - flagReadonly = true - break - } - if fsopt == "rw" { - break - } - } - vs.Set(keepdir) - flagReadonly = flagReadonlyWas - added++ - } - return added + return fmt.Sprintf("%+v", (*vs)[:]) } // TODO(twp): continue moving as much code as possible out of main @@ -211,15 +129,14 @@ func main() { defer log.Println("keepstore exiting, pid", os.Getpid()) var ( - data_manager_token_file string - listen string - blob_signing_key_file string - permission_ttl_sec int - volumes volumeSet - pidfile string + dataManagerTokenFile string + listen string + blobSigningKeyFile string + permissionTTLSec int + pidfile string ) flag.StringVar( - &data_manager_token_file, + &dataManagerTokenFile, "data-manager-token-file", "", "File with the API token used by the Data Manager. All DELETE "+ @@ -235,29 +152,30 @@ func main() { DefaultAddr, "Listening address, in the form \"host:port\". e.g., 10.0.1.24:8000. Omit the host part to listen on all interfaces.") flag.BoolVar( - &never_delete, + &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( - &blob_signing_key_file, + &blobSigningKeyFile, "permission-key-file", "", "Synonym for -blob-signing-key-file.") flag.StringVar( - &blob_signing_key_file, + &blobSigningKeyFile, "blob-signing-key-file", "", "File containing the secret key for generating and verifying "+ "blob permission signatures.") flag.IntVar( - &permission_ttl_sec, + &permissionTTLSec, "permission-ttl", 0, "Synonym for -blob-signature-ttl.") flag.IntVar( - &permission_ttl_sec, + &permissionTTLSec, "blob-signature-ttl", int(time.Duration(2*7*24*time.Hour).Seconds()), "Lifetime of blob permission signatures. "+ @@ -272,14 +190,6 @@ func main() { "readonly", false, "Do not write, delete, or touch anything on the following volumes.") - flag.Var( - &volumes, - "volumes", - "Deprecated synonym for -volume.") - flag.Var( - &volumes, - "volume", - "Local storage directory. Can be given more than once to add multiple directories. If none are supplied, the default is to use all directories named \"keep\" that exist in the top level directory of a mount point at startup time. Can be a comma-separated list, but this is deprecated: use multiple -volume arguments instead.") flag.StringVar( &pidfile, "pid", @@ -293,10 +203,6 @@ 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.") } @@ -328,7 +234,7 @@ func main() { } if len(volumes) == 0 { - if volumes.Discover() == 0 { + if (&unixVolumeAdder{&volumes}).Discover() == 0 { log.Fatal("No volumes found.") } } @@ -340,22 +246,28 @@ func main() { // Initialize data manager token and permission key. // If these tokens are specified but cannot be read, // raise a fatal error. - if data_manager_token_file != "" { - if buf, err := ioutil.ReadFile(data_manager_token_file); err == nil { - data_manager_token = strings.TrimSpace(string(buf)) + if dataManagerTokenFile != "" { + if buf, err := ioutil.ReadFile(dataManagerTokenFile); err == nil { + dataManagerToken = strings.TrimSpace(string(buf)) } else { log.Fatalf("reading data manager token: %s\n", err) } } - if blob_signing_key_file != "" { - if buf, err := ioutil.ReadFile(blob_signing_key_file); err == nil { + + 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 buf, err := ioutil.ReadFile(blobSigningKeyFile); err == nil { PermissionSecret = bytes.TrimSpace(buf) } else { log.Fatalf("reading permission key: %s\n", err) } } - blob_signature_ttl = time.Duration(permission_ttl_sec) * time.Second + blobSignatureTTL = time.Duration(permissionTTLSec) * time.Second if PermissionSecret == nil { if enforcePermissions {