Skip to content

Commit 768a3cb

Browse files
asmyasnikovasmyasnikov
authored
Merge pull request #758 from ydb-platform/slo-js
test(slo): update to js-version
2 parents f15e075 + 0f64bb3 commit 768a3cb

File tree

9 files changed

+77
-53
lines changed

9 files changed

+77
-53
lines changed

‎.github/workflows/slo.yml‎

Lines changed: 51 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,56 @@ on:
77
pull_request:
88
workflow_dispatch:
99
jobs:
10-
native:
10+
test-slo:
1111
concurrency:
12-
group: slo-native-${{ github.ref }}
12+
group: slo-${{ github.ref }}
1313
if: (!contains(github.event.pull_request.labels.*.name, 'no slo'))
14-
uses: ydb-platform/slo-tests/.github/workflows/slo.yml@main
15-
secrets: inherit
16-
with:
17-
language_id: go-native
18-
language: go/v3/native
19-
workload_path: tests/slo
20-
workload_build_options: -f Dockerfile --build-arg SRC_PATH=native
21-
workload_build_context: ../..
22-
database_sql:
23-
needs: [native]
24-
concurrency:
25-
group: slo-database-sql-${{ github.ref }}
26-
if: always() && !contains(github.event.pull_request.labels.*.name, 'no slo')
27-
uses: ydb-platform/slo-tests/.github/workflows/slo.yml@main
28-
secrets: inherit
29-
with:
30-
language_id: go-database-sql
31-
language: go/v3/database/sql
32-
workload_path: tests/slo
33-
workload_build_options: -f Dockerfile --build-arg SRC_PATH=database/sql
34-
workload_build_context: ../..
35-
gorm:
36-
needs: [database_sql]
37-
concurrency:
38-
group: slo-gorm-${{ github.ref }}
39-
if: always() && !contains(github.event.pull_request.labels.*.name, 'no slo')
40-
uses: ydb-platform/slo-tests/.github/workflows/slo.yml@main
41-
secrets: inherit
42-
with:
43-
language_id: go-gorm
44-
language: go/v3/gorm
45-
workload_path: tests/slo
46-
workload_build_options: -f Dockerfile --build-arg SRC_PATH=gorm
47-
workload_build_context: ../..
14+
15+
runs-on: ubuntu-latest
16+
name: SLO test
17+
permissions:
18+
checks: write
19+
pull-requests: write
20+
contents: read
21+
issues: write
22+
23+
steps:
24+
- name: Checkout repository
25+
uses: actions/checkout@v3
26+
27+
- name: Run SLO
28+
uses: ydb-platform/slo-tests@js-version
29+
with:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
KUBECONFIG_B64: ${{ secrets.SLO_KUBE_CONFIG }}
32+
AWS_CREDENTIALS_B64: ${{ secrets.SLO_AWS_CREDENTIALS }}
33+
AWS_CONFIG_B64: ${{ secrets.SLO_AWS_CONFIG }}
34+
DOCKER_USERNAME: ${{ secrets.SLO_DOCKER_USERNAME }}
35+
DOCKER_PASSWORD: ${{ secrets.SLO_DOCKER_PASSWORD }}
36+
DOCKER_REPO: ${{ secrets.SLO_DOCKER_REPO }}
37+
DOCKER_FOLDER: ${{ secrets.SLO_DOCKER_FOLDER }}
38+
s3_endpoint: ${{ secrets.SLO_S3_ENDPOINT }}
39+
s3_images_folder: ${{ vars.SLO_S3_IMAGES_FOLDER }}
40+
grafana_domain: ${{ vars.SLO_GRAFANA_DOMAIN }}
41+
grafana_dashboard: ${{ vars.SLO_GRAFANA_DASHBOARD }}
42+
ydb_version: 'newest'
43+
timeBetweenPhases: 30
44+
shutdownTime: 30
45+
46+
language_id0: 'native'
47+
workload_path0: 'tests/slo'
48+
language0: 'Go SDK Native'
49+
workload_build_context0: ../..
50+
workload_build_options0: -f Dockerfile --build-arg SRC_PATH=native --build-arg JOB_NAME=workload-native
51+
52+
language_id1: 'databasesql'
53+
workload_path1: 'tests/slo'
54+
language1: 'Go SDK database/sql'
55+
workload_build_context1: ../..
56+
workload_build_options1: -f Dockerfile --build-arg SRC_PATH=database/sql --build-arg JOB_NAME=workload-databasesql
57+
58+
language_id2: 'gorm'
59+
workload_path2: 'tests/slo'
60+
language2: 'Go SDK gorm'
61+
workload_build_context2: ../..
62+
workload_build_options2: -f Dockerfile --build-arg SRC_PATH=gorm --build-arg JOB_NAME=workload-gorm

‎tests/slo/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
FROM golang:1.20 as build
22
ARG SRC_PATH
3+
ARG JOB_NAME
34
COPY . /src
45
WORKDIR /src/tests/slo/${SRC_PATH}
5-
RUN CGO_ENABLED=0 go build -o /build/slo-go-workload -ldflags "-X \"main.label=${SRC_PATH}\"" .
6+
RUN CGO_ENABLED=0 go build -o /build/slo-go-workload -ldflags "-X \"main.label=${SRC_PATH}\" -X \"main.jobName=${JOB_NAME}\"" .
67

