.forgejo/workflows/dco.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
 
       - name: Run commit format checker
         uses: https://git.frostfs.info/TrueCloudLab/dco-go@v2

.forgejo/workflows/tests.yml

@@ -11,21 +11,20 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.23'
+          go-version: '1.22'
           cache: true
 
-      - name: Install linters
-        run: make lint-install
-
-      - name: Run linters
-        run: make lint
+      - name: golangci-lint
+        uses: https://github.com/golangci/golangci-lint-action@v3
+        with:
+          version: latest
 
   tests:
     name: Tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_versions: [ '1.22', '1.23' ]
+        go_versions: [ '1.21', '1.22' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -48,7 +47,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: true
 
       - name: Run tests

CONTRIBUTING.md

@@ -3,8 +3,8 @@
 First, thank you for contributing! We love and encourage pull requests from
 everyone. Please follow the guidelines:
 
-- Check the open [issues](https://git.frostfs.info/TrueCloudLab/xk6-frostfs/issues) and
-  [pull requests](https://git.frostfs.info/TrueCloudLab/xk6-frostfs/pulls) for existing
+- Check the open [issues](https://github.com/TrueCloudLab/xk6-frostfs/issues) and
+  [pull requests](https://github.com/TrueCloudLab/xk6-frostfs/pulls) for existing
   discussions.
 
 - Open an issue first, to discuss a new feature or enhancement.
@@ -28,18 +28,18 @@ send a pull request. We encourage pull requests to discuss code changes. Here
 are the steps in details:
 
 ### Set up your GitHub Repository
-Fork [xk6-frostfs upstream](https://git.frostfs.info/TrueCloudLab/xk6-frostfs/fork) source
+Fork [xk6-frostfs upstream](https://github.com/TrueCloudLab/xk6-frostfs/fork) source
 repository to your own personal repository. Copy the URL of your fork (you will
 need it for the `git clone` command below).
 
 ```sh
-$ git clone https://git.frostfs.info/TrueCloudLab/xk6-frostfs
+$ git clone https://github.com/TrueCloudLab/xk6-frostfs
 ```
 
 ### Set up git remote as ``upstream``
 ```sh
 $ cd xk6-frostfs
-$ git remote add upstream https://git.frostfs.info/TrueCloudLab/xk6-frostfs
+$ git remote add upstream https://github.com/TrueCloudLab/xk6-frostfs
 $ git fetch upstream
 $ git merge upstream/master
 ...

Makefile

@@ -3,15 +3,10 @@
 # Common variables
 REPO ?= $(shell go list -m)
 VERSION ?= $(shell git describe --tags --dirty --match "v*" --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop")
-GO_VERSION ?= 1.22
-LINT_VERSION ?= 1.60.3
-TRUECLOUDLAB_LINT_VERSION ?= 0.0.7
+GO_VERSION ?= 1.19
+LINT_VERSION ?= 1.49.0
 BINDIR = bin
 
-OUTPUT_LINT_DIR ?= $(abspath $(BINDIR))/linters
-LINT_DIR = $(OUTPUT_LINT_DIR)/golangci-lint-$(LINT_VERSION)-v$(TRUECLOUDLAB_LINT_VERSION)
-TMP_DIR := .cache
-
 # Binaries to build
 CMDS = $(addprefix frostfs-, $(notdir $(wildcard cmd/*)))
 BINS = $(addprefix $(BINDIR)/, $(CMDS))
@@ -69,22 +64,7 @@ format:
 
 # Run linters
 lint:
-	@if [ ! -d "$(LINT_DIR)" ]; then \
-		make lint-install; \
-	fi
-	$(LINT_DIR)/golangci-lint run --timeout=5m
-
-# Install linters
-lint-install:
-	@rm -rf $(OUTPUT_LINT_DIR)
-	@mkdir -p $(OUTPUT_LINT_DIR)
-	@mkdir -p $(TMP_DIR)
-	@rm -rf $(TMP_DIR)/linters
-	@git -c advice.detachedHead=false clone --branch v$(TRUECLOUDLAB_LINT_VERSION) https://git.frostfs.info/TrueCloudLab/linters.git $(TMP_DIR)/linters
-	@@make -C $(TMP_DIR)/linters lib CGO_ENABLED=1 OUT_DIR=$(OUTPUT_LINT_DIR)
-	@rm -rf $(TMP_DIR)/linters
-	@rmdir $(TMP_DIR) 2>/dev/null || true
-	@CGO_ENABLED=1 GOBIN=$(LINT_DIR) go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint@v$(LINT_VERSION)
+	@golangci-lint --timeout=5m run
 
 # Run linters in Docker
 docker/lint:

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-<img src="./.forgejo/logo.svg" width="500px" alt="FrostFS logo">
+<img src="./.github/logo.svg" width="500px" alt="FrostFS logo">
 </p>
 <p align="center">
   <a href="https://go.k6.io/k6">k6</a> extension to test and benchmark FrostFS related protocols.
@@ -186,25 +186,6 @@ Flags:
 -v, --version         version for registry-exporter
 ```
 
-## Import pregen into registry db
-
-You can import pregenerated json files into registry bolt db. Use `frostfs-xk6-registry import`. Usage examples are in help:
-
-```shell
-$ ./bin/frostfs-xk6-registry import -h
-Import objects into registry from pregenerated files
-
-Usage:
-  xk6-registry import [flags]
-
-Examples:
-xk6-registry import registry.bolt preset.json
-xk6-registry import registry.bolt preset.json another_preset.json
-
-Flags:
-  -h, --help   help for import
-```
-
 # License
 
 - [GNU General Public License v3.0](LICENSE)

cmd/xk6-registry/importer/root.go

@@ -11,7 +11,7 @@ var Cmd = &cobra.Command{
 	Short: "Import objects into registry",
 	Long:  "Import objects into registry from pregenerated files",
 	Example: `xk6-registry import registry.bolt preset.json
-xk6-registry import registry.bolt preset.json another_preset.json`,
+xk6-registry import --status created registry.bolt preset.json another_preset.json`,
 	RunE: runCmd,
 	Args: cobra.MinimumNArgs(2),
 }

go.mod

@@ -1,6 +1,6 @@
 module git.frostfs.info/TrueCloudLab/xk6-frostfs
 
-go 1.22
+go 1.21
 
 require (
 	git.frostfs.info/TrueCloudLab/frostfs-node v0.38.3-0.20240502170333-ec2873caa7c6

internal/registry/obj_selector.go

@@ -3,7 +3,6 @@ package registry
 import (
 	"context"
 	"fmt"
-	"sync"
 	"time"
 
 	"github.com/nspcc-dev/neo-go/pkg/io"
@@ -24,8 +23,6 @@ type ObjSelector struct {
 	filter    *ObjFilter
 	cacheSize int
 	kind      SelectorKind
-	// Sync synchronizes VU used for deletion.
-	Sync sync.WaitGroup
 }
 
 // objectSelectCache is the default maximum size of a batch to select from DB.

scenarios/libs/keygen.js

@@ -1,34 +0,0 @@
-import { uuidv4 } from './k6-utils-1.4.0.js';
-
-export function generateS3Key() {
-  let width = parseInt(__ENV.DIR_WIDTH || '0');
-  let height = parseInt(__ENV.DIR_HEIGHT || '0');
-
-  let key = ''
-  if (width > 0 && height > 0) {
-    for (let index = 0; index < height; index++) {
-      const w = Math.floor(Math.random() * width) + 1;
-      key = key + 'dir' + w + '/';
-    }
-  }
-
-  key += objName();
-  return key;
-}
-
-const asciiLetters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
-
-function objName() {
-  if (__ENV.OBJ_NAME) {
-    return __ENV.OBJ_NAME;
-  }
-  const length = parseInt(__ENV.OBJ_NAME_LENGTH || '0');
-  if (length > 0) {
-    let name = "";
-    for (let i = 0; i < length; i++) {
-      name += asciiLetters.charAt(Math.floor(Math.random() * asciiLetters.length));
-    }
-    return name;
-  }
-  return uuidv4();
-}

scenarios/preset/helpers/frostfs_cli.py

@@ -88,7 +88,7 @@ def create_container(endpoint, policy, container_creation_retry, wallet_path, co
             return cid
     
     log(f"Created container {cid} is not stored on {endpoint}, creating another one...", endpoint)
-    return create_container(endpoint, policy, container_creation_retry, wallet_path, config, acl, local, retry + 1)
+    return create_container(endpoint, policy, wallet_path, config, acl, local, retry + 1)
 
 
 def upload_object(container, payload_filepath, endpoint, wallet_file, wallet_config):

scenarios/run_scenarios.md

@@ -138,8 +138,6 @@ Options (in addition to the common options):
   * `DELETE_AGE` - age of object in seconds before which it can not be deleted. This parameter can be used to control how many objects we have in the system under load.
   * `SLEEP_DELETE` - time interval (in seconds) between deleting VU iterations.
   * `OBJ_NAME` - if specified, this name will be used for all write operations instead of random generation.
-  * `OBJ_NAME_LENGTH` - if specified, then name of the object will be generated with the specified length of ASCII characters.
-  * `DIR_HEIGHT`, `DIR_WIDTH` - if both specified, object name will consist of `DIR_HEIGHT` directories, each of which can have `DIR_WIDTH` subdirectories, for example for `DIR_HEIGHT = 3, DIR_WIDTH = 100`, object names will be `/dir{1...100}/dir{1...100}/dir{1...100}/{uuid || OBJ_NAME}`
 
 ## S3 Multipart
 

scenarios/s3.js

@@ -6,10 +6,10 @@ import registry from 'k6/x/frostfs/registry';
 import s3 from 'k6/x/frostfs/s3';
 import stats from 'k6/x/frostfs/stats';
 
-import {generateS3Key} from './libs/keygen.js';
+import {newGenerator} from './libs/datagen.js';
 import {parseEnv} from './libs/env-parser.js';
 import {textSummary} from './libs/k6-summary-0.0.2.js';
-import {newGenerator} from './libs/datagen.js';
+import {uuidv4} from './libs/k6-utils-1.4.0.js';
 
 parseEnv();
 
@@ -132,10 +132,6 @@ export function setup() {
   const start_timestamp = Date.now()
   console.log(
       `Load started at:               ${Date(start_timestamp).toString()}`)
-
-  if (delete_vu_count > 0){
-    obj_to_delete_selector.sync.add(delete_vu_count)
-  }
 }
 
 export function teardown(data) {
@@ -159,7 +155,7 @@ export function obj_write() {
     sleep(__ENV.SLEEP_WRITE);
   }
 
-  const key = generateS3Key();
+  const key = __ENV.OBJ_NAME || uuidv4();
   const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)];
 
   const payload = generator.genPayload();
@@ -208,8 +204,6 @@ export function obj_delete() {
   const obj = obj_to_delete_selector.nextObject();
   if (!obj) {
     if (obj_to_delete_exit_on_null) {
-      obj_to_delete_selector.sync.done()
-      obj_to_delete_selector.sync.wait()
       exec.test.abort("No more objects to select");
     }
     return;

scenarios/s3_car.js

@@ -5,10 +5,10 @@ import registry from 'k6/x/frostfs/registry';
 import s3 from 'k6/x/frostfs/s3';
 import stats from 'k6/x/frostfs/stats';
 
-import {generateS3Key} from './libs/keygen.js';
 import {newGenerator} from './libs/datagen.js';
 import {parseEnv} from './libs/env-parser.js';
 import {textSummary} from './libs/k6-summary-0.0.2.js';
+import {uuidv4} from './libs/k6-utils-1.4.0.js';
 
 parseEnv();
 
@@ -177,7 +177,7 @@ export function obj_write() {
     sleep(__ENV.SLEEP_WRITE);
   }
 
-  const key = generateS3Key();
+  const key = __ENV.OBJ_NAME || uuidv4();
   const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)];
 
   const payload = generator.genPayload();

scenarios/s3_dar.js

@@ -6,10 +6,10 @@ import registry from 'k6/x/frostfs/registry';
 import s3 from 'k6/x/frostfs/s3';
 import stats from 'k6/x/frostfs/stats';
 
-import {generateS3Key} from './libs/keygen.js';
 import {newGenerator} from './libs/datagen.js';
 import {parseEnv} from './libs/env-parser.js';
 import {textSummary} from './libs/k6-summary-0.0.2.js';
+import {uuidv4} from './libs/k6-utils-1.4.0.js';
 
 parseEnv();
 
@@ -159,7 +159,7 @@ export function obj_write() {
         sleep(__ENV.SLEEP_WRITE);
     }
 
-    const key = generateS3Key();
+    const key = __ENV.OBJ_NAME || uuidv4();
     const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)];
 
     const payload = generator.genPayload();

scenarios/s3_multipart.js

@@ -5,10 +5,10 @@ import registry from 'k6/x/frostfs/registry';
 import s3 from 'k6/x/frostfs/s3';
 import stats from 'k6/x/frostfs/stats';
 
-import {generateS3Key} from './libs/keygen.js';
 import {newGenerator} from './libs/datagen.js';
 import {parseEnv} from './libs/env-parser.js';
 import {textSummary} from './libs/k6-summary-0.0.2.js';
+import {uuidv4} from './libs/k6-utils-1.4.0.js';
 
 parseEnv();
 
@@ -101,7 +101,7 @@ export function obj_write_multipart() {
     sleep(__ENV.SLEEP_WRITE);
   }
 
-  const key = generateS3Key();
+  const key = __ENV.OBJ_NAME || uuidv4();
   const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)];
 
   const payload = generator.genPayload();

scenarios/s3local.js

@@ -5,7 +5,6 @@ import registry from 'k6/x/frostfs/registry';
 import s3local from 'k6/x/frostfs/s3local';
 import stats from 'k6/x/frostfs/stats';
 
-import {generateS3Key} from './libs/keygen.js';
 import {newGenerator} from './libs/datagen.js';
 import {parseEnv} from './libs/env-parser.js';
 import {textSummary} from './libs/k6-summary-0.0.2.js';
@@ -132,7 +131,7 @@ export function handleSummary(data) {
 }
 
 export function obj_write() {
-  const key = generateS3Key();
+  const key = __ENV.OBJ_NAME || uuidv4();
   const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)];
 
   const payload = generator.genPayload();