wspr should not have a seperate retryTimeout.
Fixes veyron/release-issues/#1503
MultiPart: 1/2
Change-Id: Id04f4cfd76bce954d6d825e9f869a242debb07a4
diff --git a/services/wsprd/app/app.go b/services/wsprd/app/app.go
index 3135d13..2656315 100644
--- a/services/wsprd/app/app.go
+++ b/services/wsprd/app/app.go
@@ -33,9 +33,6 @@
const (
// pkgPath is the prefix os errors in this package.
pkgPath = "v.io/x/ref/services/wsprd/app"
-
- // defaultRetryTimeout is the default RPC timeout.
- defaultRetryTimeout = 2 * time.Second
)
// Errors
@@ -204,25 +201,17 @@
func (c *Controller) callOpts(opts []RpcCallOption) ([]rpc.CallOpt, error) {
var callOpts []rpc.CallOpt
- retryTimeoutSet := false
-
for _, opt := range opts {
switch v := opt.(type) {
case RpcCallOptionAllowedServersPolicy:
callOpts = append(callOpts, options.AllowedServersPolicy(v.Value))
case RpcCallOptionRetryTimeout:
- retryTimeoutSet = true
callOpts = append(callOpts, options.RetryTimeout(v.Value))
default:
return nil, fmt.Errorf("Unknown RpcCallOption type %T", v)
}
}
- // If no RetryTimeout was provided, use the default.
- if !retryTimeoutSet {
- callOpts = append(callOpts, options.RetryTimeout(defaultRetryTimeout))
- }
-
return callOpts, nil
}
@@ -685,8 +674,7 @@
// getSignature uses the signature manager to get and cache the signature of a remote server.
func (c *Controller) getSignature(ctx *context.T, name string) ([]signature.Interface, error) {
- retryTimeoutOpt := options.RetryTimeout(defaultRetryTimeout)
- return c.signatureManager.Signature(ctx, name, retryTimeoutOpt)
+ return c.signatureManager.Signature(ctx, name)
}
// Signature uses the signature manager to get and cache the signature of a remote server.