78
FROM scratch
89
COPY --from=build /build /

‎tests/slo/database/sql/main.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import (
2020

2121
var logger *zap.Logger
2222

23-
var label string
23+
var (
24+
label string
25+
jobName string
26+
)
2427

2528
func init() {
2629
var err error
@@ -105,7 +108,7 @@ func main() {
105108
case config.RunMode:
106109
gen := generator.New(cfg.InitialDataCount)
107110

108-
w, err := workers.New(cfg, s, logger, label)
111+
w, err := workers.New(cfg, s, logger, label, jobName)
109112
if err != nil {
110113
panic(fmt.Errorf("create workers failed: %w", err))
111114
}

‎tests/slo/database/sql/storage.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
const (
2222
createTemplate = `
23-
CREATE TABLE %s (
23+
CREATE TABLE ` + "`%s`" + ` (
2424
hash Uint64,
2525
id Uint64,
2626
payload_str Utf8,
@@ -39,17 +39,17 @@ CREATE TABLE %s (
3939
AUTO_PARTITIONING_MAX_PARTITIONS_COUNT = %d,
4040
UNIFORM_PARTITIONS = %d
4141
);`
42-
dropTemplate = `DROP TABLE %s;`
42+
dropTemplate = `DROP TABLE ` + "`%s`" + `;`
4343
upsertTemplate = `
44-
UPSERT INTO %s (
44+
UPSERT INTO ` + "`%s`" + ` (
4545
id, hash, payload_str, payload_double, payload_timestamp
4646
) VALUES (
4747
$id, Digest::NumericHash($id), $payload_str, $payload_double, $payload_timestamp
4848
);
4949
`
5050
selectTemplate = `
5151
SELECT id, payload_str, payload_double, payload_timestamp, payload_hash
52-
FROM %s WHERE id = $id AND hash = Digest::NumericHash($id);
52+
FROM ` + "`%s`" + ` WHERE id = $id AND hash = Digest::NumericHash($id);
5353
`
5454
)
5555

‎tests/slo/gorm/main.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import (
2020

2121
var logger *zap.Logger
2222

23-
var label string
23+
var (
24+
label string
25+
jobName string
26+
)
2427

2528
func init() {
2629
var err error
@@ -105,7 +108,7 @@ func main() {
105108
case config.RunMode:
106109
gen := generator.New(cfg.InitialDataCount)
107110

108-
w, err := workers.New(cfg, s, logger, label)
111+
w, err := workers.New(cfg, s, logger, label, jobName)
109112
if err != nil {
110113
panic(fmt.Errorf("create workers failed: %w", err))
111114
}

‎tests/slo/internal/metrics/metrics.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
)
1212

1313
const (
14-
jobName = "workload-go"
1514
sdk = "go"
1615
sdkVersion = ydb.Version
1716
)
@@ -32,7 +31,7 @@ type (
3231
}
3332
)
3433

35-
func New(logger *zap.Logger, url, label string) (*Metrics, error) {
34+
func New(logger *zap.Logger, url, label, jobName string) (*Metrics, error) {
3635
m := &Metrics{
3736
logger: logger.Named("metrics"),
3837

‎tests/slo/internal/workers/workers.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ type Workers struct {
2222
logger *zap.Logger
2323
}
2424

25-
func New(cfg *config.Config, s ReadWriter, logger *zap.Logger, label string) (*Workers, error) {
25+
func New(cfg *config.Config, s ReadWriter, logger *zap.Logger, label, jobName string) (*Workers, error) {
2626
logger = logger.Named("workers")
2727

28-
m, err := metrics.New(logger, cfg.PushGateway, label)
28+
m, err := metrics.New(logger, cfg.PushGateway, label, jobName)
2929
if err != nil {
3030
logger.Error("create metrics failed", zap.Error(err))
3131
return nil, err

‎tests/slo/native/main.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import (
2020

2121
var logger *zap.Logger
2222

23-
var label string
23+
var (
24+
label string
25+
jobName string
26+
)
2427

2528
func init() {
2629
var err error
@@ -105,7 +108,7 @@ func main() {
105108
case config.RunMode:
106109
gen := generator.New(cfg.InitialDataCount)
107110

108-
w, err := workers.New(cfg, s, logger, label)
111+
w, err := workers.New(cfg, s, logger, label, jobName)
109112
if err != nil {
110113
panic(fmt.Errorf("create workers failed: %w", err))
111114
}

‎tests/slo/native/storage.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ DECLARE $payload_str AS Utf8;
2929
DECLARE $payload_double AS Double;
3030
DECLARE $payload_timestamp AS Timestamp;
3131
32-
UPSERT INTO %s (
32+
UPSERT INTO ` + "`%s`" + ` (
3333
id, hash, payload_str, payload_double, payload_timestamp
3434
) VALUES (
3535
$id, Digest::NumericHash($id), $payload_str, $payload_double, $payload_timestamp
@@ -40,7 +40,7 @@ PRAGMA TablePathPrefix("%s");
4040
4141
DECLARE $id AS Uint64;
4242
SELECT id, payload_str, payload_double, payload_timestamp, payload_hash
43-
FROM %s WHERE id = $id AND hash = Digest::NumericHash($id);
43+
FROM ` + "`%s`" + ` WHERE id = $id AND hash = Digest::NumericHash($id);
4444
`
4545
)
4646

0 commit comments

Comments
 (0)