.docker/Dockerfile.adm

@@ -1,4 +1,4 @@
-FROM golang:1.23 AS builder
+FROM golang:1.22 AS builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.ci

@@ -1,4 +1,4 @@
-FROM golang:1.23
+FROM golang:1.22
 
 WORKDIR /tmp
 

.docker/Dockerfile.cli

@@ -1,4 +1,4 @@
-FROM golang:1.23 AS builder
+FROM golang:1.22 AS builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.ir

@@ -1,4 +1,4 @@
-FROM golang:1.23 AS builder
+FROM golang:1.22 AS builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.storage

@@ -1,4 +1,4 @@
-FROM golang:1.23 AS builder
+FROM golang:1.22 AS builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.golangci.yml

@@ -87,7 +87,5 @@ linters:
     - perfsprint
     - testifylint
     - protogetter
-    - intrange
-    - tenv
   disable-all: true
   fast: false

.woodpecker/pre-commit.yml

@@ -0,0 +1,11 @@
+pipeline:
+  # Kludge for non-root containers under WoodPecker
+  fix-ownership:
+    image: alpine:latest
+    commands: chown -R 1234:1234 .
+
+  pre-commit:
+    image: git.frostfs.info/truecloudlab/frostfs-ci:v0.36
+    commands:
+      - export HOME="$(getent passwd $(id -u) | cut '-d:' -f6)"
+      - pre-commit run --hook-stage manual

Makefile

@@ -8,7 +8,7 @@ HUB_IMAGE ?= git.frostfs.info/truecloudlab/frostfs
 HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')"
 
 GO_VERSION ?= 1.22
-LINT_VERSION ?= 1.61.0
+LINT_VERSION ?= 1.60.3
 TRUECLOUDLAB_LINT_VERSION ?= 0.0.7
 PROTOC_VERSION ?= 25.0
 PROTOGEN_FROSTFS_VERSION ?= $(shell go list -f '{{.Version}}' -m git.frostfs.info/TrueCloudLab/frostfs-api-go/v2)
@@ -27,6 +27,12 @@ DIRS = $(BIN) $(RELEASE)
 CMDS = $(notdir $(basename $(wildcard cmd/frostfs-*)))
 BINS = $(addprefix $(BIN)/, $(CMDS))
 
+# .deb package versioning
+OS_RELEASE = $(shell lsb_release -cs)
+PKG_VERSION ?= $(shell echo $(VERSION) | sed "s/^v//" | \
+			sed -E "s/(.*)-(g[a-fA-F0-9]{6,8})(.*)/\1\3~\2/" | \
+			sed "s/-/~/")-${OS_RELEASE}
+
 OUTPUT_LINT_DIR ?= $(abspath $(BIN))/linters
 LINT_DIR = $(OUTPUT_LINT_DIR)/golangci-lint-$(LINT_VERSION)-v$(TRUECLOUDLAB_LINT_VERSION)
 TMP_DIR := .cache
@@ -52,7 +58,7 @@ LOCODE_DB_PATH=$(abspath ./.cache/locode_db)
 LOCODE_DB_VERSION=v0.4.0
 
 .PHONY: help all images dep clean fmts fumpt imports test lint docker/lint
-		prepare-release pre-commit unpre-commit
+		prepare-release debpackage pre-commit unpre-commit
 
 # To build a specific binary, use it's name prefix with bin/ as a target
 # For example `make bin/frostfs-node` will build only storage node binary
@@ -257,6 +263,19 @@ clean:
 	rm -rf $(BIN)
 	rm -rf $(RELEASE)
 
+# Package for Debian
+debpackage:
+	dch -b --package frostfs-node \
+			--controlmaint \
+			--newversion $(PKG_VERSION) \
+			--distribution $(OS_RELEASE) \
+			"Please see CHANGELOG.md for code changes for $(VERSION)"
+	dpkg-buildpackage --no-sign -b
+
+# Cleanup deb package build directories
+debclean:
+	dh clean
+
 # Download locode database
 locode-download:
 	mkdir -p $(TMP_DIR)

cmd/frostfs-adm/internal/modules/config/config.go

