X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0025e3e72aea2388491a801e7bd512ab72fff16a..34227825eec21d3a393d4467b7ed768b52ac32b1:/services/keepstore/keepstore.go diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go index 593035717b..3e360e1799 100644 --- a/services/keepstore/keepstore.go +++ b/services/keepstore/keepstore.go @@ -14,6 +14,7 @@ import ( "os" "os/signal" "strings" + "sync" "syscall" "time" ) @@ -26,45 +27,45 @@ import ( // Default TCP address on which to listen for requests. // Initialized by the --listen flag. -const DEFAULT_ADDR = ":25107" +const DefaultAddr = ":25107" // A Keep "block" is 64MB. -const BLOCKSIZE = 64 * 1024 * 1024 +const BlockSize = 64 * 1024 * 1024 -// A Keep volume must have at least MIN_FREE_KILOBYTES available +// A Keep volume must have at least MinFreeKilobytes available // in order to permit writes. -const MIN_FREE_KILOBYTES = BLOCKSIZE / 1024 +const MinFreeKilobytes = BlockSize / 1024 // Until #6221 is resolved, never_delete must be true. -// However, allow it to be false in testing. -const TEST_DATA_MANAGER_TOKEN = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h" +// However, allow it to be false in testing with TestDataManagerToken +const TestDataManagerToken = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h" -var PROC_MOUNTS = "/proc/mounts" +// ProcMounts /proc/mounts +var ProcMounts = "/proc/mounts" -// enforce_permissions controls whether permission signatures +// enforcePermissions controls whether permission signatures // should be enforced (affecting GET and DELETE requests). // Initialized by the -enforce-permissions flag. -var enforce_permissions bool +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 -// ========== -// Error types. +// KeepError types. // type KeepError struct { HTTPCode int @@ -136,10 +137,14 @@ func (vs *volumeSet) Set(value string) error { if _, err := os.Stat(value); err != nil { return err } + var locker sync.Locker + if flagSerializeIO { + locker = &sync.Mutex{} + } *vs = append(*vs, &UnixVolume{ - root: value, - serialize: flagSerializeIO, - readonly: flagReadonly, + root: value, + locker: locker, + readonly: flagReadonly, }) return nil } @@ -160,15 +165,15 @@ func (vs *volumeSet) String() string { // other than "/". It returns the number of volumes added. func (vs *volumeSet) Discover() int { added := 0 - f, err := os.Open(PROC_MOUNTS) + f, err := os.Open(ProcMounts) if err != nil { - log.Fatalf("opening %s: %s", PROC_MOUNTS, err) + 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", PROC_MOUNTS, err) + log.Fatalf("reading %s: %s", ProcMounts, err) } dev, mount := args[0], args[1] if mount == "/" { @@ -210,53 +215,53 @@ 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 + volumes volumeSet + 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 "+ "requests or GET /index requests must carry this token.") flag.BoolVar( - &enforce_permissions, + &enforcePermissions, "enforce-permissions", false, "Enforce permission signatures on requests.") flag.StringVar( &listen, "listen", - DEFAULT_ADDR, + 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.") 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. "+ @@ -288,14 +293,14 @@ func main() { &maxBuffers, "max-buffers", maxBuffers, - fmt.Sprintf("Maximum RAM to use for data buffers, given in multiples of block size (%d MiB). When this limit is reached, HTTP requests requiring buffers (like GET and PUT) will wait for buffer space to be released.", BLOCKSIZE>>20)) + fmt.Sprintf("Maximum RAM to use for data buffers, given in multiples of block size (%d MiB). When this limit is reached, HTTP requests requiring buffers (like GET and PUT) will wait for buffer space to be released.", BlockSize>>20)) flag.Parse() if maxBuffers < 0 { log.Fatal("-max-buffers must be greater than zero.") } - bufs = newBufferPool(maxBuffers, BLOCKSIZE) + bufs = newBufferPool(maxBuffers, BlockSize) if pidfile != "" { f, err := os.OpenFile(pidfile, os.O_RDWR|os.O_CREATE, 0777) @@ -335,30 +340,30 @@ 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 never_delete != true && data_manager_token != TEST_DATA_MANAGER_TOKEN { + if neverDelete != true && dataManagerToken != TestDataManagerToken { log.Fatal("never_delete must be true, see #6221") } - if blob_signing_key_file != "" { - if buf, err := ioutil.ReadFile(blob_signing_key_file); err == nil { + 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 enforce_permissions { + if enforcePermissions { log.Fatal("-enforce-permissions requires a permission key") } else { log.Println("Running without a PermissionSecret. Block locators " +