Skip to content

Commit 47eaed8

Browse files
committed
Review feedback - move and rename
1 parent 00ef4fe commit 47eaed8

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

pkg/chunk/aws/aws_autoscaling.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func newAWSAutoscale(cfg DynamoDBConfig, callManager callManager) (*awsAutoscale
4949
}, nil
5050
}
5151

52-
func (a *awsAutoscale) CreateTable(ctx context.Context, desc chunk.TableDesc) error {
52+
func (a *awsAutoscale) PostCreateTable(ctx context.Context, desc chunk.TableDesc) error {
5353
if desc.WriteScale.Enabled {
5454
return a.enableAutoScaling(ctx, desc)
5555
}

pkg/chunk/aws/dynamodb_table_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
// Pluggable auto-scaler implementation
1919
type autoscale interface {
20-
CreateTable(ctx context.Context, desc chunk.TableDesc) error
20+
PostCreateTable(ctx context.Context, desc chunk.TableDesc) error
2121
// This whole interface is very similar to chunk.TableClient, but
2222
// DescribeTable needs to mutate desc
2323
DescribeTable(ctx context.Context, desc *chunk.TableDesc) error
@@ -165,7 +165,7 @@ func (d dynamoTableClient) CreateTable(ctx context.Context, desc chunk.TableDesc
165165
}
166166

167167
if d.autoscale != nil {
168-
err := d.autoscale.CreateTable(ctx, desc)
168+
err := d.autoscale.PostCreateTable(ctx, desc)
169169
if err != nil {
170170
return err
171171
}

pkg/chunk/aws/metrics_autoscaling.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,20 @@ type metricsData struct {
3636
usageRates map[string]float64
3737
}
3838

39-
func (m *metricsData) CreateTable(ctx context.Context, desc chunk.TableDesc) error {
39+
func newMetrics(cfg DynamoDBConfig) (*metricsData, error) {
40+
client, err := promApi.NewClient(promApi.Config{Address: cfg.MetricsURL})
41+
if err != nil {
42+
return nil, err
43+
}
44+
return &metricsData{
45+
promAPI: promV1.NewAPI(client),
46+
queueLengthTarget: cfg.MetricsTargetQueueLen,
47+
scaleUpFactor: cfg.MetricsScaleUpFactor,
48+
tableLastUpdated: make(map[string]time.Time),
49+
}, nil
50+
}
51+
52+
func (m *metricsData) PostCreateTable(ctx context.Context, desc chunk.TableDesc) error {
4053
return nil
4154
}
4255

@@ -129,19 +142,6 @@ func (m *metricsData) scaleUpWrite(current chunk.TableDesc, expected *chunk.Tabl
129142
}
130143
}
131144

132-
func newMetrics(cfg DynamoDBConfig) (*metricsData, error) {
133-
client, err := promApi.NewClient(promApi.Config{Address: cfg.MetricsURL})
134-
if err != nil {
135-
return nil, err
136-
}
137-
return &metricsData{
138-
promAPI: promV1.NewAPI(client),
139-
queueLengthTarget: cfg.MetricsTargetQueueLen,
140-
scaleUpFactor: cfg.MetricsScaleUpFactor,
141-
tableLastUpdated: make(map[string]time.Time),
142-
}, nil
143-
}
144-
145145
func (m *metricsData) update(ctx context.Context) error {
146146
if m.promLastQuery.After(mtime.Now().Add(-cachePromDataFor)) {
147147
return nil

0 commit comments

Comments
 (0)