11714: Set CgroupParent under Resources because setting Cgroup in HostConfig

[arvados.git] / tools / keep-rsync / keep-rsync.go

diff --git a/tools/keep-rsync/keep-rsync.go b/tools/keep-rsync/keep-rsync.go
index 912238c3fb50359469a3406059c3b9502d758a49..c6e7665caa2a312c327b8a603159a7da07941450 100644 (file)
--- a/tools/keep-rsync/keep-rsync.go
+++ b/tools/keep-rsync/keep-rsync.go
@@ -60,8 +60,8 @@ func doMain() error {
                "",
                "Index prefix")
 
                "",
                "Index prefix")
 

-       srcBlobSignatureTTL := flags.Duration(
-               "blob-signing-ttl",
+       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.")
 
                0,
                "Lifetime of blob permission signatures on source keepservers. If not provided, this will be retrieved from the API server's discovery document.")
 


@@ -79,18 +79,18 @@ func doMain() error {
        }
 
        // setup src and dst keepclients
        }
 
        // setup src and dst keepclients

-       kcSrc, err := setupKeepClient(srcConfig, *srcKeepServicesJSON, false, 0, *srcBlobSignatureTTL)
+       kcSrc, srcBlobSignatureTTL, err := setupKeepClient(srcConfig, *srcKeepServicesJSON, false, 0, *srcBlobSignatureTTLFlag)

        if err != nil {
                return fmt.Errorf("Error configuring src keepclient: %s", err.Error())
        }
 
        if err != nil {
                return fmt.Errorf("Error configuring src keepclient: %s", err.Error())
        }
 

-       kcDst, err := setupKeepClient(dstConfig, *dstKeepServicesJSON, true, *replications, 0)
+       kcDst, _, err := setupKeepClient(dstConfig, *dstKeepServicesJSON, true, *replications, 0)

        if err != nil {
                return fmt.Errorf("Error configuring dst keepclient: %s", err.Error())
        }
 
        // Copy blocks not found in dst from src
        if err != nil {
                return fmt.Errorf("Error configuring dst keepclient: %s", err.Error())
        }
 
        // Copy blocks not found in dst from src

-       err = performKeepRsync(kcSrc, kcDst, *srcBlobSignatureTTL, srcBlobSigningKey, *prefix)
+       err = performKeepRsync(kcSrc, kcDst, srcBlobSignatureTTL, srcBlobSigningKey, *prefix)

        if err != nil {
                return fmt.Errorf("Error while syncing data: %s", err.Error())
        }
        if err != nil {
                return fmt.Errorf("Error while syncing data: %s", err.Error())
        }


@@ -160,7 +160,7 @@ func readConfigFromFile(filename string) (config apiConfig, blobSigningKey strin
 }
 
 // setup keepclient using the config provided
 }
 
 // setup keepclient using the config provided

-func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, replications int, srcBlobSignatureTTL time.Duration) (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,
        arv := arvadosclient.ArvadosClient{
                ApiToken:    config.APIToken,
                ApiServer:   config.APIHost,


@@ -174,13 +174,13 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl
        if keepServicesJSON == "" {
                kc, err = keepclient.MakeKeepClient(&arv)
                if err != nil {
        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 {
                }
        } else {
                kc = keepclient.New(&arv)
                err = kc.LoadKeepServicesFromJSON(keepServicesJSON)
                if err != nil {

-                       return kc, err
+                       return kc, 0, err

                }
        }
 
                }
        }
 


@@ -191,7 +191,7 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl
                        if err == nil {
                                replications = int(value.(float64))
                        } else {
                        if err == nil {
                                replications = int(value.(float64))
                        } else {

-                               return nil, err
+                               return nil, 0, err

                        }
                }
 
                        }
                }
 


@@ -199,16 +199,17 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl
        }
 
        // If srcBlobSignatureTTL is not provided, get it from API server discovery doc
        }
 
        // 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 {
        if !isDst && srcBlobSignatureTTL == 0 {
                value, err := arv.Discovery("blobSignatureTtl")
                if err == nil {

-                       srcBlobSignatureTTL = time.Duration(int(value.(float64))) * time.Second
+                       blobSignatureTTL = time.Duration(int(value.(float64))) * time.Second

                } else {
                } else {

-                       return nil, err
+                       return nil, 0, err

                }
        }
 
                }
        }
 

-       return kc, nil
+       return kc, blobSignatureTTL, nil

 }
 
 // Get unique block locators from src and dst
 }
 
 // Get unique block locators from src and dst