Merge pull request #760 from ydb-platform/slo-xorm

test(slo): add xorm workload

Author: asmyasnikov

.github/workflows/slo.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run SLO
-        uses: ydb-platform/slo-tests@js-version
+        uses: ydb-platform/slo-tests@additional-logs
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           KUBECONFIG_B64: ${{ secrets.SLO_KUBE_CONFIG }}
@@ -45,7 +45,7 @@ jobs:
 
           language_id0: 'native'
           workload_path0: 'tests/slo'
-          language0: 'Go SDK Native'
+          language0: 'Go SDK native'
           workload_build_context0: ../..
           workload_build_options0: -f Dockerfile --build-arg SRC_PATH=native --build-arg JOB_NAME=workload-native
 
@@ -60,3 +60,15 @@ jobs:
           language2: 'Go SDK gorm'
           workload_build_context2: ../..
           workload_build_options2: -f Dockerfile --build-arg SRC_PATH=gorm --build-arg JOB_NAME=workload-gorm
+
+          language_id3: 'xorm'
+          workload_path3: 'tests/slo'
+          language3: 'Go SDK xorm'
+          workload_build_context3: ../..
+          workload_build_options3: -f Dockerfile --build-arg SRC_PATH=xorm --build-arg JOB_NAME=workload-xorm
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: slo-logs
+          path: logs/

examples/go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/ydb-platform/ydb-go-sdk-auth-environ v0.1.2
 	github.com/ydb-platform/ydb-go-sdk-prometheus v0.11.10
 	github.com/ydb-platform/ydb-go-sdk-zerolog v0.12.2
-	github.com/ydb-platform/ydb-go-sdk/v3 v3.47.2
+	github.com/ydb-platform/ydb-go-sdk/v3 v3.47.3
 	github.com/ydb-platform/ydb-go-yc v0.10.1
 	google.golang.org/genproto v0.0.0-20230131230820-1c016267d619
 	gorm.io/driver/postgres v1.5.0
@@ -77,4 +77,4 @@ require (
 
 replace github.com/ydb-platform/ydb-go-sdk/v3 => ../
 
-replace xorm.io/xorm => github.com/ydb-platform/xorm v0.0.0
+replace xorm.io/xorm => github.com/ydb-platform/xorm v0.0.3

examples/go.sum

@@ -909,8 +909,8 @@ github.com/yandex-cloud/go-genproto v0.0.0-20220815090733-4c139c0154e2 h1:blq4r0
 github.com/yandex-cloud/go-genproto v0.0.0-20220815090733-4c139c0154e2/go.mod h1:HEUYX/p8966tMUHHT+TsS0hF/Ca/NYwqprC5WXSDMfE=
 github.com/ydb-platform/gorm-driver v0.0.5 h1:q6Cg/iSFw4TAmSyMh25YM0GRmr6LVM2gnFD+9aCTGlo=
 github.com/ydb-platform/gorm-driver v0.0.5/go.mod h1:fkCvWZlA3PzL5MiMc7yFOzxUOzLpY1uT8yZo+e4SV4Y=
-github.com/ydb-platform/xorm v0.0.0 h1:c3lrIbgY3fn0r78/8pYCHJPPy6MRyk7E/+yUzQc7oOM=
-github.com/ydb-platform/xorm v0.0.0/go.mod h1:sFIWG6feARGUhAiZboe3pbjBVgyQxEcGw5d+aBeVdwQ=
+github.com/ydb-platform/xorm v0.0.3 h1:MXk42lANB6r/MMLg/XdJfyXJycGUDlCeLiMlLGDKVPw=
+github.com/ydb-platform/xorm v0.0.3/go.mod h1:hFsU7EUF0o3S+l5c0eyP2yPVjJ0d4gsFdqCsyazzwBc=
 github.com/ydb-platform/ydb-go-genproto v0.0.0-20230528143953-42c825ace222 h1:8ddsk8HKBkVPH8w3k81si6SeCVJIAtw8dnw+s3h0ciE=
 github.com/ydb-platform/ydb-go-genproto v0.0.0-20230528143953-42c825ace222/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
 github.com/ydb-platform/ydb-go-sdk-auth-environ v0.1.2 h1:EYSI1kulnHb0H0zt3yOw4cRj4ABMSMGwNe43D+fX7e4=

tests/slo/database/sql/storage.go

@@ -169,7 +169,7 @@ func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, err
 	ctx, cancel := context.WithTimeout(ctx, time.Duration(s.cfg.WriteTimeout)*time.Millisecond)
 	defer cancel()
 
-	return attempts, retry.Do(ydb.WithTxControl(ctx, writeTx), s.db,
+	err = retry.Do(ydb.WithTxControl(ctx, writeTx), s.db,
 		func(ctx context.Context, cc *sql.Conn) (err error) {
 			if err = ctx.Err(); err != nil {
 				return err
@@ -199,6 +199,8 @@ func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, err
 			),
 		),
 	)
+
+	return attempts, err
 }
 
 func (s *Storage) createTable(ctx context.Context) error {
@@ -239,10 +241,16 @@ func (s *Storage) close(ctx context.Context) error {
 	}
 
 	if err := s.db.Close(); err != nil {
-		return err
+		return fmt.Errorf("error close database/sql driver: %w", err)
 	}
+
 	if err := s.c.Close(); err != nil {
-		return err
+		return fmt.Errorf("error close connector: %w", err)
 	}
-	return s.cc.Close(ctx)
+
+	if err := s.cc.Close(ctx); err != nil {
+		return fmt.Errorf("error close ydb driver: %w", err)
+	}
+
+	return nil
 }

tests/slo/go.mod

@@ -7,27 +7,34 @@ require (
 	github.com/ydb-platform/gorm-driver v0.0.6-0.20230529184330-9104dd08ecae
 	github.com/ydb-platform/ydb-go-sdk-auth-environ v0.1.3
 	github.com/ydb-platform/ydb-go-sdk-zap v0.15.0
-	github.com/ydb-platform/ydb-go-sdk/v3 v3.47.2
+	github.com/ydb-platform/ydb-go-sdk/v3 v3.47.3
 	go.uber.org/zap v1.24.0
 	golang.org/x/sync v0.1.0
 	golang.org/x/time v0.3.0
 	gorm.io/gorm v1.25.1
+	xorm.io/xorm v1.3.2
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/goccy/go-json v0.8.1 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jonboulle/clockwork v0.4.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/yandex-cloud/go-genproto v0.0.0-20230403093326-123923969dc6 // indirect
 	github.com/ydb-platform/ydb-go-genproto v0.0.0-20230528143953-42c825ace222 // indirect
 	github.com/ydb-platform/ydb-go-yc v0.10.2 // indirect
@@ -40,6 +47,9 @@ require (
 	google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd // indirect
 	google.golang.org/grpc v1.54.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
+	xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect
 )
 
 replace github.com/ydb-platform/ydb-go-sdk/v3 => ../../.
+
+replace xorm.io/xorm => github.com/ydb-platform/xorm v0.0.3