Skip to content

Commit f5ca942

Browse files
mirzakaracicmirzakaracic
committed
Policy cleanup based on QA comments
1 parent 35224fc commit f5ca942

File tree

5 files changed

+7
-75
lines changed

5 files changed

+7
-75
lines changed

‎config/dynconfig.go‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ type Write struct {
9898
}
9999

100100
type Query struct {
101-
ReadModeAp *ReadModeAp `yaml:"read_mode_ap"`
102-
ReadModeSc *ReadModeSc `yaml:"read_mode_sc"`
103101
Replica *Replica `yaml:"replica"`
104102
SleepBetweenRetries *int `yaml:"sleep_between_retries"`
105103
SocketTimeout *int `yaml:"socket_timeout"`
@@ -111,15 +109,13 @@ type Query struct {
111109
}
112110

113111
type Scan struct {
114-
ReadModeAp *ReadModeAp `yaml:"read_mode_ap"`
115-
ReadModeSc *ReadModeSc `yaml:"read_mode_sc"`
116-
Replica *Replica `yaml:"replica"`
117-
SleepBetweenRetries *int `yaml:"sleep_between_retries"`
118-
SocketTimeout *int `yaml:"socket_timeout"`
119-
TimeoutDelay *int `yaml:"timeout_delay"`
120-
TotalTimeout *int `yaml:"total_timeout"`
121-
MaxRetries *int `yaml:"max_retries"`
122-
MaxConcurrentNodes *int `yaml:"max_concurrent_nodes"`
112+
Replica *Replica `yaml:"replica"`
113+
SleepBetweenRetries *int `yaml:"sleep_between_retries"`
114+
SocketTimeout *int `yaml:"socket_timeout"`
115+
TimeoutDelay *int `yaml:"timeout_delay"`
116+
TotalTimeout *int `yaml:"total_timeout"`
117+
MaxRetries *int `yaml:"max_retries"`
118+
MaxConcurrentNodes *int `yaml:"max_concurrent_nodes"`
123119
}
124120

125121
type BatchRead struct {

‎query_policy.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,6 @@ func (qp *QueryPolicy) mapDynamic(dynConfig *DynConfig) *QueryPolicy {
100100
}
101101

102102
if dynConfig.config.Dynamic.Query != nil {
103-
if dynConfig.config.Dynamic.Query.ReadModeAp != nil {
104-
configValue := mapReadModeAPToReadModeAP(*dynConfig.config.Dynamic.Query.ReadModeAp)
105-
qp.ReadModeAP = configValue
106-
if dynConfig.configInitialized.Load() {
107-
logger.Logger.Info("ReadModeAP set to %s", configValue.String())
108-
}
109-
}
110-
if dynConfig.config.Dynamic.Query.ReadModeSc != nil {
111-
configValue := mapReadModeSCToReadModeSC(*dynConfig.config.Dynamic.Query.ReadModeSc)
112-
qp.ReadModeSC = configValue
113-
if dynConfig.configInitialized.Load() {
114-
logger.Logger.Info("ReadModeSC set to %s", configValue.String())
115-
}
116-
}
117103
if dynConfig.config.Dynamic.Query.TotalTimeout != nil {
118104
configValue := time.Duration(*dynConfig.config.Dynamic.Query.TotalTimeout) * time.Millisecond
119105
qp.TotalTimeout = configValue

‎query_policy_config_test.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ var _ = gg.Describe("ApplyConfigToQueryPolicy", func() {
3333
config: &dynconfig.Config{
3434
Dynamic: &dynconfig.DynamicConfig{
3535
Query: &dynconfig.Query{
36-
ReadModeAp: func() *dynconfig.ReadModeAp {
37-
d := dynconfig.ALL
38-
return &d
39-
}(),
40-
ReadModeSc: func() *dynconfig.ReadModeSc {
41-
d := dynconfig.LINEARIZE
42-
return &d
43-
}(),
4436
TotalTimeout: func() *int {
4537
d := 3000
4638
return &d
@@ -83,8 +75,6 @@ var _ = gg.Describe("ApplyConfigToQueryPolicy", func() {
8375

8476
// Check defaults.
8577
gm.Expect(policy).NotTo(gm.BeNil())
86-
gm.Expect(policy.ReadModeAP).To(gm.Equal(ReadModeAPOne))
87-
gm.Expect(policy.ReadModeSC).To(gm.Equal(ReadModeSCSession))
8878
gm.Expect(policy.TotalTimeout).To(gm.Equal(0 * time.Millisecond))
8979
// SocketTimeout is in seconds.
9080
gm.Expect(policy.SocketTimeout).To(gm.Equal(30 * time.Second))
@@ -102,8 +92,6 @@ var _ = gg.Describe("ApplyConfigToQueryPolicy", func() {
10292

10393
// Validate the applied configuration.
10494
gm.Expect(updatedPolicy).NotTo(gm.BeNil())
105-
gm.Expect(updatedPolicy.ReadModeAP).To(gm.Equal(ReadModeAPAll))
106-
gm.Expect(updatedPolicy.ReadModeSC).To(gm.Equal(ReadModeSCLinearize))
10795
gm.Expect(updatedPolicy.TotalTimeout).To(gm.Equal(3000 * time.Millisecond))
10896
gm.Expect(updatedPolicy.SocketTimeout).To(gm.Equal(3 * time.Millisecond))
10997
// Note: Some tests change MaxRetries; full config changes it to 3.
@@ -151,8 +139,6 @@ var _ = gg.Describe("ApplyConfigToQueryPolicy", func() {
151139

152140
// Check defaults.
153141
gm.Expect(policy).NotTo(gm.BeNil())
154-
gm.Expect(policy.ReadModeAP).To(gm.Equal(ReadModeAPOne))
155-
gm.Expect(policy.ReadModeSC).To(gm.Equal(ReadModeSCSession))
156142
gm.Expect(policy.TotalTimeout).To(gm.Equal(0 * time.Second))
157143
gm.Expect(policy.SocketTimeout).To(gm.Equal(30 * time.Second))
158144
gm.Expect(policy.MaxRetries).To(gm.Equal(5))

‎scan_policy.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,6 @@ func (sp *ScanPolicy) mapDynamic(dynConfig *DynConfig) *ScanPolicy {
9292
}
9393

9494
if dynConfig.config.Dynamic.Scan != nil {
95-
if dynConfig.config.Dynamic.Scan.ReadModeAp != nil {
96-
configValue := mapReadModeAPToReadModeAP(*dynConfig.config.Dynamic.Scan.ReadModeAp)
97-
sp.ReadModeAP = configValue
98-
if dynConfig.configInitialized.Load() {
99-
logger.Logger.Info("ReadModeAP set to %s", configValue.String())
100-
}
101-
}
102-
if dynConfig.config.Dynamic.Scan.ReadModeSc != nil {
103-
configValue := mapReadModeSCToReadModeSC(*dynConfig.config.Dynamic.Scan.ReadModeSc)
104-
sp.ReadModeSC = configValue
105-
if dynConfig.configInitialized.Load() {
106-
logger.Logger.Info("ReadModeSC set to %s", configValue.String())
107-
}
108-
}
10995
if dynConfig.config.Dynamic.Scan.TotalTimeout != nil {
11096
configValue := time.Duration(*dynConfig.config.Dynamic.Scan.TotalTimeout) * time.Millisecond
11197
sp.TotalTimeout = configValue

‎scan_policy_config_test.go‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ var _ = gg.Describe("ApplyConfigToScanPolicy", func() {
3333
config: &dynconfig.Config{
3434
Dynamic: &dynconfig.DynamicConfig{
3535
Scan: &dynconfig.Scan{
36-
ReadModeAp: func() *dynconfig.ReadModeAp {
37-
r := dynconfig.ONE
38-
return &r
39-
}(),
40-
ReadModeSc: func() *dynconfig.ReadModeSc {
41-
r := dynconfig.SESSION
42-
return &r
43-
}(),
4436
Replica: func() *dynconfig.Replica {
4537
r := dynconfig.PREFER_RACK
4638
return &r
@@ -69,8 +61,6 @@ var _ = gg.Describe("ApplyConfigToScanPolicy", func() {
6961

7062
// Validate default values.
7163
gm.Expect(policy).NotTo(gm.BeNil())
72-
gm.Expect(policy.ReadModeAP).To(gm.Equal(ReadModeAPOne))
73-
gm.Expect(policy.ReadModeSC).To(gm.Equal(ReadModeSCSession))
7464
gm.Expect(policy.TotalTimeout).To(gm.Equal(0 * time.Second))
7565
gm.Expect(policy.SocketTimeout).To(gm.Equal(30 * time.Second))
7666
gm.Expect(policy.MaxRetries).To(gm.Equal(5))
@@ -86,8 +76,6 @@ var _ = gg.Describe("ApplyConfigToScanPolicy", func() {
8676
// Apply the configuration.
8777
updatedPolicy := policy.patchDynamic(config)
8878
gm.Expect(updatedPolicy).NotTo(gm.BeNil())
89-
gm.Expect(updatedPolicy.ReadModeAP).To(gm.Equal(ReadModeAPOne))
90-
gm.Expect(updatedPolicy.ReadModeSC).To(gm.Equal(ReadModeSCSession))
9179
gm.Expect(updatedPolicy.TotalTimeout).To(gm.Equal(5000 * time.Millisecond))
9280
gm.Expect(updatedPolicy.SocketTimeout).To(gm.Equal(3 * time.Millisecond))
9381
gm.Expect(updatedPolicy.MaxRetries).To(gm.Equal(3))
@@ -111,14 +99,6 @@ var _ = gg.Describe("ApplyConfigToScanPolicy", func() {
11199
config: &dynconfig.Config{
112100
Dynamic: &dynconfig.DynamicConfig{
113101
Scan: &dynconfig.Scan{
114-
ReadModeAp: func() *dynconfig.ReadModeAp {
115-
r := dynconfig.ALL
116-
return &r
117-
}(),
118-
ReadModeSc: func() *dynconfig.ReadModeSc {
119-
r := dynconfig.ALLOW_UNAVAILABLE
120-
return &r
121-
}(),
122102
SleepBetweenRetries: func() *int {
123103
d := 2
124104
return &d
@@ -143,8 +123,6 @@ var _ = gg.Describe("ApplyConfigToScanPolicy", func() {
143123

144124
// Validate default values.
145125
gm.Expect(policy).NotTo(gm.BeNil())
146-
gm.Expect(policy.ReadModeAP).To(gm.Equal(ReadModeAPOne))
147-
gm.Expect(policy.ReadModeSC).To(gm.Equal(ReadModeSCSession))
148126
gm.Expect(policy.TotalTimeout).To(gm.Equal(0 * time.Second))
149127
gm.Expect(policy.SocketTimeout).To(gm.Equal(30 * time.Second))
150128
gm.Expect(policy.MaxRetries).To(gm.Equal(5))

0 commit comments

Comments
 (0)