projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4875: Merge branch 'master' into 4875-keepclient-test-race
[arvados.git]
/
services
/
keepproxy
/
keepproxy.go
diff --git
a/services/keepproxy/keepproxy.go
b/services/keepproxy/keepproxy.go
index 38376c9f7ffa69f8c42b13c29d574cfa14ddaffc..ea14c6ca48e89e59c5bc414dedfaf87e1ac0f782 100644
(file)
--- a/
services/keepproxy/keepproxy.go
+++ b/
services/keepproxy/keepproxy.go
@@
-30,7
+30,7
@@
func main() {
no_get bool
no_put bool
default_replicas int
no_get bool
no_put bool
default_replicas int
- timeout int
+ timeout int
64
pidfile string
)
pidfile string
)
@@
-62,11
+62,11
@@
func main() {
2,
"Default number of replicas to write if not specified by the client.")
2,
"Default number of replicas to write if not specified by the client.")
- flagset.IntVar(
+ flagset.Int
64
Var(
&timeout,
"timeout",
&timeout,
"timeout",
-
20
,
- "Timeout on requests to internal Keep services")
+
15
,
+ "Timeout on requests to internal Keep services
(default 15 seconds)
")
flagset.StringVar(
&pidfile,
flagset.StringVar(
&pidfile,
@@
-97,7
+97,8
@@
func main() {
}
kc.Want_replicas = default_replicas
}
kc.Want_replicas = default_replicas
- kc.Client.Timeout = 20 * time.Second
+
+ kc.Client.Timeout = time.Duration(timeout) * time.Second
listener, err = net.Listen("tcp", listen)
if err != nil {
listener, err = net.Listen("tcp", listen)
if err != nil {
@@
-377,7
+378,7
@@
func (this PutBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques
log.Printf("%s: %s %s Content-Length %v", GetRemoteAddress(req), req.Method, hash, contentLength)
log.Printf("%s: %s %s Content-Length %v", GetRemoteAddress(req), req.Method, hash, contentLength)
- if contentLength <
1
{
+ if contentLength <
0
{
http.Error(resp, "Must include Content-Length header", http.StatusLengthRequired)
return
}
http.Error(resp, "Must include Content-Length header", http.StatusLengthRequired)
return
}