Skip to content

Commit 379ea26

Browse files
committedAug 13, 2024
fix ut
Signed-off-by: Jared Tan <jian.tan@daocloud.io>
1 parent 0fc705b commit 379ea26

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed
 

‎plugin/storage/es/options.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ func initFromViper(cfg *namespaceConfig, v *viper.Viper) {
390390
cfg.AdaptiveSamplingLookback = v.GetDuration(cfg.namespace + suffixAdaptiveSamplingLookback)
391391

392392
deprecatedNumShards := v.GetInt64(cfg.namespace + suffixNumShards)
393-
deprecatedReplicaShards := v.GetInt64(cfg.namespace + suffixNumShards)
393+
deprecatedReplicaShards := v.GetInt64(cfg.namespace + suffixNumReplicas)
394394

395395
cfg.Indices.Spans.TemplateOptions.NumShards = overrideIndexShardsNums(deprecatedNumShards, v.GetInt64(cfg.namespace+suffixNumShardsSpan))
396396
cfg.Indices.Services.TemplateOptions.NumShards = overrideIndexShardsNums(deprecatedNumShards, v.GetInt64(cfg.namespace+suffixNumShardsServices))

‎plugin/storage/es/options_test.go

+16-4
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,14 @@ func TestOptions(t *testing.T) {
3333
assert.Empty(t, primary.PasswordFilePath)
3434
assert.NotEmpty(t, primary.Servers)
3535
assert.Empty(t, primary.RemoteReadClusters)
36-
assert.Equal(t, int64(5), primary.NumShards)
37-
assert.Equal(t, int64(1), primary.NumReplicas)
36+
assert.Equal(t, int64(5), primary.Indices.Spans.TemplateOptions.NumShards)
37+
assert.Equal(t, int64(5), primary.Indices.Services.TemplateOptions.NumShards)
38+
assert.Equal(t, int64(5), primary.Indices.Sampling.TemplateOptions.NumShards)
39+
assert.Equal(t, int64(5), primary.Indices.Dependencies.TemplateOptions.NumShards)
40+
assert.Equal(t, int64(1), primary.Indices.Spans.TemplateOptions.NumReplicas)
41+
assert.Equal(t, int64(1), primary.Indices.Services.TemplateOptions.NumReplicas)
42+
assert.Equal(t, int64(1), primary.Indices.Sampling.TemplateOptions.NumReplicas)
43+
assert.Equal(t, int64(1), primary.Indices.Dependencies.TemplateOptions.NumReplicas)
3844
assert.Equal(t, 72*time.Hour, primary.MaxSpanAge)
3945
assert.False(t, primary.Sniffer)
4046
assert.False(t, primary.SnifferTLSEnabled)
@@ -104,8 +110,14 @@ func TestOptionsWithFlags(t *testing.T) {
104110
assert.Equal(t, []string{"3.3.3.3", "4.4.4.4"}, aux.Servers)
105111
assert.Equal(t, "hello", aux.Username)
106112
assert.Equal(t, "world", aux.Password)
107-
assert.Equal(t, int64(5), aux.NumShards)
108-
assert.Equal(t, int64(10), aux.NumReplicas)
113+
assert.Equal(t, int64(5), aux.Indices.Spans.TemplateOptions.NumShards)
114+
assert.Equal(t, int64(5), aux.Indices.Services.TemplateOptions.NumShards)
115+
assert.Equal(t, int64(5), aux.Indices.Sampling.TemplateOptions.NumShards)
116+
assert.Equal(t, int64(5), aux.Indices.Dependencies.TemplateOptions.NumShards)
117+
assert.Equal(t, int64(10), aux.Indices.Spans.TemplateOptions.NumReplicas)
118+
assert.Equal(t, int64(10), aux.Indices.Services.TemplateOptions.NumReplicas)
119+
assert.Equal(t, int64(10), aux.Indices.Sampling.TemplateOptions.NumReplicas)
120+
assert.Equal(t, int64(10), aux.Indices.Dependencies.TemplateOptions.NumReplicas)
109121
assert.Equal(t, 24*time.Hour, aux.MaxSpanAge)
110122
assert.True(t, aux.Sniffer)
111123
assert.True(t, aux.Tags.AllAsFields)

0 commit comments

Comments
 (0)