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
 ...

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.

cmd/xk6-registry/importer/import.go

@@ -1,55 +0,0 @@
-package importer
-
-import (
-	"encoding/json"
-	"os"
-
-	"git.frostfs.info/TrueCloudLab/xk6-frostfs/internal/registry"
-)
-
-type PreGenObj struct {
-	Bucket    string `json:"bucket"`
-	Object    string `json:"object"`
-	Container string `json:"container"`
-}
-
-type PreGenerateInfo struct {
-	Buckets    []string    `json:"buckets"`
-	Containers []string    `json:"containers"`
-	Objects    []PreGenObj `json:"objects"`
-	ObjSize    string      `json:"obj_size"`
-}
-
-// ImportJSONPreGen writes objects from pregenerated JSON file
-// to the registry.
-// Note that ImportJSONPreGen does not check if object already
-// exists in the registry so in case of re-entry the registry
-// will have two entities representing the same object.
-func ImportJSONPreGen(o *registry.ObjRegistry, filename string) error {
-	f, err := os.ReadFile(filename)
-	if err != nil {
-		return err
-	}
-
-	var pregenInfo PreGenerateInfo
-	err = json.Unmarshal(f, &pregenInfo)
-	if err != nil {
-		return err
-	}
-
-	// AddObject uses DB.Batch to combine concurrent Batch calls
-	// into a single Bolt transaction. DB.Batch is limited by
-	// DB.MaxBatchDelay which may affect perfomance.
-	for _, obj := range pregenInfo.Objects {
-		if obj.Bucket != "" {
-			err = o.AddObject("", "", obj.Bucket, obj.Object, "")
-		} else {
-			err = o.AddObject(obj.Container, obj.Object, "", "", "")
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

cmd/xk6-registry/importer/root.go

@@ -1,27 +0,0 @@
-package importer
-
-import (
-	"git.frostfs.info/TrueCloudLab/xk6-frostfs/internal/registry"
-	"github.com/spf13/cobra"
-)
-
-// Cmd represents the import command.
-var Cmd = &cobra.Command{
-	Use:   "import",
-	Short: "Import objects into registry",
-	Long:  "Import objects into registry from pregenerated files",
-	Example: `xk6-registry import registry.bolt preset.json
-xk6-registry import --status created registry.bolt preset.json another_preset.json`,
-	RunE: runCmd,
-	Args: cobra.MinimumNArgs(2),
-}
-
-func runCmd(cmd *cobra.Command, args []string) error {
-	objRegistry := registry.NewObjRegistry(cmd.Context(), args[0])
-	for i := 1; i < len(args); i++ {
-		if err := ImportJSONPreGen(objRegistry, args[i]); err != nil {
-			return err
-		}
-	}
-	return nil
-}

cmd/xk6-registry/main.go

@@ -1,18 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-)
-
-func main() {
-	ctx, _ := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
-
-	if cmd, err := rootCmd.ExecuteContextC(ctx); err != nil {
-		cmd.PrintErrln("Error:", err.Error())
-		cmd.PrintErrf("Run '%v --help' for usage.\n", cmd.CommandPath())
-		os.Exit(1)
-	}
-}

cmd/xk6-registry/root.go

@@ -1,33 +0,0 @@
-package main
-
-import (
-	"runtime"
-
-	"git.frostfs.info/TrueCloudLab/xk6-frostfs/cmd/xk6-registry/importer"
-	"git.frostfs.info/TrueCloudLab/xk6-frostfs/internal/version"
-	"github.com/spf13/cobra"
-)
-
-var rootCmd = &cobra.Command{
-	Use:     "xk6-registry",
-	Version: version.Version,
-	Short:   "Command Line Tool to work with Registry",
-	Long: `Registry provides tools to work with object registry for xk6.
-It contains command for importing objects in registry from preset`,
-	SilenceErrors: true,
-	SilenceUsage:  true,
-	Run:           rootCmdRun,
-}
-
-func init() {
-	cobra.AddTemplateFunc("runtimeVersion", runtime.Version)
-	rootCmd.SetVersionTemplate(`FrostFS xk6-registry
-{{printf "Version: %s" .Version }}
-GoVersion: {{ runtimeVersion }}
-`)
-	rootCmd.AddCommand(importer.Cmd)
-}
-
-func rootCmdRun(cmd *cobra.Command, _ []string) {
-	_ = cmd.Usage()
-}

internal/native/cache.go

@@ -1,58 +0,0 @@
-package native
-
-import (
-	"context"
-	"sync"
-	"time"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
-)
-
-const networkCacheTTL = time.Minute
-
-var networkInfoCache = &networkInfoCacheT{}
-
-type networkInfoCacheT struct {
-	guard   sync.RWMutex
-	current *netmap.NetworkInfo
-	fetchTS time.Time
-}
-
-func (c *networkInfoCacheT) getOrFetch(ctx context.Context, cli *client.Client) (*netmap.NetworkInfo, error) {
-	if v := c.get(); v != nil {
-		return v, nil
-	}
-	return c.fetch(ctx, cli)
-}
-
-func (c *networkInfoCacheT) get() *netmap.NetworkInfo {
-	c.guard.RLock()
-	defer c.guard.RUnlock()
-
-	if c.current == nil || time.Since(c.fetchTS) > networkCacheTTL {
-		return nil
-	}
-
-	return c.current
-}
-
-func (c *networkInfoCacheT) fetch(ctx context.Context, cli *client.Client) (*netmap.NetworkInfo, error) {
-	c.guard.Lock()
-	defer c.guard.Unlock()
-
-	if time.Since(c.fetchTS) <= networkCacheTTL {
-		return c.current, nil
-	}
-
-	res, err := cli.NetworkInfo(ctx, client.PrmNetworkInfo{})
-	if err != nil {
-		return nil, err
-	}
-
-	v := res.Info()
-	c.current = &v
-	c.fetchTS = time.Now()
-
-	return c.current, nil
-}

internal/native/client.go

@@ -437,12 +437,12 @@ func put(vu modules.VU, cli *client.Client, prepareLocally bool, tok *session.Ob
 		prm.MaxChunkLength = chunkSize
 	}
 	if prepareLocally {
-		ni, err := networkInfoCache.getOrFetch(vu.Context(), cli)
+		res, err := cli.NetworkInfo(vu.Context(), client.PrmNetworkInfo{})
 		if err != nil {
 			return nil, err
 		}
-		prm.MaxSize = ni.MaxObjectSize()
-		prm.EpochSource = epochSource(ni.CurrentEpoch())
+		prm.MaxSize = res.Info().MaxObjectSize()
+		prm.EpochSource = epochSource(res.Info().CurrentEpoch())
 		prm.WithoutHomomorphHash = true
 		if maxObjSize > 0 {
 			prm.MaxSize = maxObjSize

internal/registry/obj_selector.go

@@ -3,15 +3,12 @@ package registry
 import (
 	"context"
 	"fmt"
-	"sync"
 	"time"
 
 	"github.com/nspcc-dev/neo-go/pkg/io"
 	"go.etcd.io/bbolt"
 )
 
-const nextObjectTimeout = 10 * time.Second
-
 type ObjFilter struct {
 	Status string
 	Age    int
@@ -24,8 +21,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.
@@ -62,16 +57,7 @@ func NewObjSelector(registry *ObjRegistry, selectionSize int, kind SelectorKind,
 //   - underlying registry context is done, nil objects will be returned on the
 //     currently blocked and every further NextObject calls.
 func (o *ObjSelector) NextObject() *ObjectInfo {
-	if o.kind == SelectorOneshot {
-		return <-o.objChan
-	}
-
-	select {
-	case <-time.After(nextObjectTimeout):
-		return nil
-	case obj := <-o.objChan:
-		return obj
-	}
+	return <-o.objChan
 }
 
 // Count returns total number of objects that match filter of the selector.

scenarios/preset/helpers/aws_cli.py

@@ -4,16 +4,15 @@ from helpers.cmd import execute_cmd, log
 
 
 def create_bucket(endpoint, versioning, location, acl, no_verify_ssl):
-    configuration = ""
     if location:
-        configuration = f"--create-bucket-configuration 'LocationConstraint={location}'"
+        location = f"--create-bucket-configuration 'LocationConstraint={location}'"
     if acl:
         acl = f"--acl {acl}"
 
     bucket_name = str(uuid.uuid4())
     no_verify_ssl_str = "--no-verify-ssl" if no_verify_ssl else ""
     cmd_line = f"aws {no_verify_ssl_str} s3api create-bucket --bucket {bucket_name} " \
-               f"--endpoint {endpoint} {configuration} {acl} "
+               f"--endpoint {endpoint} {location} {acl} "
     cmd_line_ver = f"aws {no_verify_ssl_str} s3api put-bucket-versioning --bucket {bucket_name} " \
                    f"--versioning-configuration Status=Enabled --endpoint {endpoint} {acl} "
 
@@ -34,7 +33,7 @@ def create_bucket(endpoint, versioning, location, acl, no_verify_ssl):
         else:
             log(f"Bucket versioning has been applied for bucket {bucket_name}", endpoint)
     
-    log(f"Created bucket: {bucket_name} ({location})", endpoint)
+    log(f"Created bucket: {bucket_name}", endpoint)
     return bucket_name
 
 

scenarios/preset/helpers/frostfs_cli.py

@@ -1,8 +1,8 @@
 import re
 from helpers.cmd import execute_cmd, log
 
-def create_container(endpoint, policy, container_creation_retry, wallet_path, config, acl, local=False, retry=0):
-    if retry > int(container_creation_retry):
+def create_container(endpoint, policy, wallet_path, config, acl, local=False, depth=0):
+    if depth > 20:
         raise ValueError(f"unable to create container: too many unsuccessful attempts")
 
     if wallet_path:
@@ -34,7 +34,7 @@ def create_container(endpoint, policy, container_creation_retry, wallet_path, co
         raise ValueError(f"no CID was parsed from command output:\t{fst_str}")
     cid = splitted[1]
 
-    log(f"Created container: {cid} ({policy})", endpoint)
+    log(f"Created container {cid}", endpoint)
 
     if not local:
         return cid
@@ -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, depth + 1)
 
 
 def upload_object(container, payload_filepath, endpoint, wallet_file, wallet_config):

scenarios/preset/preset_grpc.py

@@ -15,20 +15,18 @@ from helpers.frostfs_cli import create_container, upload_object
 ERROR_WRONG_CONTAINERS_COUNT = 1
 ERROR_WRONG_OBJECTS_COUNT = 2
 MAX_WORKERS = 50
-DEFAULT_POLICY = "REP 2 IN X CBF 2 SELECT 2 FROM * AS X"
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--size', help='Upload objects size in kb')
 parser.add_argument('--containers', help='Number of containers to create')
-parser.add_argument('--retry', default=20, help='Maximum number of retries to create a container')
 parser.add_argument('--out', help='JSON file with output')
 parser.add_argument('--preload_obj', help='Number of pre-loaded objects')
 parser.add_argument('--wallet', help='Wallet file path')
 parser.add_argument('--config', help='Wallet config file path')
 parser.add_argument(
     "--policy",
-    help=f"Container placement policy. Default is {DEFAULT_POLICY}",
-    action="append"
+    help="Container placement policy",
+    default="REP 2 IN X CBF 2 SELECT 2 FROM * AS X"
 )
 parser.add_argument('--endpoint', help='Nodes addresses separated by comma.')
 parser.add_argument('--update', help='Save existed containers')
@@ -48,10 +46,7 @@ def main():
     objects_list = []
 
     endpoints = args.endpoint.split(',')
-    if not args.policy:
-        args.policy = [DEFAULT_POLICY]
 
-    container_creation_retry = args.retry
     wallet = args.wallet
     wallet_config = args.config
     workers = int(args.workers)
@@ -68,9 +63,9 @@ def main():
         containers_count = int(args.containers)
         print(f"Create containers: {containers_count}")
         with ProcessPoolExecutor(max_workers=min(MAX_WORKERS, workers)) as executor:
-            containers_runs = [executor.submit(create_container, endpoint, policy, container_creation_retry, wallet, wallet_config, args.acl, args.local)
-                               for _, endpoint, policy in 
-                               zip(range(containers_count), cycle(endpoints), cycle(args.policy))]
+            containers_runs = [executor.submit(create_container, endpoint, args.policy, wallet, wallet_config, args.acl, args.local)
+                               for _, endpoint in 
+                               zip(range(containers_count), cycle(endpoints))]
 
         for run in containers_runs:
             container_id = run.result()

scenarios/preset/preset_s3.py

@@ -11,11 +11,6 @@ from concurrent.futures import ProcessPoolExecutor
 from helpers.cmd import random_payload
 from helpers.aws_cli import create_bucket, upload_object
 
-ERROR_WRONG_CONTAINERS_COUNT = 1
-ERROR_WRONG_OBJECTS_COUNT = 2
-MAX_WORKERS = 50
-DEFAULT_LOCATION = ""
-
 parser = argparse.ArgumentParser()
 
 parser.add_argument('--size', help='Upload objects size in kb.')
@@ -25,7 +20,7 @@ parser.add_argument('--preload_obj', help='Number of pre-loaded objects.')
 parser.add_argument('--endpoint', help='S3 Gateways addresses separated by comma.')
 parser.add_argument('--update', help='True/False, False by default. Save existed buckets from target file (--out). '
                                      'New buckets will not be created.')
-parser.add_argument('--location', help=f'AWS location constraint. Default is "{DEFAULT_LOCATION}"', action="append")
+parser.add_argument('--location', help='AWS location. Will be empty, if has not be declared.', default="")
 parser.add_argument('--versioning', help='True/False, False by default.')
 parser.add_argument('--ignore-errors', help='Ignore preset errors', action='store_true')
 parser.add_argument('--no-verify-ssl', help='Ignore SSL verifications', action='store_true')
@@ -37,6 +32,10 @@ parser.add_argument('--acl', help='Bucket ACL. Default is private. Expected valu
 args = parser.parse_args()
 print(args)
 
+ERROR_WRONG_CONTAINERS_COUNT = 1
+ERROR_WRONG_OBJECTS_COUNT = 2
+MAX_WORKERS = 50
+
 def main():
     buckets = []
     objects_list = []
@@ -44,8 +43,6 @@ def main():
     no_verify_ssl = args.no_verify_ssl
 
     endpoints = args.endpoint.split(',')
-    if not args.location:
-        args.location = [DEFAULT_LOCATION]
 
     workers = int(args.workers)
     objects_per_bucket = int(args.preload_obj)
@@ -62,9 +59,9 @@ def main():
         print(f"Create buckets: {buckets_count}")
 
         with ProcessPoolExecutor(max_workers=min(MAX_WORKERS, workers)) as executor:
-            buckets_runs = [executor.submit(create_bucket, endpoint, args.versioning, location, args.acl, no_verify_ssl) 
-                            for _, endpoint, location in 
-                            zip(range(buckets_count), cycle(endpoints), cycle(args.location))]
+            buckets_runs = [executor.submit(create_bucket, endpoint, args.versioning, args.location, args.acl, no_verify_ssl) 
+                            for _, endpoint in 
+                            zip(range(buckets_count), cycle(endpoints))]
 
         for run in buckets_runs:
             bucket_name = run.result()

scenarios/s3.js

@@ -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) {
@@ -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_dar.js

@@ -71,23 +71,11 @@ if (write_vu_count > 0) {
     };
 }
 
-const read_vu_count = parseInt(__ENV.READERS || '0');
-if (read_vu_count > 0) {
-    scenarios.read = {
-        executor : 'constant-vus',
-        vus : read_vu_count,
-        duration : `${duration}s`,
-        exec : 'obj_read',
-        gracefulStop : '5s',
-    };
-}
-
 const delete_age = __ENV.DELETE_AGE ? parseInt(__ENV.DELETE_AGE) : undefined;
 let obj_to_delete_selector = undefined;
 let obj_to_delete_exit_on_null = undefined;
-
-if (registry_enabled ) {
-    obj_to_delete_exit_on_null = (write_vu_count == 0) && (read_vu_count == 0)
+if (registry_enabled && delete_age) {
+    obj_to_delete_exit_on_null = write_vu_count == 0;
 
     let constructor = obj_to_delete_exit_on_null ? registry.getOneshotSelector
         : registry.getSelector;
@@ -100,7 +88,16 @@ if (registry_enabled ) {
             });
 }
 
-
+const read_vu_count = parseInt(__ENV.READERS || '0');
+if (read_vu_count > 0) {
+    scenarios.read = {
+        executor : 'constant-vus',
+        vus : read_vu_count,
+        duration : `${duration}s`,
+        exec : 'obj_read',
+        gracefulStop : '5s',
+    };
+}
 
 const delete_vu_count = parseInt(__ENV.DELETERS || '0');
 if (delete_vu_count > 0) {