Skip to content

Commit fd13da4

Browse files
chenjie199234chenjie199234ofekshenawa
authored
fix missing fields in different Options (#2757)
* fix missing fields in different Options * fix missing fields in different Options --------- Co-authored-by: chenjie199234 <[email protected]> Co-authored-by: ofekshenawa <[email protected]>
1 parent e053f7e commit fd13da4

File tree

5 files changed

+35
-15
lines changed

5 files changed

+35
-15
lines changed

‎options.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ func setupConnParams(u *url.URL, o *Options) (*Options, error) {
461461
o.PoolTimeout = q.duration("pool_timeout")
462462
o.MinIdleConns = q.int("min_idle_conns")
463463
o.MaxIdleConns = q.int("max_idle_conns")
464+
o.MaxActiveConns = q.int("max_active_conns")
464465
if q.has("conn_max_idle_time") {
465466
o.ConnMaxIdleTime = q.duration("conn_max_idle_time")
466467
} else {

‎osscluster.go‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ type ClusterOptions struct {
8080
PoolTimeout time.Duration
8181
MinIdleConns int
8282
MaxIdleConns int
83+
MaxActiveConns int // applies per cluster node and not for the whole cluster
8384
ConnMaxIdleTime time.Duration
8485
ConnMaxLifetime time.Duration
8586

@@ -233,6 +234,8 @@ func setupClusterQueryParams(u *url.URL, o *ClusterOptions) (*ClusterOptions, er
233234
o.PoolFIFO = q.bool("pool_fifo")
234235
o.PoolSize = q.int("pool_size")
235236
o.MinIdleConns = q.int("min_idle_conns")
237+
o.MaxIdleConns = q.int("max_idle_conns")
238+
o.MaxActiveConns = q.int("max_active_conns")
236239
o.PoolTimeout = q.duration("pool_timeout")
237240
o.ConnMaxLifetime = q.duration("conn_max_lifetime")
238241
o.ConnMaxIdleTime = q.duration("conn_max_idle_time")
@@ -274,15 +277,17 @@ func (opt *ClusterOptions) clientOptions() *Options {
274277
MinRetryBackoff: opt.MinRetryBackoff,
275278
MaxRetryBackoff: opt.MaxRetryBackoff,
276279

277-
DialTimeout: opt.DialTimeout,
278-
ReadTimeout: opt.ReadTimeout,
279-
WriteTimeout: opt.WriteTimeout,
280+
DialTimeout: opt.DialTimeout,
281+
ReadTimeout: opt.ReadTimeout,
282+
WriteTimeout: opt.WriteTimeout,
283+
ContextTimeoutEnabled: opt.ContextTimeoutEnabled,
280284

281285
PoolFIFO: opt.PoolFIFO,
282286
PoolSize: opt.PoolSize,
283287
PoolTimeout: opt.PoolTimeout,
284288
MinIdleConns: opt.MinIdleConns,
285289
MaxIdleConns: opt.MaxIdleConns,
290+
MaxActiveConns: opt.MaxActiveConns,
286291
ConnMaxIdleTime: opt.ConnMaxIdleTime,
287292
ConnMaxLifetime: opt.ConnMaxLifetime,
288293
DisableIndentity: opt.DisableIndentity,

‎ring.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ type RingOptions struct {
7979
MinRetryBackoff time.Duration
8080
MaxRetryBackoff time.Duration
8181

82-
DialTimeout time.Duration
83-
ReadTimeout time.Duration
84-
WriteTimeout time.Duration
82+
DialTimeout time.Duration
83+
ReadTimeout time.Duration
84+
WriteTimeout time.Duration
85+
ContextTimeoutEnabled bool
8586

8687
// PoolFIFO uses FIFO mode for each node connection pool GET/PUT (default LIFO).
8788
PoolFIFO bool
@@ -90,6 +91,7 @@ type RingOptions struct {
9091
PoolTimeout time.Duration
9192
MinIdleConns int
9293
MaxIdleConns int
94+
MaxActiveConns int
9395
ConnMaxIdleTime time.Duration
9496
ConnMaxLifetime time.Duration
9597

@@ -144,15 +146,17 @@ func (opt *RingOptions) clientOptions() *Options {
144146

145147
MaxRetries: -1,
146148

147-
DialTimeout: opt.DialTimeout,
148-
ReadTimeout: opt.ReadTimeout,
149-
WriteTimeout: opt.WriteTimeout,
149+
DialTimeout: opt.DialTimeout,
150+
ReadTimeout: opt.ReadTimeout,
151+
WriteTimeout: opt.WriteTimeout,
152+
ContextTimeoutEnabled: opt.ContextTimeoutEnabled,
150153

151154
PoolFIFO: opt.PoolFIFO,
152155
PoolSize: opt.PoolSize,
153156
PoolTimeout: opt.PoolTimeout,
154157
MinIdleConns: opt.MinIdleConns,
155158
MaxIdleConns: opt.MaxIdleConns,
159+
MaxActiveConns: opt.MaxActiveConns,
156160
ConnMaxIdleTime: opt.ConnMaxIdleTime,
157161
ConnMaxLifetime: opt.ConnMaxLifetime,
158162

‎sentinel.go‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ type FailoverOptions struct {
7474
PoolTimeout time.Duration
7575
MinIdleConns int
7676
MaxIdleConns int
77+
MaxActiveConns int
7778
ConnMaxIdleTime time.Duration
7879
ConnMaxLifetime time.Duration
7980

@@ -107,6 +108,7 @@ func (opt *FailoverOptions) clientOptions() *Options {
107108
PoolTimeout: opt.PoolTimeout,
108109
MinIdleConns: opt.MinIdleConns,
109110
MaxIdleConns: opt.MaxIdleConns,
111+
MaxActiveConns: opt.MaxActiveConns,
110112
ConnMaxIdleTime: opt.ConnMaxIdleTime,
111113
ConnMaxLifetime: opt.ConnMaxLifetime,
112114

@@ -130,15 +132,17 @@ func (opt *FailoverOptions) sentinelOptions(addr string) *Options {
130132
MinRetryBackoff: opt.MinRetryBackoff,
131133
MaxRetryBackoff: opt.MaxRetryBackoff,
132134

133-
DialTimeout: opt.DialTimeout,
134-
ReadTimeout: opt.ReadTimeout,
135-
WriteTimeout: opt.WriteTimeout,
135+
DialTimeout: opt.DialTimeout,
136+
ReadTimeout: opt.ReadTimeout,
137+
WriteTimeout: opt.WriteTimeout,
138+
ContextTimeoutEnabled: opt.ContextTimeoutEnabled,
136139

137140
PoolFIFO: opt.PoolFIFO,
138141
PoolSize: opt.PoolSize,
139142
PoolTimeout: opt.PoolTimeout,
140143
MinIdleConns: opt.MinIdleConns,
141144
MaxIdleConns: opt.MaxIdleConns,
145+
MaxActiveConns: opt.MaxActiveConns,
142146
ConnMaxIdleTime: opt.ConnMaxIdleTime,
143147
ConnMaxLifetime: opt.ConnMaxLifetime,
144148

@@ -165,15 +169,17 @@ func (opt *FailoverOptions) clusterOptions() *ClusterOptions {
165169
MinRetryBackoff: opt.MinRetryBackoff,
166170
MaxRetryBackoff: opt.MaxRetryBackoff,
167171

168-
DialTimeout: opt.DialTimeout,
169-
ReadTimeout: opt.ReadTimeout,
170-
WriteTimeout: opt.WriteTimeout,
172+
DialTimeout: opt.DialTimeout,
173+
ReadTimeout: opt.ReadTimeout,
174+
WriteTimeout: opt.WriteTimeout,
175+
ContextTimeoutEnabled: opt.ContextTimeoutEnabled,
171176

172177
PoolFIFO: opt.PoolFIFO,
173178
PoolSize: opt.PoolSize,
174179
PoolTimeout: opt.PoolTimeout,
175180
MinIdleConns: opt.MinIdleConns,
176181
MaxIdleConns: opt.MaxIdleConns,
182+
MaxActiveConns: opt.MaxActiveConns,
177183
ConnMaxIdleTime: opt.ConnMaxIdleTime,
178184
ConnMaxLifetime: opt.ConnMaxLifetime,
179185

‎universal.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ type UniversalOptions struct {
4848
PoolTimeout time.Duration
4949
MinIdleConns int
5050
MaxIdleConns int
51+
MaxActiveConns int
5152
ConnMaxIdleTime time.Duration
5253
ConnMaxLifetime time.Duration
5354

@@ -102,6 +103,7 @@ func (o *UniversalOptions) Cluster() *ClusterOptions {
102103
PoolTimeout: o.PoolTimeout,
103104
MinIdleConns: o.MinIdleConns,
104105
MaxIdleConns: o.MaxIdleConns,
106+
MaxActiveConns: o.MaxActiveConns,
105107
ConnMaxIdleTime: o.ConnMaxIdleTime,
106108
ConnMaxLifetime: o.ConnMaxLifetime,
107109

@@ -144,6 +146,7 @@ func (o *UniversalOptions) Failover() *FailoverOptions {
144146
PoolTimeout: o.PoolTimeout,
145147
MinIdleConns: o.MinIdleConns,
146148
MaxIdleConns: o.MaxIdleConns,
149+
MaxActiveConns: o.MaxActiveConns,
147150
ConnMaxIdleTime: o.ConnMaxIdleTime,
148151
ConnMaxLifetime: o.ConnMaxLifetime,
149152

@@ -183,6 +186,7 @@ func (o *UniversalOptions) Simple() *Options {
183186
PoolTimeout: o.PoolTimeout,
184187
MinIdleConns: o.MinIdleConns,
185188
MaxIdleConns: o.MaxIdleConns,
189+
MaxActiveConns: o.MaxActiveConns,
186190
ConnMaxIdleTime: o.ConnMaxIdleTime,
187191
ConnMaxLifetime: o.ConnMaxLifetime,
188192

0 commit comments

Comments
 (0)