projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11767-squeue-reasons' refs #11767
[arvados.git]
/
tools
/
keep-block-check
/
keep-block-check.go
diff --git
a/tools/keep-block-check/keep-block-check.go
b/tools/keep-block-check/keep-block-check.go
index ed546f0104db8068fa7d7847cc9b9f2fb718f638..6cf11a728075c60990c1b049c0fb916cea5cd5d5 100644
(file)
--- a/
tools/keep-block-check/keep-block-check.go
+++ b/
tools/keep-block-check/keep-block-check.go
@@
-48,10
+48,10
@@
func doMain(args []string) error {
"",
"Block hash prefix. When a prefix is specified, only hashes listed in the file with this prefix will be checked.")
"",
"Block hash prefix. When a prefix is specified, only hashes listed in the file with this prefix will be checked.")
- blobSign
ingTTL
:= flags.Duration(
- "blob-sign
ing
-ttl",
- 0
*time.Second
,
- "Lifetime of blob permission signatures on the keepservers. If not provided, this will be retrieved from the
keepservers
.")
+ blobSign
atureTTLFlag
:= flags.Duration(
+ "blob-sign
ature
-ttl",
+ 0,
+ "Lifetime of blob permission signatures on the keepservers. If not provided, this will be retrieved from the
API server's discovery document
.")
verbose := flags.Bool(
"v",
verbose := flags.Bool(
"v",
@@
-73,12
+73,12
@@
func doMain(args []string) error {
}
// setup keepclient
}
// setup keepclient
- kc,
err := setupKeepClient(config, *keepServicesJSON, *blobSigningTTL
)
+ kc,
blobSignatureTTL, err := setupKeepClient(config, *keepServicesJSON, *blobSignatureTTLFlag
)
if err != nil {
return fmt.Errorf("Error configuring keepclient: %s", err.Error())
}
if err != nil {
return fmt.Errorf("Error configuring keepclient: %s", err.Error())
}
- return performKeepBlockCheck(kc,
*blobSigning
TTL, blobSigningKey, blockLocators, *verbose)
+ return performKeepBlockCheck(kc,
blobSignature
TTL, blobSigningKey, blockLocators, *verbose)
}
type apiConfig struct {
}
type apiConfig struct {
@@
-143,7
+143,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, blobSign
ingTTL time.Duration) (kc *keepclient.KeepClient
, err error) {
+func setupKeepClient(config apiConfig, keepServicesJSON string, blobSign
atureTTL time.Duration) (kc *keepclient.KeepClient, ttl time.Duration
, err error) {
arv := arvadosclient.ArvadosClient{
ApiToken: config.APIToken,
ApiServer: config.APIHost,
arv := arvadosclient.ArvadosClient{
ApiToken: config.APIToken,
ApiServer: config.APIHost,
@@
-167,13
+167,14
@@
func setupKeepClient(config apiConfig, keepServicesJSON string, blobSigningTTL t
}
}
}
}
- // Get if blobSigningTTL is not provided
- if blobSigningTTL == 0 {
+ // Get if blobSignatureTTL is not provided
+ ttl = blobSignatureTTL
+ if blobSignatureTTL == 0 {
value, err := arv.Discovery("blobSignatureTtl")
if err == nil {
value, err := arv.Discovery("blobSignatureTtl")
if err == nil {
-
blobSigningTTL
= time.Duration(int(value.(float64))) * time.Second
+
ttl
= time.Duration(int(value.(float64))) * time.Second
} else {
} else {
- return nil, err
+ return nil,
0,
err
}
}
}
}
@@
-206,7
+207,7
@@
func getBlockLocators(locatorFile, prefix string) (locators []string, err error)
}
// Get block headers from keep. Log any errors.
}
// Get block headers from keep. Log any errors.
-func performKeepBlockCheck(kc *keepclient.KeepClient, blobSign
ing
TTL time.Duration, blobSigningKey string, blockLocators []string, verbose bool) error {
+func performKeepBlockCheck(kc *keepclient.KeepClient, blobSign
ature
TTL time.Duration, blobSigningKey string, blockLocators []string, verbose bool) error {
totalBlocks := len(blockLocators)
notFoundBlocks := 0
current := 0
totalBlocks := len(blockLocators)
notFoundBlocks := 0
current := 0
@@
-218,7
+219,7
@@
func performKeepBlockCheck(kc *keepclient.KeepClient, blobSigningTTL time.Durati
getLocator := locator
if blobSigningKey != "" {
expiresAt := time.Now().AddDate(0, 0, 1)
getLocator := locator
if blobSigningKey != "" {
expiresAt := time.Now().AddDate(0, 0, 1)
- getLocator = keepclient.SignLocator(locator, kc.Arvados.ApiToken, expiresAt, blobSign
ing
TTL, []byte(blobSigningKey))
+ getLocator = keepclient.SignLocator(locator, kc.Arvados.ApiToken, expiresAt, blobSign
ature
TTL, []byte(blobSigningKey))
}
_, _, err := kc.Ask(getLocator)
}
_, _, err := kc.Ask(getLocator)