@@ -128,7 +128,7 @@ func generateConfigExample(appDir string, credSize int) (string, error) {
 	tmpl.AlphabetDir = filepath.Join(appDir, "alphabet-wallets")
 
 	var i innerring.GlagoliticLetter
-	for i = range innerring.GlagoliticLetter(credSize) {
+	for i = 0; i < innerring.GlagoliticLetter(credSize); i++ {
 		tmpl.Glagolitics = append(tmpl.Glagolitics, i.String())
 	}
 

cmd/frostfs-adm/internal/modules/morph/container/container.go

@@ -139,12 +139,13 @@ func dumpContainers(cmd *cobra.Command, _ []string) error {
 func dumpSingleContainer(bw *io.BufBinWriter, ch util.Uint160, inv *invoker.Invoker, id []byte) (*Container, error) {
 	bw.Reset()
 	emit.AppCall(bw.BinWriter, ch, "get", callflag.All, id)
+	emit.AppCall(bw.BinWriter, ch, "eACL", callflag.All, id)
 	res, err := inv.Run(bw.Bytes())
 	if err != nil {
 		return nil, fmt.Errorf("can't get container info: %w", err)
 	}
-	if len(res.Stack) != 1 {
+	if len(res.Stack) != 2 {
-		return nil, fmt.Errorf("%w: expected 1 items on stack", errInvalidContainerResponse)
+		return nil, fmt.Errorf("%w: expected 2 items on stack", errInvalidContainerResponse)
 	}
 
 	cnt := new(Container)
@@ -153,6 +154,14 @@ func dumpSingleContainer(bw *io.BufBinWriter, ch util.Uint160, inv *invoker.Invo
 		return nil, fmt.Errorf("%w: %v", errInvalidContainerResponse, err)
 	}
 
+	ea := new(EACL)
+	err = ea.FromStackItem(res.Stack[1])
+	if err != nil {
+		return nil, fmt.Errorf("%w: %v", errInvalidContainerResponse, err)
+	}
+	if len(ea.Value) != 0 {
+		cnt.EACL = ea
+	}
 	return cnt, nil
 }
 
@@ -249,6 +258,10 @@ func restoreOrPutContainers(containers []Container, isOK func([]byte) bool, cmd
 func putContainer(bw *io.BufBinWriter, ch util.Uint160, cnt Container) {
 	emit.AppCall(bw.BinWriter, ch, "put", callflag.All,
 		cnt.Value, cnt.Signature, cnt.PublicKey, cnt.Token)
+	if ea := cnt.EACL; ea != nil {
+		emit.AppCall(bw.BinWriter, ch, "setEACL", callflag.All,
+			ea.Value, ea.Signature, ea.PublicKey, ea.Token)
+	}
 }
 
 func isContainerRestored(cmd *cobra.Command, wCtx *helper.InitializeContext, containerHash util.Uint160, bw *io.BufBinWriter, hashValue util.Uint256) (bool, error) {
@@ -309,6 +322,15 @@ type Container struct {
 	Signature []byte `json:"signature"`
 	PublicKey []byte `json:"public_key"`
 	Token     []byte `json:"token"`
+	EACL      *EACL  `json:"eacl"`
+}
+
+// EACL represents extended ACL struct in contract storage.
+type EACL struct {
+	Value     []byte `json:"value"`
+	Signature []byte `json:"signature"`
+	PublicKey []byte `json:"public_key"`
+	Token     []byte `json:"token"`
 }
 
 // ToStackItem implements stackitem.Convertible.
@@ -355,6 +377,50 @@ func (c *Container) FromStackItem(item stackitem.Item) error {
 	return nil
 }
 
+// ToStackItem implements stackitem.Convertible.
+func (c *EACL) ToStackItem() (stackitem.Item, error) {
+	return stackitem.NewStruct([]stackitem.Item{
+		stackitem.NewByteArray(c.Value),
+		stackitem.NewByteArray(c.Signature),
+		stackitem.NewByteArray(c.PublicKey),
+		stackitem.NewByteArray(c.Token),
+	}), nil
+}
+
+// FromStackItem implements stackitem.Convertible.
+func (c *EACL) FromStackItem(item stackitem.Item) error {
+	arr, ok := item.Value().([]stackitem.Item)
+	if !ok || len(arr) != 4 {
+		return errors.New("invalid stack item type")
+	}
+
+	value, err := arr[0].TryBytes()
+	if err != nil {
+		return errors.New("invalid eACL value")
+	}
+
+	sig, err := arr[1].TryBytes()
+	if err != nil {
+		return errors.New("invalid eACL signature")
+	}
+
+	pub, err := arr[2].TryBytes()
+	if err != nil {
+		return errors.New("invalid eACL public key")
+	}
+
+	tok, err := arr[3].TryBytes()
+	if err != nil {
+		return errors.New("invalid eACL token")
+	}
+
+	c.Value = value
+	c.Signature = sig
+	c.PublicKey = pub
+	c.Token = tok
+	return nil
+}
+
 // getCIDFilterFunc returns filtering function for container IDs.
 // Raw byte slices are used because it works with structures returned
 // from contract.

cmd/frostfs-adm/internal/modules/morph/generate/generate_test.go

@@ -63,7 +63,7 @@ func TestGenerateAlphabet(t *testing.T) {
 	buf.Reset()
 	v.Set(commonflags.AlphabetWalletsFlag, walletDir)
 	require.NoError(t, GenerateAlphabetCmd.Flags().Set(commonflags.AlphabetSizeFlag, strconv.FormatUint(size, 10)))
-	for i := range uint64(size) {
+	for i := uint64(0); i < size; i++ {
 		buf.WriteString(strconv.FormatUint(i, 10) + "\r")
 	}
 

cmd/frostfs-adm/internal/modules/morph/helper/contract.go

@@ -166,6 +166,5 @@ func DeployNNS(c *InitializeContext, method string) error {
 		return fmt.Errorf("can't send deploy transaction: %w", err)
 	}
 
-	c.Command.Println("NNS hash:", invokeHash.StringLE())
 	return c.AwaitTx()
 }

cmd/frostfs-adm/internal/modules/morph/nns/record.go

@@ -47,19 +47,6 @@ func initDelRecordsCmd() {
 	_ = cobra.MarkFlagRequired(delRecordsCmd.Flags(), nnsRecordTypeFlag)
 }
 
-func initDelRecordCmd() {
-	Cmd.AddCommand(delRecordCmd)
-	delRecordCmd.Flags().StringP(commonflags.EndpointFlag, commonflags.EndpointFlagShort, "", commonflags.EndpointFlagDesc)
-	delRecordCmd.Flags().String(commonflags.AlphabetWalletsFlag, "", commonflags.AlphabetWalletsFlagDesc)
-	delRecordCmd.Flags().String(nnsNameFlag, "", nnsNameFlagDesc)
-	delRecordCmd.Flags().String(nnsRecordTypeFlag, "", nnsRecordTypeFlagDesc)
-	delRecordCmd.Flags().String(nnsRecordDataFlag, "", nnsRecordDataFlagDesc)
-
-	_ = cobra.MarkFlagRequired(delRecordCmd.Flags(), nnsNameFlag)
-	_ = cobra.MarkFlagRequired(delRecordCmd.Flags(), nnsRecordTypeFlag)
-	_ = cobra.MarkFlagRequired(delRecordCmd.Flags(), nnsRecordDataFlag)
-}
-
 func addRecord(cmd *cobra.Command, _ []string) {
 	c, actor, _ := getRPCClient(cmd)
 	name, _ := cmd.Flags().GetString(nnsNameFlag)
@@ -128,22 +115,6 @@ func delRecords(cmd *cobra.Command, _ []string) {
 	cmd.Println("Records removed successfully")
 }
 
-func delRecord(cmd *cobra.Command, _ []string) {
-	c, actor, _ := getRPCClient(cmd)
-	name, _ := cmd.Flags().GetString(nnsNameFlag)
-	data, _ := cmd.Flags().GetString(nnsRecordDataFlag)
-	recordType, _ := cmd.Flags().GetString(nnsRecordTypeFlag)
-	typ, err := getRecordType(recordType)
-	commonCmd.ExitOnErr(cmd, "unable to parse record type: %w", err)
-	h, vub, err := c.DeleteRecord(name, typ, data)
-	commonCmd.ExitOnErr(cmd, "unable to delete record: %w", err)
-
-	cmd.Println("Waiting for transaction to persist...")
-	_, err = actor.Wait(h, vub, err)
-	commonCmd.ExitOnErr(cmd, "delete records error: %w", err)
-	cmd.Println("Record removed successfully")
-}
-
 func getRecordType(recordType string) (*big.Int, error) {
 	switch strings.ToUpper(recordType) {
 	case "A":

cmd/frostfs-adm/internal/modules/morph/nns/root.go

@@ -95,15 +95,6 @@ var (
 		},
 		Run: delRecords,
 	}
-	delRecordCmd = &cobra.Command{
-		Use:   "delete-record",
-		Short: "Removes domain record with the specified type and data",
-		PreRun: func(cmd *cobra.Command, _ []string) {
-			_ = viper.BindPFlag(commonflags.EndpointFlag, cmd.Flags().Lookup(commonflags.EndpointFlag))
-			_ = viper.BindPFlag(commonflags.AlphabetWalletsFlag, cmd.Flags().Lookup(commonflags.AlphabetWalletsFlag))
-		},
-		Run: delRecord,
-	}
 )
 
 func init() {
@@ -115,5 +106,4 @@ func init() {
 	initAddRecordCmd()
 	initGetRecordsCmd()
 	initDelRecordsCmd()
-	initDelRecordCmd()
 }

cmd/frostfs-cli/internal/client/client.go

@@ -659,7 +659,9 @@ func SearchObjects(ctx context.Context, prm SearchObjectsPrm) (*SearchObjectsRes
 
 	for {
 		n, ok = rdr.Read(buf)
-		list = append(list, buf[:n]...)
+		for i := range n {
+			list = append(list, buf[i])
+		}
 		if !ok {
 			break
 		}

cmd/frostfs-cli/internal/client/sdk.go

@@ -58,7 +58,6 @@ func GetSDKClient(ctx context.Context, cmd *cobra.Command, key *ecdsa.PrivateKey
 		GRPCDialOptions: []grpc.DialOption{
 			grpc.WithChainUnaryInterceptor(tracing.NewUnaryClientInteceptor()),
 			grpc.WithChainStreamInterceptor(tracing.NewStreamClientInterceptor()),
-			grpc.WithDefaultCallOptions(grpc.WaitForReady(true)),
 		},
 	}
 	if timeout := viper.GetDuration(commonflags.Timeout); timeout > 0 {

cmd/frostfs-cli/modules/ape_manager/add_chain.go

@@ -31,6 +31,7 @@ const (
 )
 
 const (
+	defaultNamespace = ""
 	namespaceTarget  = "namespace"
 	containerTarget  = "container"
 	userTarget       = "user"

cmd/frostfs-cli/modules/object/nodes.go

@@ -195,7 +195,7 @@ func flattenComplexMembersIfECContainer(cmd *cobra.Command, cnrID cid.ID, member
 	prmHead.SetRawFlag(true) // to get an error instead of whole object
 
 	eg, egCtx := errgroup.WithContext(cmd.Context())
-	for idx := range members {
+	for idx := range len(members) {
 		partObjID := members[idx]
 
 		eg.Go(func() error {

cmd/frostfs-cli/modules/root.go

@@ -114,15 +114,13 @@ func initConfig() {
 	} else {
 		// Find home directory.
 		home, err := homedir.Dir()
-		if err != nil {
+		commonCmd.ExitOnErr(rootCmd, "", err)
-			common.PrintVerbose(rootCmd, "Get homedir: %s", err)
+
-		} else {
 		// Search config in `$HOME/.config/frostfs-cli/` with name "config.yaml"
 		viper.AddConfigPath(filepath.Join(home, ".config", "frostfs-cli"))
 		viper.SetConfigName("config")
 		viper.SetConfigType("yaml")
 	}
-	}
 
 	viper.SetEnvPrefix(envPrefix)
 	viper.AutomaticEnv() // read in environment variables that match

cmd/frostfs-cli/modules/tree/add.go

@@ -30,6 +30,8 @@ func initAddCmd() {
 	ff := addCmd.Flags()
 	ff.StringSlice(metaFlagKey, nil, "Meta pairs in the form of Key1=[0x]Value1,Key2=[0x]Value2")
 	ff.Uint64(parentIDFlagKey, 0, "Parent node ID")
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 }
 
 func add(cmd *cobra.Command, _ []string) {

cmd/frostfs-cli/modules/tree/add_by_path.go

@@ -36,6 +36,7 @@ func initAddByPathCmd() {
 	ff.String(pathFlagKey, "", "Path to a node")
 	ff.StringSlice(metaFlagKey, nil, "Meta pairs in the form of Key1=[0x]Value1,Key2=[0x]Value2")
 
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 	_ = cobra.MarkFlagRequired(ff, pathFlagKey)
 }
 

cmd/frostfs-cli/modules/tree/client.go

@@ -2,7 +2,6 @@ package tree
 
 import (
 	"context"
-	"fmt"
 	"strings"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
@@ -21,13 +20,7 @@ import (
 // after making Tree API public.
 func _client() (tree.TreeServiceClient, error) {
 	var netAddr network.Address
-
+	err := netAddr.FromString(viper.GetString(commonflags.RPC))
-	rpcEndpoint := viper.GetString(commonflags.RPC)
-	if rpcEndpoint == "" {
-		return nil, fmt.Errorf("%s is not defined", commonflags.RPC)
-	}
-
-	err := netAddr.FromString(rpcEndpoint)
 	if err != nil {
 		return nil, err
 	}
@@ -41,7 +34,6 @@ func _client() (tree.TreeServiceClient, error) {
 			metrics.NewStreamClientInterceptor(),
 			tracing.NewStreamClientInterceptor(),
 		),
-		grpc.WithDefaultCallOptions(grpc.WaitForReady(true)),
 	}
 
 	if !strings.HasPrefix(netAddr.URIAddr(), "grpcs:") {

cmd/frostfs-cli/modules/tree/get_by_path.go

@@ -36,6 +36,8 @@ func initGetByPathCmd() {
 	ff.String(pathFlagKey, "", "Path to a node")
 
 	ff.Bool(latestOnlyFlagKey, false, "Look only for the latest version of a node")
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 }
 
 func getByPath(cmd *cobra.Command, _ []string) {

cmd/frostfs-cli/modules/tree/get_op_log.go

@@ -30,6 +30,8 @@ func initGetOpLogCmd() {
 	ff := getOpLogCmd.Flags()
 	ff.Uint64(heightFlagKey, 0, "Height to start with")
 	ff.Uint64(countFlagKey, 10, "Logged operations count")
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 }
 
 func getOpLog(cmd *cobra.Command, _ []string) {

cmd/frostfs-cli/modules/tree/healthcheck.go

@@ -20,6 +20,8 @@ var healthcheckCmd = &cobra.Command{
 
 func initHealthcheckCmd() {
 	commonflags.Init(healthcheckCmd)
+	ff := healthcheckCmd.Flags()
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 }
 
 func healthcheck(cmd *cobra.Command, _ []string) {

cmd/frostfs-cli/modules/tree/list.go

@@ -26,6 +26,8 @@ func initListCmd() {
 	ff := listCmd.Flags()
 	ff.String(commonflags.CIDFlag, "", commonflags.CIDFlagUsage)
 	_ = listCmd.MarkFlagRequired(commonflags.CIDFlag)
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 }
 
 func list(cmd *cobra.Command, _ []string) {

cmd/frostfs-cli/modules/tree/move.go

@@ -33,6 +33,8 @@ func initMoveCmd() {
 
 	_ = getSubtreeCmd.MarkFlagRequired(nodeIDFlagKey)
 	_ = getSubtreeCmd.MarkFlagRequired(parentIDFlagKey)
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 }
 
 func move(cmd *cobra.Command, _ []string) {

cmd/frostfs-cli/modules/tree/remove.go

@@ -29,6 +29,8 @@ func initRemoveCmd() {
 	ff.Uint64(nodeIDFlagKey, 0, "Node ID.")
 
 	_ = getSubtreeCmd.MarkFlagRequired(nodeIDFlagKey)
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 }
 
 func remove(cmd *cobra.Command, _ []string) {

cmd/frostfs-cli/modules/tree/subtree.go

@@ -34,6 +34,8 @@ func initGetSubtreeCmd() {
 
 	_ = getSubtreeCmd.MarkFlagRequired(commonflags.CIDFlag)
 	_ = getSubtreeCmd.MarkFlagRequired(treeIDFlagKey)
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
 }
 
 func getSubTree(cmd *cobra.Command, _ []string) {

cmd/frostfs-ir/defaults.go

@@ -48,8 +48,6 @@ func defaultConfiguration(cfg *viper.Viper) {
 	cfg.SetDefault("node.kludge_compatibility_mode", false)
 
 	cfg.SetDefault("audit.enabled", false)
-
-	setMultinetDefaults(cfg)
 }
 
 func setControlDefaults(cfg *viper.Viper) {
@@ -133,11 +131,3 @@ func setMorphDefaults(cfg *viper.Viper) {
 	cfg.SetDefault("morph.validators", []string{})
 	cfg.SetDefault("morph.switch_interval", 2*time.Minute)
 }
-
-func setMultinetDefaults(cfg *viper.Viper) {
-	cfg.SetDefault("multinet.enabled", false)
-	cfg.SetDefault("multinet.balancer", "")
-	cfg.SetDefault("multinet.restrict", false)
-	cfg.SetDefault("multinet.fallback_delay", "0s")
-	cfg.SetDefault("multinet.subnets", "")
-}

cmd/frostfs-lens/internal/schema/metabase/records/string.go

@@ -38,7 +38,7 @@ func (r *ContainerVolumeRecord) String() string {
 
 func (r *LockedRecord) String() string {
 	return fmt.Sprintf(
-		"Object OID %s %c Lockers [%d]OID {...}",
+		"Locker OID %s %c Locked [%d]OID {...}",
 		common.FormatSimple(fmt.Sprintf("%-44s", r.id), tcell.ColorAqua),
 		tview.Borders.Vertical,
 		len(r.ids),

cmd/frostfs-lens/internal/schema/metabase/records/util.go

@@ -11,7 +11,7 @@ func DecodeOIDs(data []byte) ([]oid.ID, error) {
 	size := r.ReadVarUint()
 	oids := make([]oid.ID, size)
 
-	for i := range size {
+	for i := uint64(0); i < size; i++ {
 		if err := oids[i].Decode(r.ReadVarBytes()); err != nil {
 			return nil, err
 		}

cmd/frostfs-node/accounting.go

@@ -13,7 +13,9 @@ import (
 )
 
 func initAccountingService(ctx context.Context, c *cfg) {
-	c.initMorphComponents(ctx)
+	if c.cfgMorph.client == nil {
+		initMorphComponents(ctx, c)
+	}
 
 	balanceMorphWrapper, err := balance.NewFromMorph(c.cfgMorph.client, c.cfgAccounting.scriptHash, 0)
 	fatalOnErr(err)

cmd/frostfs-node/config.go

@@ -26,14 +26,12 @@ import (
 	fstreeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/fstree"
 	loggerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger"
 	morphconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/multinet"
 	nodeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node"
 	objectconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/object"
 	replicatorconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator"
 	tracingconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tracing"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/metrics"
-	internalNet "git.frostfs.info/TrueCloudLab/frostfs-node/internal/net"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/ape/chainbase"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
 	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
@@ -58,7 +56,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control"
 	objectService "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object"
 	getsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/tombstone"
 	tsourse "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/tombstone/source"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator"
@@ -110,7 +107,6 @@ type applicationConfiguration struct {
 
 	ObjectCfg struct {
 		tombstoneLifetime uint64
-		priorityMetrics   []placement.Metric
 	}
 
 	EngineCfg struct {
@@ -234,15 +230,6 @@ func (a *applicationConfiguration) readConfig(c *config.Config) error {
 	// Object
 
 	a.ObjectCfg.tombstoneLifetime = objectconfig.TombstoneLifetime(c)
-	var pm []placement.Metric
-	for _, raw := range objectconfig.Get(c).Priority() {
-		m, err := placement.ParseMetric(raw)
-		if err != nil {
-			return err
-		}
-		pm = append(pm, m)
-	}
-	a.ObjectCfg.priorityMetrics = pm
 
 	// Storage Engine
 
@@ -449,8 +436,6 @@ type shared struct {
 	metricsCollector *metrics.NodeMetrics
 
 	metricsSvc *objectService.MetricCollector
-
-	dialerSource *internalNet.DialerSource
 }
 
 // dynamicConfiguration stores parameters of the
@@ -586,9 +571,6 @@ func (c *cfgGRPC) dropConnection(endpoint string) {
 }
 
 type cfgMorph struct {
-	initialized bool
-	guard       sync.Mutex
-
 	client *client.Client
 
 	notaryEnabled bool
@@ -778,18 +760,12 @@ func initShared(appCfg *config.Config, key *keys.PrivateKey, netState *networkSt
 	persistate, err := state.NewPersistentStorage(nodeconfig.PersistentState(appCfg).Path())
 	fatalOnErr(err)
 
-	nodeMetrics := metrics.NewNodeMetrics()
-
-	ds, err := internalNet.NewDialerSource(internalNetConfig(appCfg, nodeMetrics.MultinetMetrics()))
-	fatalOnErr(err)
-
 	cacheOpts := cache.ClientCacheOpts{
 		DialTimeout:      apiclientconfig.DialTimeout(appCfg),
 		StreamTimeout:    apiclientconfig.StreamTimeout(appCfg),
 		Key:              &key.PrivateKey,
 		AllowExternal:    apiclientconfig.AllowExternal(appCfg),
 		ReconnectTimeout: apiclientconfig.ReconnectTimeout(appCfg),
-		DialerSource:     ds,
 	}
 
 	return shared{
@@ -801,29 +777,10 @@ func initShared(appCfg *config.Config, key *keys.PrivateKey, netState *networkSt
 		bgClientCache:    cache.NewSDKClientCache(cacheOpts),
 		putClientCache:   cache.NewSDKClientCache(cacheOpts),
 		persistate:       persistate,
-		metricsCollector: nodeMetrics,
+		metricsCollector: metrics.NewNodeMetrics(),
-		dialerSource:     ds,
 	}
 }
 
-func internalNetConfig(appCfg *config.Config, m metrics.MultinetMetrics) internalNet.Config {
-	result := internalNet.Config{
-		Enabled:       multinet.Enabled(appCfg),
-		Balancer:      multinet.Balancer(appCfg),
-		Restrict:      multinet.Restrict(appCfg),
-		FallbackDelay: multinet.FallbackDelay(appCfg),
-		Metrics:       m,
-	}
-	sn := multinet.Subnets(appCfg)
-	for _, s := range sn {
-		result.Subnets = append(result.Subnets, internalNet.Subnet{
-			Prefix:    s.Mask,
-			SourceIPs: s.SourceIPs,
-		})
-	}
-	return result
-}
-
 func initNetmap(appCfg *config.Config, netState *networkState, relayOnly bool) cfgNetmap {
 	netmapWorkerPool, err := ants.NewPool(notificationHandlerPoolSize)
 	fatalOnErr(err)
@@ -1190,15 +1147,17 @@ func initObjectPool(cfg *config.Config) (pool cfgObjectRoutines) {
 	return pool
 }
 
-func (c *cfg) LocalNodeInfo() *netmap.NodeInfo {
+func (c *cfg) LocalNodeInfo() (*netmapV2.NodeInfo, error) {
-	var res netmap.NodeInfo
+	var res netmapV2.NodeInfo
+
 	ni, ok := c.cfgNetmap.state.getNodeInfo()
 	if ok {
-		res = ni
+		ni.WriteToV2(&res)
 	} else {
-		res = c.cfgNodeInfo.localInfo
+		c.cfgNodeInfo.localInfo.WriteToV2(&res)
 	}
-	return &res
+
+	return &res, nil
 }
 
 // setContractNodeInfo rewrites local node info from the FrostFS network map.
@@ -1377,11 +1336,6 @@ func (c *cfg) reloadConfig(ctx context.Context) {
 		}
 	}
 
-	if err := c.dialerSource.Update(internalNetConfig(c.appCfg, c.metricsCollector.MultinetMetrics())); err != nil {
-		c.log.Error(logs.FailedToUpdateMultinetConfiguration, zap.Error(err))
-		return
-	}
-
 	c.log.Info(logs.FrostFSNodeConfigurationHasBeenReloadedSuccessfully)
 }
 
@@ -1467,7 +1421,10 @@ func (c *cfg) createTombstoneSource() *tombstone.ExpirationChecker {
 
 func (c *cfg) createContainerInfoProvider(ctx context.Context) container.InfoProvider {
 	return container.NewInfoProvider(func() (container.Source, error) {
-		c.initMorphComponents(ctx)
+		// threadsafe: called on init or on sighup when morph initialized
+		if c.cfgMorph.client == nil {
+			initMorphComponents(ctx, c)
+		}
 		cc, err := containerClient.NewFromMorph(c.cfgMorph.client, c.cfgContainer.scriptHash, 0, containerClient.TryNotary())
 		if err != nil {
 			return nil, err

cmd/frostfs-node/config/calls_test.go

@@ -1,6 +1,7 @@
 package config_test
 
 import (
+	"os"
 	"strings"
 	"testing"
 
@@ -37,7 +38,8 @@ func TestConfigEnv(t *testing.T) {
 
 	envName := strings.ToUpper(
 		strings.Join([]string{config.EnvPrefix, section, name}, configViper.EnvSeparator))
-	t.Setenv(envName, value)
+	err := os.Setenv(envName, value)
+	require.NoError(t, err)
 
 	c := configtest.EmptyConfig()
 

cmd/frostfs-node/config/multinet/config.go

@@ -1,62 +0,0 @@
-package multinet
-
-import (
-	"strconv"
-	"time"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
-)
-
-const (
-	subsection = "multinet"
-
-	FallbackDelayDefault = 300 * time.Millisecond
-)
-
-// Enabled returns the  value of "enabled" config parameter from "multinet" section.
-func Enabled(c *config.Config) bool {
-	return config.BoolSafe(c.Sub(subsection), "enabled")
-}
-
-type Subnet struct {
-	Mask      string
-	SourceIPs []string
-}
-
-// Subnets returns the  value of "subnets" config parameter from "multinet" section.
-func Subnets(c *config.Config) []Subnet {
-	var result []Subnet
-	sub := c.Sub(subsection).Sub("subnets")
-	for i := 0; ; i++ {
-		s := sub.Sub(strconv.FormatInt(int64(i), 10))
-		mask := config.StringSafe(s, "mask")
-		if mask == "" {
-			break
-		}
-		sourceIPs := config.StringSliceSafe(s, "source_ips")
-		result = append(result, Subnet{
-			Mask:      mask,
-			SourceIPs: sourceIPs,
-		})
-	}
-	return result
-}
-
-// Balancer returns the  value of "balancer" config parameter from "multinet" section.
-func Balancer(c *config.Config) string {
-	return config.StringSafe(c.Sub(subsection), "balancer")
-}
-
-// Restrict returns the  value of "restrict" config parameter from "multinet" section.
-func Restrict(c *config.Config) bool {
-	return config.BoolSafe(c.Sub(subsection), "restrict")
-}
-
-// FallbackDelay returns the  value of "fallback_delay" config parameter from "multinet" section.
-func FallbackDelay(c *config.Config) time.Duration {
-	fd := config.DurationSafe(c.Sub(subsection), "fallback_delay")
-	if fd != 0 { // negative value means no fallback
-		return fd
-	}
-	return FallbackDelayDefault
-}

cmd/frostfs-node/config/multinet/config_test.go

@@ -1,52 +0,0 @@
-package multinet
-
-import (
-	"testing"
-	"time"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
-	configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestMultinetSection(t *testing.T) {
-	t.Run("defaults", func(t *testing.T) {
-		empty := configtest.EmptyConfig()
-		require.Equal(t, false, Enabled(empty))
-		require.Equal(t, ([]Subnet)(nil), Subnets(empty))
-		require.Equal(t, "", Balancer(empty))
-		require.Equal(t, false, Restrict(empty))
-		require.Equal(t, FallbackDelayDefault, FallbackDelay(empty))
-	})
-
-	const path = "../../../../config/example/node"
-
-	fileConfigTest := func(c *config.Config) {
-		require.Equal(t, true, Enabled(c))
-		require.Equal(t, []Subnet{
-			{
-				Mask: "192.168.219.174/24",
-				SourceIPs: []string{
-					"192.168.218.185",
-					"192.168.219.185",
-				},
-			},
-			{
-				Mask: "10.78.70.74/24",
-				SourceIPs: []string{
-					"10.78.70.185",
-					"10.78.71.185",
-				},
-			},
-		}, Subnets(c))
-		require.Equal(t, "roundrobin", Balancer(c))
-		require.Equal(t, false, Restrict(c))
-		require.Equal(t, 350*time.Millisecond, FallbackDelay(c))
-	}
-
-	configtest.ForEachFileType(path, fileConfigTest)
-
-	t.Run("ENV", func(t *testing.T) {
-		configtest.ForEnvFileType(t, path, fileConfigTest)
-	})
-}

cmd/frostfs-node/config/object/config.go

@@ -10,17 +10,10 @@ type PutConfig struct {
 	cfg *config.Config
 }
 
-// GetConfig is a wrapper over "get" config section which provides access
-// to object get pipeline configuration of object service.
-type GetConfig struct {
-	cfg *config.Config
-}
-
 const (
 	subsection = "object"
 
 	putSubsection = "put"
-	getSubsection = "get"
 
 	// PutPoolSizeDefault is a default value of routine pool size to
 	// process object.Put requests in object service.
@@ -63,16 +56,3 @@ func (g PutConfig) PoolSizeLocal() int {
 func (g PutConfig) SkipSessionTokenIssuerVerification() bool {
 	return config.BoolSafe(g.cfg, "skip_session_token_issuer_verification")
 }
-
-// Get returns structure that provides access to "get" subsection of
-// "object" section.
-func Get(c *config.Config) GetConfig {
-	return GetConfig{
-		c.Sub(subsection).Sub(getSubsection),
-	}
-}
-
-// Priority returns the value of "priority" config parameter.
-func (g GetConfig) Priority() []string {
-	return config.StringSliceSafe(g.cfg, "priority")
-}

cmd/frostfs-node/config/profiler/config.go

@@ -52,7 +52,7 @@ func Address(c *config.Config) string {
 	return AddressDefault
 }
 
-// BlockRate returns the value of "block_rate" config parameter
+// BlockRates returns the value of "block_rate" config parameter
 // from "pprof" section.
 func BlockRate(c *config.Config) int {
 	s := c.Sub(subsection)

cmd/frostfs-node/config/test/config.go

@@ -11,6 +11,8 @@ import (
 )
 
 func fromFile(path string) *config.Config {
+	os.Clearenv() // ENVs have priority over config files, so we do this in tests
+
 	return config.New(path, "", "")
 }
 
@@ -38,6 +40,15 @@ func ForEachFileType(pref string, f func(*config.Config)) {
 
 // ForEnvFileType creates config from `<pref>.env` file.
 func ForEnvFileType(t testing.TB, pref string, f func(*config.Config)) {
+	envs := os.Environ()
+	t.Cleanup(func() {
+		os.Clearenv()
+		for _, env := range envs {
+			keyValue := strings.Split(env, "=")
+			os.Setenv(keyValue[0], keyValue[1])
+		}
+	})
+
 	f(fromEnvFile(t, pref+".env"))
 }
 
@@ -62,6 +73,7 @@ func loadEnv(t testing.TB, path string) {
 
 		v = strings.Trim(v, `"`)
 
-		t.Setenv(k, v)
+		err = os.Setenv(k, v)
+		require.NoError(t, err, "can't set environment variable")
 	}
 }

cmd/frostfs-node/container.go

@@ -8,7 +8,6 @@ import (
 	containerGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container/grpc"
 	morphconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/metrics"
 	containerCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
 	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container"
@@ -43,7 +42,7 @@ func initContainerService(_ context.Context, c *cfg) {
 
 	cacheSize := morphconfig.FrostfsIDCacheSize(c.appCfg)
 	if cacheSize > 0 {
-		frostfsIDSubjectProvider = newMorphFrostfsIDCache(frostfsIDSubjectProvider, int(cacheSize), c.cfgMorph.cacheTTL, metrics.NewCacheMetrics("frostfs_id"))
+		frostfsIDSubjectProvider = newMorphFrostfsIDCache(frostfsIDSubjectProvider, int(cacheSize), c.cfgMorph.cacheTTL)
 	}
 
 	c.shared.frostfsidClient = frostfsIDSubjectProvider

cmd/frostfs-node/frostfsid.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"strings"
 	"time"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
@@ -10,99 +9,55 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/util"
 )
 
-type subjectWithError struct {
-	subject *client.Subject
-	err     error
-}
-
-type subjectExtWithError struct {
-	subject *client.SubjectExtended
-	err     error
-}
-
 type morphFrostfsIDCache struct {
 	subjProvider frostfsidcore.SubjectProvider
 
-	subjCache *expirable.LRU[util.Uint160, subjectWithError]
+	subjCache *expirable.LRU[util.Uint160, *client.Subject]
 
-	subjExtCache *expirable.LRU[util.Uint160, subjectExtWithError]
+	subjExtCache *expirable.LRU[util.Uint160, *client.SubjectExtended]
-
-	metrics cacheMetrics
 }
 
-func newMorphFrostfsIDCache(subjProvider frostfsidcore.SubjectProvider, size int, ttl time.Duration, metrics cacheMetrics) frostfsidcore.SubjectProvider {
+func newMorphFrostfsIDCache(subjProvider frostfsidcore.SubjectProvider, size int, ttl time.Duration) frostfsidcore.SubjectProvider {
 	return &morphFrostfsIDCache{
 		subjProvider: subjProvider,
 
-		subjCache: expirable.NewLRU(size, func(util.Uint160, subjectWithError) {}, ttl),
+		subjCache: expirable.NewLRU(size, func(util.Uint160, *client.Subject) {}, ttl),
 
-		subjExtCache: expirable.NewLRU(size, func(util.Uint160, subjectExtWithError) {}, ttl),
+		subjExtCache: expirable.NewLRU(size, func(util.Uint160, *client.SubjectExtended) {}, ttl),
-
-		metrics: metrics,
 	}
 }
 
 func (m *morphFrostfsIDCache) GetSubject(addr util.Uint160) (*client.Subject, error) {
-	hit := false
-	startedAt := time.Now()
-	defer func() {
-		m.metrics.AddMethodDuration("GetSubject", time.Since(startedAt), hit)
-	}()
-
 	result, found := m.subjCache.Get(addr)
 	if found {
-		hit = true
+		return result, nil
-		return result.subject, result.err
 	}
 
-	subj, err := m.subjProvider.GetSubject(addr)
+	result, err := m.subjProvider.GetSubject(addr)
 	if err != nil {
-		if m.isCacheableError(err) {
-			m.subjCache.Add(addr, subjectWithError{
-				err: err,
-			})
-		}
 		return nil, err
 	}
 
-	m.subjCache.Add(addr, subjectWithError{subject: subj})
+	m.subjCache.Add(addr, result)
-	return subj, nil
+	return result, nil
 }
 
 func (m *morphFrostfsIDCache) GetSubjectExtended(addr util.Uint160) (*client.SubjectExtended, error) {
-	hit := false
+	subjExt, found := m.subjExtCache.Get(addr)
-	startedAt := time.Now()
-	defer func() {
-		m.metrics.AddMethodDuration("GetSubjectExtended", time.Since(startedAt), hit)
-	}()
-
-	result, found := m.subjExtCache.Get(addr)
 	if found {
-		hit = true
-		return result.subject, result.err
-	}
-
-	subjExt, err := m.subjProvider.GetSubjectExtended(addr)
-	if err != nil {
-		if m.isCacheableError(err) {
-			m.subjExtCache.Add(addr, subjectExtWithError{
-				err: err,
-			})
-			m.subjCache.Add(addr, subjectWithError{
-				err: err,
-			})
-		}
-		return nil, err
-	}
-
-	m.subjExtCache.Add(addr, subjectExtWithError{subject: subjExt})
-	m.subjCache.Add(addr, subjectWithError{subject: subjectFromSubjectExtended(subjExt)})
-
 		return subjExt, nil
 	}
 
-func (m *morphFrostfsIDCache) isCacheableError(err error) bool {
+	var err error
-	return strings.Contains(err.Error(), frostfsidcore.SubjectNotFoundErrorMessage)
+	subjExt, err = m.subjProvider.GetSubjectExtended(addr)
+	if err != nil {
+		return nil, err
+	}
+
+	m.subjExtCache.Add(addr, subjExt)
+	m.subjCache.Add(addr, subjectFromSubjectExtended(subjExt))
+
+	return subjExt, nil
 }
 
 func subjectFromSubjectExtended(subjExt *client.SubjectExtended) *client.Subject {

cmd/frostfs-node/morph.go

@@ -28,18 +28,52 @@ const (
 	notaryDepositRetriesAmount = 300
 )
 
-func (c *cfg) initMorphComponents(ctx context.Context) {
+func initMorphComponents(ctx context.Context, c *cfg) {
-	c.cfgMorph.guard.Lock()
+	addresses := morphconfig.RPCEndpoint(c.appCfg)
-	defer c.cfgMorph.guard.Unlock()
+
-	if c.cfgMorph.initialized {
+	// Morph client stable-sorts endpoints by priority. Shuffle here to randomize
-		return
+	// order of endpoints with the same priority.
+	rand.Shuffle(len(addresses), func(i, j int) {
+		addresses[i], addresses[j] = addresses[j], addresses[i]
+	})
+
+	cli, err := client.New(ctx,
+		c.key,
+		client.WithDialTimeout(morphconfig.DialTimeout(c.appCfg)),
+		client.WithLogger(c.log),
+		client.WithMetrics(c.metricsCollector.MorphClientMetrics()),
+		client.WithEndpoints(addresses...),
+		client.WithConnLostCallback(func() {
+			c.internalErr <- errors.New("morph connection has been lost")
+		}),
+		client.WithSwitchInterval(morphconfig.SwitchInterval(c.appCfg)),
+		client.WithMorphCacheMetrics(c.metricsCollector.MorphCacheMetrics()),
+	)
+	if err != nil {
+		c.log.Info(logs.FrostFSNodeFailedToCreateNeoRPCClient,
+			zap.Any("endpoints", addresses),
+			zap.String("error", err.Error()),
+		)
+
+		fatalOnErr(err)
 	}
-	initMorphClient(ctx, c)
+
+	c.onShutdown(func() {
+		c.log.Info(logs.FrostFSNodeClosingMorphComponents)
+		cli.Close()
+	})
+
+	if err := cli.SetGroupSignerScope(); err != nil {
+		c.log.Info(logs.FrostFSNodeFailedToSetGroupSignerScopeContinueWithGlobal, zap.Error(err))
+	}
+
+	c.cfgMorph.client = cli
+	c.cfgMorph.notaryEnabled = cli.ProbeNotary()
 
 	lookupScriptHashesInNNS(c) // smart contract auto negotiation
 
 	if c.cfgMorph.notaryEnabled {
-		err := c.cfgMorph.client.EnableNotarySupport(
+		err = c.cfgMorph.client.EnableNotarySupport(
 			client.WithProxyContract(
 				c.cfgMorph.proxyScriptHash,
 			),
@@ -75,51 +109,6 @@ func (c *cfg) initMorphComponents(ctx context.Context) {
 
 	c.netMapSource = netmapSource
 	c.cfgNetmap.wrapper = wrap
-	c.cfgMorph.initialized = true
-}
-
-func initMorphClient(ctx context.Context, c *cfg) {
-	addresses := morphconfig.RPCEndpoint(c.appCfg)
-
-	// Morph client stable-sorts endpoints by priority. Shuffle here to randomize
-	// order of endpoints with the same priority.
-	rand.Shuffle(len(addresses), func(i, j int) {
-		addresses[i], addresses[j] = addresses[j], addresses[i]
-	})
-
-	cli, err := client.New(ctx,
-		c.key,
-		client.WithDialTimeout(morphconfig.DialTimeout(c.appCfg)),
-		client.WithLogger(c.log),
-		client.WithMetrics(c.metricsCollector.MorphClientMetrics()),
-		client.WithEndpoints(addresses...),
-		client.WithConnLostCallback(func() {
-			c.internalErr <- errors.New("morph connection has been lost")
-		}),
-		client.WithSwitchInterval(morphconfig.SwitchInterval(c.appCfg)),
-		client.WithMorphCacheMetrics(c.metricsCollector.MorphCacheMetrics()),
-		client.WithDialerSource(c.dialerSource),
-	)
-	if err != nil {
-		c.log.Info(logs.FrostFSNodeFailedToCreateNeoRPCClient,
-			zap.Any("endpoints", addresses),
-			zap.String("error", err.Error()),
-		)
-
-		fatalOnErr(err)
-	}
-
-	c.onShutdown(func() {
-		c.log.Info(logs.FrostFSNodeClosingMorphComponents)
-		cli.Close()
-	})
-
-	if err := cli.SetGroupSignerScope(); err != nil {
-		c.log.Info(logs.FrostFSNodeFailedToSetGroupSignerScopeContinueWithGlobal, zap.Error(err))
-	}
-
-	c.cfgMorph.client = cli
-	c.cfgMorph.notaryEnabled = cli.ProbeNotary()
 }
 
 func makeAndWaitNotaryDeposit(ctx context.Context, c *cfg) {

cmd/frostfs-node/netmap.go

@@ -143,7 +143,9 @@ func initNetmapService(ctx context.Context, c *cfg) {
 	parseAttributes(c)
 	c.cfgNodeInfo.localInfo.SetStatus(netmapSDK.Offline)
 
-	c.initMorphComponents(ctx)
+	if c.cfgMorph.client == nil {
+		initMorphComponents(ctx, c)
+	}
 
 	initNetmapState(c)
 

cmd/frostfs-node/object.go

@@ -117,7 +117,7 @@ func (i *delNetInfo) TombstoneLifetime() (uint64, error) {
 	return i.cfg.cfgObject.tombstoneLifetime.Load(), nil
 }
 
-// LocalNodeID returns node owner ID calculated from configured private key.
+// returns node owner ID calculated from configured private key.
 //
 // Implements method needed for Object.Delete service.
 func (i *delNetInfo) LocalNodeID() user.ID {
@@ -178,8 +178,7 @@ func initObjectService(c *cfg) {
 
 	sSearchV2 := createSearchSvcV2(sSearch, keyStorage)
 
-	sGet := createGetService(c, keyStorage, traverseGen, c.clientCache, c.cfgObject.cnrSource,
+	sGet := createGetService(c, keyStorage, traverseGen, c.clientCache, c.cfgObject.cnrSource)
-		c.ObjectCfg.priorityMetrics)
 
 	*c.cfgObject.getSvc = *sGet // need smth better
 
@@ -390,7 +389,6 @@ func createSearchSvcV2(sSearch *searchsvc.Service, keyStorage *util.KeyStorage)
 func createGetService(c *cfg, keyStorage *util.KeyStorage, traverseGen *util.TraverserGenerator,
 	coreConstructor *cache.ClientCache,
 	containerSource containercore.Source,
-	priorityMetrics []placement.Metric,
 ) *getsvc.Service {
 	ls := c.cfgObject.cfgLocalStorage.localStorage
 
@@ -400,8 +398,6 @@ func createGetService(c *cfg, keyStorage *util.KeyStorage, traverseGen *util.Tra
 		ls,
 		traverseGen.WithTraverseOptions(
 			placement.SuccessAfter(1),
-			placement.WithPriorityMetrics(priorityMetrics),
-			placement.WithNodeState(c),
 		),
 		coreConstructor,
 		containerSource,

cmd/frostfs-node/tree.go

@@ -54,6 +54,7 @@ func initTreeService(c *cfg) {
 			cli: c.shared.cnrClient,
 		}),
 		tree.WithFrostfsidSubjectProvider(c.shared.frostfsidClient),
+		tree.WithEACLSource(c.cfgObject.eaclSource),
 		tree.WithNetmapSource(c.netMapSource),
 		tree.WithPrivateKey(&c.key.PrivateKey),
 		tree.WithLogger(c.log),
@@ -67,7 +68,6 @@ func initTreeService(c *cfg) {
 		tree.WithAPELocalOverrideStorage(c.cfgObject.cfgAccessPolicyEngine.accessPolicyEngine.LocalStorage()),
 		tree.WithAPEMorphRuleStorage(c.cfgObject.cfgAccessPolicyEngine.accessPolicyEngine.MorphRuleChainStorage()),
 		tree.WithNetmapState(c.cfgNetmap.state),
-		tree.WithDialerSource(c.dialerSource),
 	)
 
 	c.cfgGRPC.performAndSave(func(_ string, _ net.Listener, s *grpc.Server) {

config/example/ir.env

@@ -80,12 +80,3 @@ FROSTFS_IR_PPROF_MUTEX_RATE=10000
 FROSTFS_IR_PROMETHEUS_ENABLED=true
 FROSTFS_IR_PROMETHEUS_ADDRESS=localhost:9090
 FROSTFS_IR_PROMETHEUS_SHUTDOWN_TIMEOUT=30s
-
-FROSTFS_MULTINET_ENABLED=true
-FROSTFS_MULTINET_SUBNETS_0_MASK="192.168.219.174/24"
-FROSTFS_MULTINET_SUBNETS_0_SOURCE_IPS="192.168.218.185 192.168.219.185"
-FROSTFS_MULTINET_SUBNETS_1_MASK="10.78.70.74/24"
-FROSTFS_MULTINET_SUBNETS_1_SOURCE_IPS="10.78.70.185 10.78.71.185"
-FROSTFS_MULTINET_BALANCER=roundrobin
-FROSTFS_MULTINET_RESTRICT=false
-FROSTFS_MULTINET_FALLBACK_DELAY=350ms

config/example/ir.yaml

@@ -123,18 +123,3 @@ prometheus:
 
 systemdnotify:
   enabled: true
-
-multinet:
-  enabled: true
-  subnets:
-    - mask: 192.168.219.174/24
-      source_ips:
-        - 192.168.218.185
-        - 192.168.219.185
-    - mask: 10.78.70.74/24
-      source_ips:
-        - 10.78.70.185
-        - 10.78.71.185
-  balancer: roundrobin
-  restrict: false
-  fallback_delay: 350ms

config/example/node.env

@@ -87,7 +87,6 @@ FROSTFS_OBJECT_PUT_REMOTE_POOL_SIZE=100
 FROSTFS_OBJECT_PUT_LOCAL_POOL_SIZE=200
 FROSTFS_OBJECT_PUT_SKIP_SESSION_TOKEN_ISSUER_VERIFICATION=true
 FROSTFS_OBJECT_DELETE_TOMBSTONE_LIFETIME=10
-FROSTFS_OBJECT_GET_PRIORITY="$attribute:ClusterName $attribute:UN-LOCODE"
 
 # Storage engine section
 FROSTFS_STORAGE_SHARD_POOL_SIZE=15
@@ -207,13 +206,3 @@ FROSTFS_RUNTIME_SOFT_MEMORY_LIMIT=1073741824
 
 # AUDIT section
 FROSTFS_AUDIT_ENABLED=true
-
-# MULTINET section
-FROSTFS_MULTINET_ENABLED=true
-FROSTFS_MULTINET_SUBNETS_0_MASK="192.168.219.174/24"
-FROSTFS_MULTINET_SUBNETS_0_SOURCE_IPS="192.168.218.185 192.168.219.185"
-FROSTFS_MULTINET_SUBNETS_1_MASK="10.78.70.74/24"
-FROSTFS_MULTINET_SUBNETS_1_SOURCE_IPS="10.78.70.185 10.78.71.185"
-FROSTFS_MULTINET_BALANCER=roundrobin
-FROSTFS_MULTINET_RESTRICT=false
-FROSTFS_MULTINET_FALLBACK_DELAY=350ms

config/example/node.json

@@ -131,9 +131,6 @@
       "remote_pool_size": 100,
       "local_pool_size": 200,
       "skip_session_token_issuer_verification": true
-    },
-    "get": {
-      "priority": ["$attribute:ClusterName", "$attribute:UN-LOCODE"]
     }
   },
   "storage": {
@@ -267,27 +264,5 @@
   },
   "audit": {
     "enabled": true
-  },
-  "multinet": {
-    "enabled": true,
-    "subnets": [
-      {
-        "mask": "192.168.219.174/24",
-        "source_ips": [
-          "192.168.218.185",
-          "192.168.219.185"
-        ]
-      },
-      {
-        "mask": "10.78.70.74/24",
-        "source_ips":[
-          "10.78.70.185",
-          "10.78.71.185"
-        ]
-      }
-    ],
-    "balancer": "roundrobin",
-    "restrict": false,
-    "fallback_delay": "350ms"
   }
 }

config/example/node.yaml

@@ -114,10 +114,6 @@ object:
     remote_pool_size: 100  # number of async workers for remote PUT operations
     local_pool_size: 200  # number of async workers for local PUT operations
     skip_session_token_issuer_verification: true # session token issuer verification will be skipped if true
-  get:
-    priority:  # list of metrics of nodes for prioritization
-      - $attribute:ClusterName
-      - $attribute:UN-LOCODE
 
 storage:
   # note: shard configuration can be omitted for relay node (see `node.relay`)
@@ -244,18 +240,3 @@ runtime:
 
 audit:
   enabled: true
-
-multinet:
-  enabled: true
-  subnets:
-    - mask: 192.168.219.174/24
-      source_ips:
-        - 192.168.218.185
-        - 192.168.219.185
-    - mask: 10.78.70.74/24
-      source_ips:
-        - 10.78.70.185
-        - 10.78.71.185
-  balancer: roundrobin
-  restrict: false
-  fallback_delay: 350ms

debian/changelog

@@ -0,0 +1,5 @@
+frostfs-node (0.0.1) stable; urgency=medium
+
+  * Initial package build
+
+ -- TrueCloudLab <tech@frostfs.info>  Tue, 25 Oct 2022 21:10:49 +0300

debian/clean

@@ -0,0 +1,2 @@
+man/
+debian/*.bash-completion

debian/control

@@ -0,0 +1,39 @@
+Source: frostfs-node
+Section: misc
+Priority: optional
+Maintainer: TrueCloudLab <tech@frostfs.info>
+Build-Depends: debhelper-compat (= 13), dh-sequence-bash-completion, devscripts
+Standards-Version: 4.5.1
+Homepage: https://fs.neo.org/
+Vcs-Git: https://git.frostfs.info/TrueCloudLab/frostfs-node.git
+Vcs-Browser: https://git.frostfs.info/TrueCloudLab/frostfs-node
+
+Package: frostfs-storage
+Architecture: any
+Depends: ${misc:Depends}
+Description: FrostFS Storage node
+ FrostFS is a decentralized distributed object storage integrated with the NEO
+ Blockchain. FrostFS Nodes are organized in a peer-to-peer network that takes care
+ of storing and distributing user's data. Any Neo user may participate in the
+ network and get paid for providing storage resources to other users or store
+ their data in FrostFS and pay a competitive price for it.
+
+Package: frostfs-ir
+Architecture: any
+Depends: ${misc:Depends}, frostfs-locode-db
+Description: FrostFS InnerRing node
+ FrostFS is a decentralized distributed object storage integrated with the NEO
+ Blockchain. FrostFS Nodes are organized in a peer-to-peer network that takes care
+ of storing and distributing user's data. Any Neo user may participate in the
+ network and get paid for providing storage resources to other users or store
+ their data in FrostFS and pay a competitive price for it.
+
+Package: frostfs-cli
+Architecture: any
+Depends: ${misc:Depends}
+Description: CLI tools for FrostFS
+ FrostFS is a decentralized distributed object storage integrated with the NEO
+ Blockchain. FrostFS Nodes are organized in a peer-to-peer network that takes care
+ of storing and distributing user's data. Any Neo user may participate in the
+ network and get paid for providing storage resources to other users or store
+ their data in FrostFS and pay a competitive price for it.

debian/copyright

@@ -0,0 +1,23 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: frostfs-node
+Upstream-Contact: tech@frostfs.info
+Source: https://git.frostfs.info/TrueCloudLab/frostfs-node
+
+Files: *
+Copyright: 2022-2023 TrueCloudLab (@TrueCloudLab), contributors of FrostFS project
+           2018-2022 NeoSPCC (@nspcc-dev), contributors of NeoFS project
+           (https://git.frostfs.info/TrueCloudLab/frostfs-node/src/branch/master/CREDITS.md)
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published
+ by the Free Software Foundation; version 3.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program or at /usr/share/common-licenses/GPL-3
+ If not, see <http://www.gnu.org/licenses/>.

debian/frostfs-cli.docs

@@ -0,0 +1,4 @@
+CONTRIBUTING.md
+CREDITS.md
+README.md
+cmd/frostfs-adm/docs

debian/frostfs-cli.install

@@ -0,0 +1,3 @@
+bin/frostfs-adm   usr/bin
+bin/frostfs-cli   usr/bin
+bin/frostfs-lens  usr/bin

debian/frostfs-cli.manpages

@@ -0,0 +1 @@
+man/*

debian/frostfs-ir.dirs

@@ -0,0 +1,2 @@
+/etc/frostfs/ir
+/var/lib/frostfs/ir

debian/frostfs-ir.docs

@@ -0,0 +1,3 @@
+CONTRIBUTING.md
+CREDITS.md
+README.md

debian/frostfs-ir.install

@@ -0,0 +1 @@
+bin/frostfs-ir    usr/bin

debian/frostfs-ir.postinst

@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+        USERNAME=ir
+        id -u frostfs-ir >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/frostfs/ir --system -M -U -c "FrostFS InnerRing node" frostfs-ir
+        if ! dpkg-statoverride --list /etc/frostfs/$USERNAME >/dev/null; then
+            chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME
+            chmod -f 0750 /etc/frostfs/$USERNAME
+            chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/config.yml
+            chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/control.yml
+            chmod -f 0640 /etc/frostfs/$USERNAME/config.yml || true
+            chmod -f 0640 /etc/frostfs/$USERNAME/control.yml || true
+        fi
+        USERDIR="$(getent passwd frostfs-$USERNAME | cut -d: -f6)"
+        if ! dpkg-statoverride --list frostfs-"$USERDIR" >/dev/null; then
+            chown -f frostfs-$USERNAME: "$USERDIR"
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/frostfs-ir.postrm

@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+        rm -rf /var/lib/frostfs/ir/*
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/frostfs-ir.preinst

@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/frostfs-ir.prerm

@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/frostfs-ir.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=FrostFS InnerRing node
+Requires=network.target
+
+[Service]
+Type=notify
+NotifyAccess=all
+ExecStart=/usr/bin/frostfs-ir --config /etc/frostfs/ir/config.yml
+User=frostfs-ir
+Group=frostfs-ir
+WorkingDirectory=/var/lib/frostfs/ir
+Restart=always
+RestartSec=5
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

debian/frostfs-storage.dirs

@@ -0,0 +1,3 @@
+/etc/frostfs/storage
+/srv/frostfs
+/var/lib/frostfs/storage

debian/frostfs-storage.docs

@@ -0,0 +1,4 @@
+docs/storage-node-configuration.md
+CONTRIBUTING.md
+CREDITS.md
+README.md

debian/frostfs-storage.install

@@ -0,0 +1 @@
+bin/frostfs-node  usr/bin

debian/frostfs-storage.postinst

@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+        USERNAME=storage
+        id -u frostfs-$USERNAME >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/frostfs/$USERNAME --system -M -U -c "FrostFS Storage node" frostfs-$USERNAME
+        if ! dpkg-statoverride --list /etc/frostfs/$USERNAME >/dev/null; then
+            chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME
+            chmod -f 0750 /etc/frostfs/$USERNAME
+            chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/config.yml
+            chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/control.yml
+            chmod -f 0640 /etc/frostfs/$USERNAME/config.yml || true
+            chmod -f 0640 /etc/frostfs/$USERNAME/control.yml || true
+        fi
+        USERDIR=$(getent passwd frostfs-$USERNAME | cut -d: -f6)
+        if ! dpkg-statoverride --list frostfs-"$USERDIR" >/dev/null; then
+            chown -f frostfs-$USERNAME: "$USERDIR"
+        fi
+        USERDIR=/srv/frostfs
+        if ! dpkg-statoverride --list frostfs-$USERDIR >/dev/null; then
+            chown -f frostfs-$USERNAME: $USERDIR
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/frostfs-storage.postrm

@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+        rm -rf /var/lib/frostfs/storage/*
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/frostfs-storage.preinst

@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/frostfs-storage.prerm

@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/frostfs-storage.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=FrostFS Storage node
+Requires=network.target
+
+[Service]
+Type=notify
+NotifyAccess=all
+ExecStart=/usr/bin/frostfs-node --config /etc/frostfs/storage/config.yml
+User=frostfs-storage
+Group=frostfs-storage
+WorkingDirectory=/srv/frostfs
+Restart=always
+RestartSec=5
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

debian/rules

@@ -0,0 +1,40 @@
+#!/usr/bin/make -f
+
+# Do not try to strip Go binaries
+export DEB_BUILD_OPTIONS := nostrip
+
+%:
+	dh $@ --with bash-completion
+
+override_dh_auto_test:
+
+override_dh_auto_install:
+	echo $(DEB_BUILD_OPTIONS)
+	dh_auto_install
+
+	bin/frostfs-adm gendoc --type man man/
+	bin/frostfs-cli gendoc --type man man/
+
+	bin/frostfs-adm completion bash > debian/frostfs-adm.bash-completion
+	bin/frostfs-cli completion bash > debian/frostfs-cli.bash-completion
+	install -m 0755 -d debian/frostfs-cli/usr/share/fish/completions/
+	install -m 0755 -d debian/frostfs-cli/usr/share/zsh/vendor-completions/
+	bin/frostfs-adm completion fish > debian/frostfs-cli/usr/share/fish/completions/frostfs-adm.fish
+	bin/frostfs-adm completion zsh > debian/frostfs-cli/usr/share/zsh/vendor-completions/_frostfs-adm
+	bin/frostfs-cli completion fish > debian/frostfs-cli/usr/share/fish/completions/frostfs-cli.fish
+	bin/frostfs-cli completion zsh > debian/frostfs-cli/usr/share/zsh/vendor-completions/_frostfs-cli
+
+	install -T -m 0640 config/example/ir.yaml debian/frostfs-ir/etc/frostfs/ir/config.yml
+	install -T -m 0640 config/example/ir-control.yaml debian/frostfs-ir/etc/frostfs/ir/control.yml
+	install -T -m 0640 config/example/node.yaml debian/frostfs-storage/etc/frostfs/storage/config.yml
+	install -T -m 0640 config/example/node-control.yaml debian/frostfs-storage/etc/frostfs/storage/control.yml
+
+override_dh_installsystemd:
+	dh_installsystemd --no-enable --no-start --name=frostfs-ir
+	dh_installsystemd --no-enable --no-start --name=frostfs-storage
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k CHANGELOG.md
+
+override_dh_installdocs:
+	dh_installdocs

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

docs/building-deb-package.md

@@ -0,0 +1,46 @@
+# Building Debian package on host
+
+## Prerequisites
+
+For now, we're assuming building for Debian 11 (stable) x86_64.
+
+Go version 18.4 or later should already be installed, i.e. this runs
+successfully:
+
+* `make all`
+
+## Installing packaging dependencies
+
+```shell
+$ sudo apt install debhelper-compat dh-sequence-bash-completion devscripts
+```
+
+Warining: number of package installed is pretty large considering dependecies.
+
+## Package building
+
+```shell
+$ make debpackage
+```
+
+## Leftovers cleaning
+
+```shell
+$ make debclean
+```
+or
+```shell
+$ dh clean
+```
+
+# Package versioning
+
+By default, package version is based on product version and may also contain git
+tags and hashes.
+
+Package version could be overwritten by setting `PKG_VERSION` variable before
+build, Debian package versioning rules should be respected.
+
+```shell
+$ PKG_VERSION=0.32.0 make debpackge
+```

docs/release-instruction.md

@@ -43,6 +43,11 @@ Write new revision number into the root `VERSION` file:
 $ echo ${FROSTFS_TAG_PREFIX}${FROSTFS_REVISION} > VERSION
 ```
 
+Update version in Debian package changelog file
+```
+$ cat debian/changelog
+```
+
 Update the supported version of `TrueCloudLab/frostfs-contract` module in root
 `README.md` if needed.
 

docs/storage-node-configuration.md

@@ -26,7 +26,7 @@ There are some custom types used for brevity:
 | `storage`              | [Storage engine configuration](#storage-section)                    |
 | `runtime`              | [Runtime configuration](#runtime-section)                           |
 | `audit`                | [Audit configuration](#audit-section)                           |
-| `multinet`             | [Multinet configuration](#multinet-section)                            |
+
 
 # `control` section
 ```yaml
@@ -407,17 +407,13 @@ Contains object-service related parameters.
 object:
   put:
     remote_pool_size: 100
-  get:
-    priority:
-      - $attribute:ClusterName
 ```
 
 | Parameter                   | Type  | Default value | Description                                                                                    |
-|-----------------------------|------------|---------------|------------------------------------------------------------------------------------------------------|
+|-----------------------------|-------|---------------|------------------------------------------------------------------------------------------------|
 | `delete.tombstone_lifetime` | `int` | `5`           | Tombstone lifetime for removed objects in epochs.                                              |
 | `put.remote_pool_size`      | `int` | `10`          | Max pool size for performing remote `PUT` operations. Used by Policer and Replicator services. |
 | `put.local_pool_size`       | `int` | `10`          | Max pool size for performing local `PUT` operations. Used by Policer and Replicator services.  |
-| `get.priority`              | `[]string` |               | List of metrics of nodes for prioritization. Used for computing response on GET and SEARCH requests. |
 
 # `runtime` section
 Contains runtime parameters.
@@ -440,34 +436,5 @@ audit:
 ```
 
 | Parameter           | Type   | Default value | Description                                       |
-|-----------|--------|---------------|---------------------------------------------------|
+|---------------------|--------|---------------|---------------------------------------------------|
-| `enabled` | `bool` | false         | If `true` then audit event logs will be recorded. |
+| `soft_memory_limit` | `bool` | false         | If `true` then audit event logs will be recorded. |
-
-
-# `multinet` section
-Contains multinet parameters.
-
-```yaml
-multinet:
-  enabled: true
-  subnets:
-    - mask: 192.168.219.174/24
-      source_ips:
-        - 192.168.218.185
-        - 192.168.219.185
-    - mask: 10.78.70.74/24
-      source_ips:
-        - 10.78.70.185
-        - 10.78.71.185
-  balancer: roundrobin
-  restrict: false
-  fallback_delay: 350ms
-```
-
-| Parameter        | Type       | Default value | Description                                                                                                                |
-| ---------------- | ---------- | ------------- | -------------------------------------------------------------------------------------------------------------------------- |
-| `enabled`        | `bool`     | false         | If `true` then source-based routing is enabled.                                                                            |
-| `subnets`        | `subnet`   | empty         | Resulting subnets.                                                                                                         |
-| `balancer`       | `string`   | ""            | Balancer to select network interfaces, allowed values are "" (no balancing, use first suitable interface) or "roundrobin". |
-| `restrict`       | `bool`     | false         | If `true` then any requests that do not match `subnets` will fail.                                                         |
-| `fallback_delay` | `duration` | 350ms         | Delay before fallback to secondary IP addresses in case of hostname resolve.                                               |

go.mod

@@ -5,13 +5,12 @@ go 1.22
 require (
 	code.gitea.io/sdk/gitea v0.17.1
 	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20241007120543-29c522d5d8a3
-	git.frostfs.info/TrueCloudLab/frostfs-contract v0.20.0
+	git.frostfs.info/TrueCloudLab/frostfs-contract v0.19.3-0.20240909072709-3e221b973a3c
 	git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0
 	git.frostfs.info/TrueCloudLab/frostfs-locode-db v0.4.1-0.20240710074952-65761deb5c0d
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20240909114314-666d326cc573
-	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20241010110344-99c5c5836509
+	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20241007135805-4c310ae1c7fa
 	git.frostfs.info/TrueCloudLab/hrw v1.2.1
-	git.frostfs.info/TrueCloudLab/multinet v0.0.0-20241015075604-6cb0d80e0972
 	git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240814080254-96225afacb88
 	git.frostfs.info/TrueCloudLab/tzhash v1.8.0
 	git.frostfs.info/TrueCloudLab/zapjournald v0.0.0-20240124114243-cb2e66427d02
@@ -19,7 +18,6 @@ require (
 	github.com/cheggaaa/pb v1.0.29
 	github.com/chzyer/readline v1.5.1
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
-	github.com/felixge/fgprof v0.9.5
 	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
 	github.com/gdamore/tcell/v2 v2.7.4
 	github.com/go-pkgz/expirable-cache/v3 v3.0.0
@@ -78,7 +76,6 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect
@@ -135,4 +132,4 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/nspcc-dev/neo-go => git.frostfs.info/TrueCloudLab/neoneo-go v0.106.1-0.20241015133823-8aee80dbdc07
+replace github.com/nspcc-dev/neo-go => git.frostfs.info/TrueCloudLab/neoneo-go v0.106.1-0.20240726093631-5481339d6928

internal/logs/logs.go

@@ -14,6 +14,8 @@ const (
 	InterruptPlacementIterationByContext = "interrupt placement iteration by context"
 
 	Notification = "notification"
+
+	SkipDeprecatedNotification = "skip deprecated notification"
 )
 
 const (
@@ -39,6 +41,8 @@ const (
 	InnerringCantUpdatePersistentState                                   = "can't update persistent state"
 	InnerringCloserError                                                 = "closer error"
 	InnerringReadConfigFromBlockchain                                    = "read config from blockchain"
+	NotificatorNotificatorStartProcessingObjectNotifications             = "notificator: start processing object notifications"
+	NotificatorNotificatorProcessingObjectNotification                   = "notificator: processing object notification"
 	PolicerCouldNotGetContainer                                          = "could not get container"
 	PolicerCouldNotConfirmContainerRemoval                               = "could not confirm container removal"
 	PolicerCouldNotInhumeObjectWithMissingContainer                      = "could not inhume object with missing container"
@@ -57,6 +61,7 @@ const (
 	ReplicatorCouldNotReplicateObject                                    = "could not replicate object"
 	ReplicatorObjectSuccessfullyReplicated                               = "object successfully replicated"
 	TreeRedirectingTreeServiceQuery                                      = "redirecting tree service query"
+	TreeBearerPresentedButNotAllowedByACL                                = "bearer presented but not allowed by ACL"
 	TreeCouldNotGetLastSynchronizedHeightForATree                        = "could not get last synchronized height for a tree"
 	TreeCouldNotUpdateLastSynchronizedHeightForATree                     = "could not update last synchronized height for a tree"
 	TreeSynchronizeTree                                                  = "synchronize tree"
@@ -102,6 +107,7 @@ const (
 	GetUnableToGetAllPartsECObject                                       = "unable to get all parts, continue to reconstruct with existed"
 	GetUnableToGetPartECObject                                           = "unable to get part of the erasure-encoded object"
 	GetUnableToHeadPartECObject                                          = "unable to head part of the erasure-encoded object"
+	GetUnableToGetECObjectContainer                                      = "unable to get container for erasure-coded object"
 	GetUnableToHeadPartsECObject                                         = "unable to head parts of the erasure-encoded object"
 	GetAssemblingSplittedObjectCompleted                                 = "assembling splitted object completed"
 	GetAssemblingECObjectCompleted                                       = "assembling erasure-coded object completed"
@@ -265,7 +271,9 @@ const (
 	ShardFailureToMarkLockersAsGarbage                                   = "failure to mark lockers as garbage"
 	ShardFailureToGetExpiredUnlockedObjects                              = "failure to get expired unlocked objects"
 	ShardCouldNotMarkObjectToDeleteInMetabase                            = "could not mark object to delete in metabase"
+	WritecacheTriedToFlushItemsFromWritecache                            = "tried to flush items from write-cache"
 	WritecacheWaitingForChannelsToFlush                                  = "waiting for channels to flush"
+	WritecacheCantRemoveObjectsFromTheDatabase                           = "can't remove objects from the database"
 	WritecacheCantRemoveObjectFromWritecache                             = "can't remove object from write-cache"
 	BlobovniczatreeCouldNotGetObjectFromLevel                            = "could not get object from level"
 	BlobovniczatreeCouldNotCloseBlobovnicza                              = "could not close Blobovnicza"
@@ -300,6 +308,9 @@ const (
 	ContainerNonAlphabetModeIgnoreContainerDelete                        = "non alphabet mode, ignore container delete"
 	ContainerDeleteContainerCheckFailed                                  = "delete container check failed"
 	ContainerCouldNotApproveDeleteContainer                              = "could not approve delete container"
+	ContainerNonAlphabetModeIgnoreSetEACL                                = "non alphabet mode, ignore set EACL"
+	ContainerSetEACLCheckFailed                                          = "set EACL check failed"
+	ContainerCouldNotApproveSetEACL                                      = "could not approve set EACL"
 	FrostFSNonAlphabetModeIgnoreConfig                                   = "non alphabet mode, ignore config"
 	FrostFSCantRelaySetConfigEvent                                       = "can't relay set config event"
 	FrostFSFrostfsWorkerPool                                             = "frostfs worker pool"
@@ -405,6 +416,11 @@ const (
 	FrostFSNodeReadNewlyCreatedContainerAfterTheNotification             = "read newly created container after the notification"
 	FrostFSNodeContainerCreationEventsReceipt                            = "container creation event's receipt"
 	FrostFSNodeContainerRemovalEventsReceipt                             = "container removal event's receipt"
+	FrostFSNodeNotificatorCouldNotListContainers                         = "notificator: could not list containers"
+	FrostFSNodeNotificatorCouldNotSelectObjectsFromContainer             = "notificator: could not select objects from container"
+	FrostFSNodeNotificatorCouldNotProcessObject                          = "notificator: could not process object"
+	FrostFSNodeNotificatorFinishedProcessingObjectNotifications          = "notificator: finished processing object notifications"
+	FrostFSNodeCouldNotWriteObjectNotification                           = "could not write object notification"
 	FrostFSNodeCouldNotGetMaxObjectSizeValue                             = "could not get max object size value"
 	FrostFSNodeCouldNotInhumeMarkRedundantCopyAsGarbage                  = "could not inhume mark redundant copy as garbage"
 	FrostFSNodeFailedInitTracing                                         = "failed init tracing"
@@ -448,6 +464,7 @@ const (
 	FSTreeCantUnmarshalObject                                            = "can't unmarshal an object"
 	FSTreeCantFushObjectBlobstor                                         = "can't flush an object to blobstor"
 	FSTreeCantUpdateID                                                   = "can't update object storage ID"
+	FSTreeCantDecodeDBObjectAddress                                      = "can't decode object address from the DB"
 	PutSingleRedirectFailure                                             = "failed to redirect PutSingle request"
 	StorageIDRetrievalFailure                                            = "can't get storage ID from metabase"
 	ObjectRemovalFailureBlobStor                                         = "can't remove object from blobStor"
@@ -523,5 +540,4 @@ const (
 	WritecacheShrinkSkippedNotEmpty                                      = "writecache shrink skipped: not empty"
 	BlobovniczatreeFailedToRemoveRebuildTempFile                         = "failed to remove rebuild temp file"
 	WritecacheCantGetObject                                              = "can't get an object from fstree"
-	FailedToUpdateMultinetConfiguration                                  = "failed to update multinet configuration"
 )

internal/metrics/consts.go

@@ -22,7 +22,6 @@ const (
 	grpcServerSubsystem      = "grpc_server"
 	policerSubsystem         = "policer"
 	commonCacheSubsystem     = "common_cache"
-	multinetSubsystem        = "multinet"
 
 	successLabel          = "success"
 	shardIDLabel          = "shard_id"
@@ -42,7 +41,6 @@ const (
 	endpointLabel         = "endpoint"
 	hitLabel              = "hit"
 	cacheLabel            = "cache"
-	sourceIPLabel         = "source_ip"
 
 	readWriteMode = "READ_WRITE"
 	readOnlyMode  = "READ_ONLY"

internal/metrics/innerring.go

@@ -17,7 +17,6 @@ type InnerRingServiceMetrics struct {
 	eventDuration     *prometheus.HistogramVec
 	morphCacheMetrics *morphCacheMetrics
 	logMetrics        logger.LogMetrics
-	multinet          *multinetMetrics
 	// nolint: unused
 	appInfo *ApplicationInfo
 }
@@ -52,7 +51,6 @@ func NewInnerRingMetrics() *InnerRingServiceMetrics {
 		morphCacheMetrics: newMorphCacheMetrics(innerRingNamespace),
 		appInfo:           NewApplicationInfo(misc.Version),
 		logMetrics:        logger.NewLogMetrics(innerRingNamespace),
-		multinet:          newMultinetMetrics(innerRingNamespace),
 	}
 }
 
@@ -80,7 +78,3 @@ func (m *InnerRingServiceMetrics) MorphCacheMetrics() MorphCacheMetrics {
 func (m *InnerRingServiceMetrics) LogMetrics() logger.LogMetrics {
 	return m.logMetrics
 }
-
-func (m *InnerRingServiceMetrics) Multinet() MultinetMetrics {
-	return m.multinet
-}

internal/metrics/multinet.go

@@ -1,35 +0,0 @@
-package metrics
-
-import (
-	"strconv"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-observability/metrics"
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-type multinetMetrics struct {
-	dials *prometheus.GaugeVec
-}
-
-type MultinetMetrics interface {
-	Dial(sourceIP string, success bool)
-}
-
-func newMultinetMetrics(ns string) *multinetMetrics {
-	return &multinetMetrics{
-		dials: metrics.NewGaugeVec(
-			prometheus.GaugeOpts{
-				Namespace: ns,
-				Subsystem: multinetSubsystem,
-				Name:      "dial_count",
-				Help:      "Dials count performed by multinet",
-			}, []string{sourceIPLabel, successLabel}),
-	}
-}
-
-func (m *multinetMetrics) Dial(sourceIP string, success bool) {
-	m.dials.With(prometheus.Labels{
-		sourceIPLabel: sourceIP,
-		successLabel:  strconv.FormatBool(success),
-	}).Inc()
-}

internal/metrics/node.go

@@ -25,7 +25,6 @@ type NodeMetrics struct {
 	morphClient   *morphClientMetrics
 	morphCache    *morphCacheMetrics
 	log           logger.LogMetrics
-	multinet      *multinetMetrics
 	// nolint: unused
 	appInfo *ApplicationInfo
 }
@@ -54,7 +53,6 @@ func NewNodeMetrics() *NodeMetrics {
 		morphCache:   newMorphCacheMetrics(namespace),
 		log:          logger.NewLogMetrics(namespace),
 		appInfo:      NewApplicationInfo(misc.Version),
-		multinet:     newMultinetMetrics(namespace),
 	}
 }
 
@@ -122,7 +120,3 @@ func (m *NodeMetrics) MorphCacheMetrics() MorphCacheMetrics {
 func (m *NodeMetrics) LogMetrics() logger.LogMetrics {
 	return m.log
 }
-
-func (m *NodeMetrics) MultinetMetrics() MultinetMetrics {
-	return m.multinet
-}

internal/net/config.go

@@ -1,69 +0,0 @@
-package net
-
-import (
-	"errors"
-	"fmt"
-	"net/netip"
-	"slices"
-	"time"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/metrics"
-	"git.frostfs.info/TrueCloudLab/multinet"
-)
-
-var errEmptySourceIPList = errors.New("empty source IP list")
-
-type Subnet struct {
-	Prefix    string
-	SourceIPs []string
-}
-
-type Config struct {
-	Enabled       bool
-	Subnets       []Subnet
-	Balancer      string
-	Restrict      bool
-	FallbackDelay time.Duration
-	Metrics       metrics.MultinetMetrics
-}
-
-func (c Config) toMultinetConfig() (multinet.Config, error) {
-	var subnets []multinet.Subnet
-	for _, s := range c.Subnets {
-		var ms multinet.Subnet
-		p, err := netip.ParsePrefix(s.Prefix)
-		if err != nil {
-			return multinet.Config{}, fmt.Errorf("parse IP prefix '%s': %w", s.Prefix, err)
-		}
-		ms.Prefix = p
-		for _, ip := range s.SourceIPs {
-			addr, err := netip.ParseAddr(ip)
-			if err != nil {
-				return multinet.Config{}, fmt.Errorf("parse IP address '%s': %w", ip, err)
-			}
-			ms.SourceIPs = append(ms.SourceIPs, addr)
-		}
-		if len(ms.SourceIPs) == 0 {
-			return multinet.Config{}, errEmptySourceIPList
-		}
-		subnets = append(subnets, ms)
-	}
-	return multinet.Config{
-		Subnets:       subnets,
-		Balancer:      multinet.BalancerType(c.Balancer),
-		Restrict:      c.Restrict,
-		FallbackDelay: c.FallbackDelay,
-		Dialer:        newDefaulDialer(),
-		EventHandler:  newEventHandler(c.Metrics),
-	}, nil
-}
-
-func (c Config) equals(other Config) bool {
-	return c.Enabled == other.Enabled &&
-		slices.EqualFunc(c.Subnets, other.Subnets, func(lhs, rhs Subnet) bool {
-			return lhs.Prefix == rhs.Prefix && slices.Equal(lhs.SourceIPs, rhs.SourceIPs)
-		}) &&
-		c.Balancer == other.Balancer &&
-		c.Restrict == other.Restrict &&
-		c.FallbackDelay == other.FallbackDelay
-}

internal/net/dial_target.go

@@ -1,54 +0,0 @@
-// NOTE: code is taken from https://github.com/grpc/grpc-go/blob/v1.68.x/internal/transport/http_util.go
-
-/*
- *
- * Copyright 2014 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package net
-
-import (
-	"net/url"
-	"strings"
-)
-
-// parseDialTarget returns the network and address to pass to dialer.
-func parseDialTarget(target string) (string, string) {
-	net := "tcp"
-	m1 := strings.Index(target, ":")
-	m2 := strings.Index(target, ":/")
-	// handle unix:addr which will fail with url.Parse
-	if m1 >= 0 && m2 < 0 {
-		if n := target[0:m1]; n == "unix" {
-			return n, target[m1+1:]
-		}
-	}
-	if m2 >= 0 {
-		t, err := url.Parse(target)
-		if err != nil {
-			return net, target
-		}
-		scheme := t.Scheme
-		addr := t.Path
-		if scheme == "unix" {
-			if addr == "" {
-				addr = t.Host
-			}
-			return scheme, addr
-		}
-	}
-	return net, target
-}

internal/net/dialer.go

@@ -1,39 +0,0 @@
-package net
-
-import (
-	"context"
-	"net"
-	"syscall"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-type Dialer interface {
-	DialContext(ctx context.Context, network, address string) (net.Conn, error)
-}
-
-func DialContextTCP(ctx context.Context, address string, d Dialer) (net.Conn, error) {
-	return d.DialContext(ctx, "tcp", address)
-}
-
-func newDefaulDialer() net.Dialer {
-	// From `grpc.WithContextDialer` comment:
-	//
-	// Note: All supported releases of Go (as of December 2023) override the OS
-	// defaults for TCP keepalive time and interval to 15s. To enable TCP keepalive
-	// with OS defaults for keepalive time and interval, use a net.Dialer that sets
-	// the KeepAlive field to a negative value, and sets the SO_KEEPALIVE socket
-	// option to true from the Control field. For a concrete example of how to do
-	// this, see internal.NetDialerWithTCPKeepalive().
-	//
-	// https://github.com/grpc/grpc-go/blob/830135e6c5a351abf75f0c9cfdf978e5df8daeba/dialoptions.go#L432
-	return net.Dialer{
-		KeepAlive: time.Duration(-1),
-		Control: func(_, _ string, c syscall.RawConn) error {
-			return c.Control(func(fd uintptr) {
-				_ = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_KEEPALIVE, 1)
-			})
-		},
-	}
-}

internal/net/dialer_source.go

@@ -1,83 +0,0 @@
-package net
-
-import (
-	"context"
-	"net"
-	"sync"
-
-	"git.frostfs.info/TrueCloudLab/multinet"
-)
-
-type DialerSource struct {
-	guard sync.RWMutex
-
-	c Config
-
-	md multinet.Dialer
-}
-
-func NewDialerSource(c Config) (*DialerSource, error) {
-	result := &DialerSource{}
-	if err := result.build(c); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-func (s *DialerSource) build(c Config) error {
-	if c.Enabled {
-		mc, err := c.toMultinetConfig()
-		if err != nil {
-			return err
-		}
-		md, err := multinet.NewDialer(mc)
-		if err != nil {
-			return err
-		}
-		s.md = md
-		s.c = c
-		return nil
-	}
-	s.md = nil
-	s.c = c
-	return nil
-}
-
-// GrpcContextDialer returns grpc.WithContextDialer func.
-// Returns nil if multinet disabled.
-func (s *DialerSource) GrpcContextDialer() func(context.Context, string) (net.Conn, error) {
-	s.guard.RLock()
-	defer s.guard.RUnlock()
-
-	if s.c.Enabled {
-		return func(ctx context.Context, address string) (net.Conn, error) {
-			network, address := parseDialTarget(address)
-			return s.md.DialContext(ctx, network, address)
-		}
-	}
-	return nil
-}
-
-// NetContextDialer returns net.DialContext dial function.
-// Returns nil if multinet disabled.
-func (s *DialerSource) NetContextDialer() func(context.Context, string, string) (net.Conn, error) {
-	s.guard.RLock()
-	defer s.guard.RUnlock()
-
-	if s.c.Enabled {
-		return func(ctx context.Context, network, address string) (net.Conn, error) {
-			return s.md.DialContext(ctx, network, address)
-		}
-	}
-	return nil
-}
-
-func (s *DialerSource) Update(c Config) error {
-	s.guard.Lock()
-	defer s.guard.Unlock()
-
-	if s.c.equals(c) {
-		return nil
-	}
-	return s.build(c)
-}

internal/net/event_handler.go

@@ -1,29 +0,0 @@
-package net
-
-import (
-	"net"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/metrics"
-	"git.frostfs.info/TrueCloudLab/multinet"
-)
-
-var _ multinet.EventHandler = (*metricsEventHandler)(nil)
-
-type metricsEventHandler struct {
-	m metrics.MultinetMetrics
-}
-
-func (m *metricsEventHandler) DialPerformed(sourceIP net.Addr, _ string, _ string, err error) {
-	sourceIPString := "undefined"
-	if sourceIP != nil {
-		sourceIPString = sourceIP.Network() + "://" + sourceIP.String()
-	}
-	m.m.Dial(sourceIPString, err == nil)
-}
-
-func newEventHandler(m metrics.MultinetMetrics) multinet.EventHandler {
-	if m == nil {
-		return nil
-	}
-	return &metricsEventHandler{m: m}
-}

pkg/core/netmap/keys.go

@@ -2,6 +2,6 @@ package netmap
 
 // AnnouncedKeys is an interface of utility for working with the announced public keys of the storage nodes.
 type AnnouncedKeys interface {
-	// IsLocalKey checks if the key was announced by a local node.
+	// Checks if the key was announced by a local node.
 	IsLocalKey(key []byte) bool
 }

pkg/innerring/initialization.go

@@ -463,7 +463,6 @@ func (s *Server) initMorph(ctx context.Context, cfg *viper.Viper, errChan chan<-
 		name:             morphPrefix,
 		from:             fromSideChainBlock,
 		morphCacheMetric: s.irMetrics.MorphCacheMetrics(),
-		multinetMetrics:  s.irMetrics.Multinet(),
 	}
 
 	// create morph client

pkg/innerring/innerring.go

@@ -9,7 +9,6 @@ import (
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/metrics"
-	internalNet "git.frostfs.info/TrueCloudLab/frostfs-node/internal/net"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/config"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/alphabet"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance"
@@ -117,7 +116,6 @@ type (
 		sgn              *transaction.Signer
 		from             uint32 // block height
 		morphCacheMetric metrics.MorphCacheMetrics
-		multinetMetrics  metrics.MultinetMetrics
 	}
 )
 
@@ -488,12 +486,6 @@ func createClient(ctx context.Context, p *chainParams, errChan chan<- error) (*c
 		return nil, fmt.Errorf("%s chain client endpoints not provided", p.name)
 	}
 
-	nc := parseMultinetConfig(p.cfg, p.multinetMetrics)
-	ds, err := internalNet.NewDialerSource(nc)
-	if err != nil {
-		return nil, fmt.Errorf("dialer source: %w", err)
-	}
-
 	return client.New(
 		ctx,
 		p.key,
@@ -506,7 +498,6 @@ func createClient(ctx context.Context, p *chainParams, errChan chan<- error) (*c
 		}),
 		client.WithSwitchInterval(p.cfg.GetDuration(p.name+".switch_interval")),
 		client.WithMorphCacheMetrics(p.morphCacheMetric),
-		client.WithDialerSource(ds),
 	)
 }
 
@@ -551,28 +542,6 @@ func parseWalletAddressesFromStrings(wallets []string) ([]util.Uint160, error) {
 	return extraWallets, nil
 }
 
-func parseMultinetConfig(cfg *viper.Viper, m metrics.MultinetMetrics) internalNet.Config {
-	nc := internalNet.Config{
-		Enabled:       cfg.GetBool("multinet.enabled"),
-		Balancer:      cfg.GetString("multinet.balancer"),
-		Restrict:      cfg.GetBool("multinet.restrict"),
-		FallbackDelay: cfg.GetDuration("multinet.fallback_delay"),
-		Metrics:       m,
-	}
-	for i := 0; ; i++ {
-		mask := cfg.GetString(fmt.Sprintf("multinet.subnets.%d.mask", i))
-		if mask == "" {
-			break
-		}
-		sourceIPs := cfg.GetStringSlice(fmt.Sprintf("multinet.subnets.%d.source_ips", i))
-		nc.Subnets = append(nc.Subnets, internalNet.Subnet{
-			Prefix:    mask,
-			SourceIPs: sourceIPs,
-		})
-	}
-	return nc
-}
-
 func (s *Server) initConfigFromBlockchain() error {
 	// get current epoch
 	epoch, err := s.netmapClient.Epoch()

pkg/innerring/processors/alphabet/handlers_test.go

@@ -95,7 +95,7 @@ func TestProcessorEmitsGasToNetmapIfNoParsedWallets(t *testing.T) {
 	t.Parallel()
 	var emission uint64 = 100_000
 	var index int = 5
-	var parsedWallets []util.Uint160
+	var parsedWallets []util.Uint160 = []util.Uint160{}
 
 	alphabetContracts := innerring.NewAlphabetContracts()
 	for i := range index + 1 {
@@ -167,7 +167,7 @@ func TestProcessorDoesntEmitGasIfNoNetmapOrParsedWallets(t *testing.T) {
 	t.Parallel()
 	var emission uint64 = 100_000
 	var index int = 5
-	var parsedWallets []util.Uint160
+	var parsedWallets []util.Uint160 = []util.Uint160{}
 
 	alphabetContracts := innerring.NewAlphabetContracts()
 	for i := range index + 1 {
@@ -176,7 +176,7 @@ func TestProcessorDoesntEmitGasIfNoNetmapOrParsedWallets(t *testing.T) {
 
 	morphClient := &testMorphClient{}
 
-	var nodes []netmap.NodeInfo
+	nodes := []netmap.NodeInfo{}
 	network := &netmap.NetMap{}
 	network.SetNodes(nodes)
 

pkg/innerring/processors/container/handlers.go

@@ -48,3 +48,7 @@ func (cp *Processor) handleDelete(ev event.Event) {
 			zap.Int("capacity", cp.pool.Cap()))
 	}
 }
+
+func (cp *Processor) handleSetEACL(_ event.Event) {
+	cp.log.Warn(logs.SkipDeprecatedNotification, zap.String("type", "set EACL"))
+}

pkg/innerring/processors/container/processor.go

@@ -157,6 +157,11 @@ func (cp *Processor) ListenerNotaryParsers() []event.NotaryParserInfo {
 	p.SetParser(containerEvent.ParseDeleteNotary)
 	pp = append(pp, p)
 
+	// set EACL
+	p.SetRequestType(containerEvent.SetEACLNotaryEvent)
+	p.SetParser(containerEvent.ParseSetEACLNotary)
+	pp = append(pp, p)
+
 	return pp
 }
 
@@ -185,5 +190,10 @@ func (cp *Processor) ListenerNotaryHandlers() []event.NotaryHandlerInfo {
 	h.SetHandler(cp.handleDelete)
 	hh = append(hh, h)
 
+	// set eACL
+	h.SetRequestType(containerEvent.SetEACLNotaryEvent)
+	h.SetHandler(cp.handleSetEACL)
+	hh = append(hh, h)
+
 	return hh
 }

pkg/innerring/processors/netmap/nodevalidation/locode/deps.go

@@ -8,38 +8,38 @@ import (
 // Record is an interface of read-only
 // FrostFS LOCODE database single entry.
 type Record interface {
-	// CountryCode must return ISO 3166-1 alpha-2
+	// Must return ISO 3166-1 alpha-2
 	// country code.
 	//
 	// Must not return nil.
 	CountryCode() *locodedb.CountryCode
 
-	// CountryName must return English short country name
+	// Must return English short country name
 	// officially used by the ISO 3166
 	// Maintenance Agency (ISO 3166/MA).
 	CountryName() string
 
-	// LocationCode must return UN/LOCODE 3-character code
+	// Must return UN/LOCODE 3-character code
 	// for the location (numerals 2-9 may also
 	// be used).
 	//
 	// Must not return nil.
 	LocationCode() *locodedb.LocationCode
 
-	// LocationName must return name of the location which
+	// Must return name of the location which
 	// have been allocated a UN/LOCODE without
 	// diacritic sign.
 	LocationName() string
 
-	// SubDivCode Must return ISO 1-3 character alphabetic
+	// Must return ISO 1-3 character alphabetic
 	// and/or numeric code for the administrative
 	// division of the country concerned.
 	SubDivCode() string
 
-	// SubDivName must return subdivision name.
+	// Must return subdivision name.
 	SubDivName() string
 
-	// Continent must return existing continent where is
+	// Must return existing continent where is
 	// the location.
 	//
 	// Must not return nil.
@@ -49,7 +49,7 @@ type Record interface {
 // DB is an interface of read-only
 // FrostFS LOCODE database.
 type DB interface {
-	// Get must find the record that corresponds to
+	// Must find the record that corresponds to
 	// LOCODE and provides the Record interface.
 	//
 	// Must return an error if Record is nil.

pkg/innerring/processors/netmap/processor.go

@@ -43,7 +43,7 @@ type (
 	// of information about the node and its finalization for adding
 	// to the network map.
 	NodeValidator interface {
-		// VerifyAndUpdate must verify and optionally update NodeInfo structure.
+		// Must verify and optionally update NodeInfo structure.
 		//
 		// Must return an error if NodeInfo input is invalid.
 		// Must return an error if it is not possible to correctly

pkg/local_object_storage/blobstor/blobovniczatree/rebuild_test.go

@@ -61,7 +61,7 @@ func TestBlobovniczaTreeFillPercentRebuild(t *testing.T) {
 		require.NoError(t, b.Init())
 
 		storageIDs := make(map[oid.Address][]byte)
-		for range 100 {
+		for i := 0; i < 100; i++ {
 			obj := blobstortest.NewObject(64 * 1024) // 64KB object
 			data, err := obj.Marshal()
 			require.NoError(t, err)
@@ -168,7 +168,7 @@ func TestBlobovniczaTreeFillPercentRebuild(t *testing.T) {
 
 		storageIDs := make(map[oid.Address][]byte)
 		toDelete := make(map[oid.Address][]byte)
-		for i := range 100 { // 2 objects for one blobovnicza, so 50 DBs total will be created
+		for i := 0; i < 100; i++ { // 2 objects for one blobovnicza, so 50 DBs total will be created
 			obj := blobstortest.NewObject(64 * 1024)
 			data, err := obj.Marshal()
 			require.NoError(t, err)
@@ -236,7 +236,7 @@ func TestBlobovniczaTreeFillPercentRebuild(t *testing.T) {
 		require.NoError(t, b.Init())
 
 		storageIDs := make(map[oid.Address][]byte)
-		for range 100 { // 2 objects for one blobovnicza, so 50 DBs total will be created
+		for i := 0; i < 100; i++ { // 2 objects for one blobovnicza, so 50 DBs total will be created
 			obj := blobstortest.NewObject(64 * 1024)
 			data, err := obj.Marshal()
 			require.NoError(t, err)