X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/07b382c82d7d834e801cf9dc85e2ed5ffcd7cd91..f5617be935a121dc339effcaafebb569109ebe5b:/tools/keep-rsync/keep-rsync.go diff --git a/tools/keep-rsync/keep-rsync.go b/tools/keep-rsync/keep-rsync.go index ec6bf74983..c6e7665caa 100644 --- a/tools/keep-rsync/keep-rsync.go +++ b/tools/keep-rsync/keep-rsync.go @@ -18,81 +18,84 @@ import ( ) func main() { - var srcConfigFile, dstConfigFile, srcKeepServicesJSON, dstKeepServicesJSON, prefix string - var replications int - var srcBlobSigningKey string + err := doMain() + if err != nil { + log.Fatalf("%v", err) + } +} + +func doMain() error { + flags := flag.NewFlagSet("keep-rsync", flag.ExitOnError) - flag.StringVar( - &srcConfigFile, - "src-config-file", + srcConfigFile := flags.String( + "src", "", - "Source configuration filename with full path that contains "+ - "an ARVADOS_API_TOKEN which is a valid datamanager token recognized by the source keep servers, "+ - "ARVADOS_API_HOST, ARVADOS_API_HOST_INSECURE, ARVADOS_EXTERNAL_CLIENT and ARVADOS_BLOB_SIGNING_KEY.") + "Source configuration filename. May be either a pathname to a config file, or (for example) 'foo' as shorthand for $HOME/.config/arvados/foo.conf file. This file is expected to specify the values for ARVADOS_API_TOKEN, ARVADOS_API_HOST, ARVADOS_API_HOST_INSECURE, and ARVADOS_BLOB_SIGNING_KEY for the source.") - flag.StringVar( - &dstConfigFile, - "dst-config-file", + dstConfigFile := flags.String( + "dst", "", - "Destination configuration filename with full path that contains "+ - "an ARVADOS_API_TOKEN which is a valid datamanager token recognized by the destination keep servers, "+ - "ARVADOS_API_HOST, ARVADOS_API_HOST_INSECURE, ARVADOS_EXTERNAL_CLIENT and ARVADOS_BLOB_SIGNING_KEY.") + "Destination configuration filename. May be either a pathname to a config file, or (for example) 'foo' as shorthand for $HOME/.config/arvados/foo.conf file. This file is expected to specify the values for ARVADOS_API_TOKEN, ARVADOS_API_HOST, and ARVADOS_API_HOST_INSECURE for the destination.") - flag.StringVar( - &srcKeepServicesJSON, + srcKeepServicesJSON := flags.String( "src-keep-services-json", "", "An optional list of available source keepservices. "+ "If not provided, this list is obtained from api server configured in src-config-file.") - flag.StringVar( - &dstKeepServicesJSON, + dstKeepServicesJSON := flags.String( "dst-keep-services-json", "", "An optional list of available destination keepservices. "+ "If not provided, this list is obtained from api server configured in dst-config-file.") - flag.IntVar( - &replications, + replications := flags.Int( "replications", 0, "Number of replications to write to the destination. If replications not specified, "+ "default replication level configured on destination server will be used.") - flag.StringVar( - &prefix, + prefix := flags.String( "prefix", "", "Index prefix") - flag.Parse() + srcBlobSignatureTTLFlag := flags.Duration( + "src-blob-signature-ttl", + 0, + "Lifetime of blob permission signatures on source keepservers. If not provided, this will be retrieved from the API server's discovery document.") + + // Parse args; omit the first arg which is the command name + flags.Parse(os.Args[1:]) - srcConfig, srcBlobSigningKey, err := loadConfig(srcConfigFile) + srcConfig, srcBlobSigningKey, err := loadConfig(*srcConfigFile) if err != nil { - log.Fatalf("Error loading src configuration from file: %s", err.Error()) + return fmt.Errorf("Error loading src configuration from file: %s", err.Error()) } - dstConfig, _, err := loadConfig(dstConfigFile) + dstConfig, _, err := loadConfig(*dstConfigFile) if err != nil { - log.Fatalf("Error loading dst configuration from file: %s", err.Error()) + return fmt.Errorf("Error loading dst configuration from file: %s", err.Error()) } // setup src and dst keepclients - kcSrc, err := setupKeepClient(srcConfig, srcKeepServicesJSON, false, 0) + kcSrc, srcBlobSignatureTTL, err := setupKeepClient(srcConfig, *srcKeepServicesJSON, false, 0, *srcBlobSignatureTTLFlag) if err != nil { - log.Fatalf("Error configuring src keepclient: %s", err.Error()) + return fmt.Errorf("Error configuring src keepclient: %s", err.Error()) } - kcDst, err := setupKeepClient(dstConfig, dstKeepServicesJSON, true, replications) + kcDst, _, err := setupKeepClient(dstConfig, *dstKeepServicesJSON, true, *replications, 0) if err != nil { - log.Fatalf("Error configuring dst keepclient: %s", err.Error()) + return fmt.Errorf("Error configuring dst keepclient: %s", err.Error()) } // Copy blocks not found in dst from src - err = performKeepRsync(kcSrc, kcDst, srcBlobSigningKey, prefix) + err = performKeepRsync(kcSrc, kcDst, srcBlobSignatureTTL, srcBlobSigningKey, *prefix) if err != nil { - log.Fatalf("Error while syncing data: %s", err.Error()) + return fmt.Errorf("Error while syncing data: %s", err.Error()) } + + return nil } type apiConfig struct { @@ -121,7 +124,7 @@ var matchTrue = regexp.MustCompile("^(?i:1|yes|true)$") // Read config from file func readConfigFromFile(filename string) (config apiConfig, blobSigningKey string, err error) { if !strings.Contains(filename, "/") { - filename = os.Getenv("HOME") + "/.config/arvados/" + filename + filename = os.Getenv("HOME") + "/.config/arvados/" + filename + ".conf" } content, err := ioutil.ReadFile(filename) @@ -157,7 +160,7 @@ func readConfigFromFile(filename string) (config apiConfig, blobSigningKey strin } // setup keepclient using the config provided -func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, replications int) (kc *keepclient.KeepClient, err error) { +func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, replications int, srcBlobSignatureTTL time.Duration) (kc *keepclient.KeepClient, blobSignatureTTL time.Duration, err error) { arv := arvadosclient.ArvadosClient{ ApiToken: config.APIToken, ApiServer: config.APIHost, @@ -171,13 +174,13 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl if keepServicesJSON == "" { kc, err = keepclient.MakeKeepClient(&arv) if err != nil { - return nil, err + return nil, 0, err } } else { kc = keepclient.New(&arv) err = kc.LoadKeepServicesFromJSON(keepServicesJSON) if err != nil { - return kc, err + return kc, 0, err } } @@ -188,19 +191,30 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl if err == nil { replications = int(value.(float64)) } else { - return nil, err + return nil, 0, err } } kc.Want_replicas = replications } - return kc, nil + // If srcBlobSignatureTTL is not provided, get it from API server discovery doc + blobSignatureTTL = srcBlobSignatureTTL + if !isDst && srcBlobSignatureTTL == 0 { + value, err := arv.Discovery("blobSignatureTtl") + if err == nil { + blobSignatureTTL = time.Duration(int(value.(float64))) * time.Second + } else { + return nil, 0, err + } + } + + return kc, blobSignatureTTL, nil } // Get unique block locators from src and dst // Copy any blocks missing in dst -func performKeepRsync(kcSrc, kcDst *keepclient.KeepClient, blobSigningKey, prefix string) error { +func performKeepRsync(kcSrc, kcDst *keepclient.KeepClient, srcBlobSignatureTTL time.Duration, blobSigningKey, prefix string) error { // Get unique locators from src srcIndex, err := getUniqueLocators(kcSrc, prefix) if err != nil { @@ -217,7 +231,10 @@ func performKeepRsync(kcSrc, kcDst *keepclient.KeepClient, blobSigningKey, prefi toBeCopied := getMissingLocators(srcIndex, dstIndex) // Copy each missing block to dst - err = copyBlocksToDst(toBeCopied, kcSrc, kcDst, blobSigningKey) + log.Printf("Before keep-rsync, there are %d blocks in src and %d blocks in dst. Start copying %d blocks from src not found in dst.", + len(srcIndex), len(dstIndex), len(toBeCopied)) + + err = copyBlocksToDst(toBeCopied, kcSrc, kcDst, srcBlobSignatureTTL, blobSigningKey) return err } @@ -253,36 +270,35 @@ func getMissingLocators(srcLocators, dstLocators map[string]bool) []string { } // Copy blocks from src to dst; only those that are missing in dst are copied -func copyBlocksToDst(toBeCopied []string, kcSrc, kcDst *keepclient.KeepClient, blobSigningKey string) error { - done := 0 +func copyBlocksToDst(toBeCopied []string, kcSrc, kcDst *keepclient.KeepClient, srcBlobSignatureTTL time.Duration, blobSigningKey string) error { total := len(toBeCopied) - for _, locator := range toBeCopied { - log.Printf("Getting block %d of %d: %v", done+1, total, locator) + startedAt := time.Now() + for done, locator := range toBeCopied { + if done == 0 { + log.Printf("Copying data block %d of %d (%.2f%% done): %v", done+1, total, + float64(done)/float64(total)*100, locator) + } else { + timePerBlock := time.Since(startedAt) / time.Duration(done) + log.Printf("Copying data block %d of %d (%.2f%% done, %v est. time remaining): %v", done+1, total, + float64(done)/float64(total)*100, timePerBlock*time.Duration(total-done), locator) + } getLocator := locator expiresAt := time.Now().AddDate(0, 0, 1) if blobSigningKey != "" { - getLocator = keepclient.SignLocator(getLocator, kcSrc.Arvados.ApiToken, expiresAt, []byte(blobSigningKey)) + getLocator = keepclient.SignLocator(getLocator, kcSrc.Arvados.ApiToken, expiresAt, srcBlobSignatureTTL, []byte(blobSigningKey)) } - reader, _, _, err := kcSrc.Get(getLocator) + reader, len, _, err := kcSrc.Get(getLocator) if err != nil { return fmt.Errorf("Error getting block: %v %v", locator, err) } - data, err := ioutil.ReadAll(reader) - if err != nil { - return fmt.Errorf("Error reading block data: %v %v", locator, err) - } - log.Printf("Writing block%d of %d: %v", locator) - _, _, err = kcDst.PutB(data) + _, _, err = kcDst.PutHR(getLocator[:32], reader, len) if err != nil { - return fmt.Errorf("Error putting block data: %v %v", locator, err) + return fmt.Errorf("Error copying data block: %v %v", locator, err) } - - done++ - log.Printf("%.2f%% done", float64(done)/float64(total)*100) } log.Printf("Successfully copied to destination %d blocks.", total)