e4c20ec190
Fix an issue where rpc_hold_timeout was being used as the timeout for non-blocking queries. Users should be able to tune read timeouts without fiddling with rpc_hold_timeout. A new configuration `rpc_read_timeout` is created. Refactor some implementation from the original PR 11500 to remove the misleading linkage between RPCInfo's timeout (used to retry in case of certain modes of failures) and the client RPC timeouts.
186 lines
5.6 KiB
Go
186 lines
5.6 KiB
Go
package pbcommon
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
)
|
|
|
|
// IsRead is always true for QueryOption
|
|
func (q *QueryOptions) IsRead() bool {
|
|
return true
|
|
}
|
|
|
|
// AllowStaleRead returns whether a stale read should be allowed
|
|
func (q *QueryOptions) AllowStaleRead() bool {
|
|
return q.AllowStale
|
|
}
|
|
|
|
func (q *QueryOptions) TokenSecret() string {
|
|
return q.Token
|
|
}
|
|
|
|
func (q *QueryOptions) SetTokenSecret(s string) {
|
|
q.Token = s
|
|
}
|
|
|
|
// SetToken is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetToken(token string) {
|
|
q.Token = token
|
|
}
|
|
|
|
// SetMinQueryIndex is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMinQueryIndex(minQueryIndex uint64) {
|
|
q.MinQueryIndex = minQueryIndex
|
|
}
|
|
|
|
// SetMaxQueryTime is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMaxQueryTime(maxQueryTime time.Duration) {
|
|
q.MaxQueryTime = structs.DurationToProto(maxQueryTime)
|
|
}
|
|
|
|
// SetAllowStale is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetAllowStale(allowStale bool) {
|
|
q.AllowStale = allowStale
|
|
}
|
|
|
|
// SetRequireConsistent is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetRequireConsistent(requireConsistent bool) {
|
|
q.RequireConsistent = requireConsistent
|
|
}
|
|
|
|
// SetUseCache is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetUseCache(useCache bool) {
|
|
q.UseCache = useCache
|
|
}
|
|
|
|
// SetMaxStaleDuration is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMaxStaleDuration(maxStaleDuration time.Duration) {
|
|
q.MaxStaleDuration = structs.DurationToProto(maxStaleDuration)
|
|
}
|
|
|
|
// SetMaxAge is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMaxAge(maxAge time.Duration) {
|
|
q.MaxAge = structs.DurationToProto(maxAge)
|
|
}
|
|
|
|
// SetMustRevalidate is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMustRevalidate(mustRevalidate bool) {
|
|
q.MustRevalidate = mustRevalidate
|
|
}
|
|
|
|
// SetStaleIfError is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetStaleIfError(staleIfError time.Duration) {
|
|
q.StaleIfError = structs.DurationToProto(staleIfError)
|
|
}
|
|
|
|
func (q *QueryOptions) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
|
|
// In addition to BlockingTimeout, allow for an additional rpcHoldTimeout buffer
|
|
// in case we need to wait for a leader election.
|
|
return time.Since(start) > rpcHoldTimeout+q.BlockingTimeout(maxQueryTime, defaultQueryTime), nil
|
|
}
|
|
|
|
// BlockingTimeout implements pool.BlockableQuery
|
|
func (q *QueryOptions) BlockingTimeout(maxQueryTime, defaultQueryTime time.Duration) time.Duration {
|
|
maxTime := structs.DurationFromProto(q.MaxQueryTime)
|
|
o := structs.QueryOptions{
|
|
MaxQueryTime: maxTime,
|
|
MinQueryIndex: q.MinQueryIndex,
|
|
}
|
|
return o.BlockingTimeout(maxQueryTime, defaultQueryTime)
|
|
}
|
|
|
|
// SetFilter is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetFilter(filter string) {
|
|
q.Filter = filter
|
|
}
|
|
|
|
// WriteRequest only applies to writes, always false
|
|
//
|
|
// IsRead implements structs.RPCInfo
|
|
func (w *WriteRequest) IsRead() bool {
|
|
return false
|
|
}
|
|
|
|
// SetTokenSecret implements structs.RPCInfo
|
|
func (w *WriteRequest) TokenSecret() string {
|
|
return w.Token
|
|
}
|
|
|
|
// SetTokenSecret implements structs.RPCInfo
|
|
func (w *WriteRequest) SetTokenSecret(s string) {
|
|
w.Token = s
|
|
}
|
|
|
|
// AllowStaleRead returns whether a stale read should be allowed
|
|
//
|
|
// AllowStaleRead implements structs.RPCInfo
|
|
func (w *WriteRequest) AllowStaleRead() bool {
|
|
return false
|
|
}
|
|
|
|
// HasTimedOut implements structs.RPCInfo
|
|
func (w *WriteRequest) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
|
|
return time.Since(start) > rpcHoldTimeout, nil
|
|
}
|
|
|
|
// IsRead implements structs.RPCInfo
|
|
func (r *ReadRequest) IsRead() bool {
|
|
return true
|
|
}
|
|
|
|
// AllowStaleRead implements structs.RPCInfo
|
|
func (r *ReadRequest) AllowStaleRead() bool {
|
|
// TODO(partitions): plumb this?
|
|
return false
|
|
}
|
|
|
|
// TokenSecret implements structs.RPCInfo
|
|
func (r *ReadRequest) TokenSecret() string {
|
|
return r.Token
|
|
}
|
|
|
|
// SetTokenSecret implements structs.RPCInfo
|
|
func (r *ReadRequest) SetTokenSecret(token string) {
|
|
r.Token = token
|
|
}
|
|
|
|
// HasTimedOut implements structs.RPCInfo
|
|
func (r *ReadRequest) HasTimedOut(start time.Time, rpcHoldTimeout, _, _ time.Duration) (bool, error) {
|
|
return time.Since(start) > rpcHoldTimeout, nil
|
|
}
|
|
|
|
// RequestDatacenter implements structs.RPCInfo
|
|
func (td *TargetDatacenter) RequestDatacenter() string {
|
|
return td.Datacenter
|
|
}
|
|
|
|
// SetLastContact is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetLastContact(lastContact time.Duration) {
|
|
q.LastContact = structs.DurationToProto(lastContact)
|
|
}
|
|
|
|
// SetKnownLeader is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetKnownLeader(knownLeader bool) {
|
|
q.KnownLeader = knownLeader
|
|
}
|
|
|
|
// SetIndex is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetIndex(index uint64) {
|
|
q.Index = index
|
|
}
|
|
|
|
// SetConsistencyLevel is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetConsistencyLevel(consistencyLevel string) {
|
|
q.ConsistencyLevel = consistencyLevel
|
|
}
|
|
|
|
func (q *QueryMeta) GetBackend() structs.QueryBackend {
|
|
return structs.QueryBackend(0)
|
|
}
|
|
|
|
// SetResultsFilteredByACLs is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetResultsFilteredByACLs(v bool) {
|
|
q.ResultsFilteredByACLs = v
|
|
}
|