From 20de74a505165eb24db507002b5fda86c2eda7f4 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 7 Mar 2023 16:38:26 +0300 Subject: [PATCH 01/70] Rename package name Due to source code relocation from GitHub. Signed-off-by: Alex Vanin --- Makefile | 2 +- README.md | 2 +- cmd/frostfs-adm/README.md | 2 +- .../internal/modules/config/config.go | 2 +- .../internal/modules/config/config_test.go | 2 +- .../internal/modules/morph/balance.go | 4 +- .../internal/modules/morph/container.go | 2 +- .../internal/modules/morph/deploy.go | 2 +- .../internal/modules/morph/dump_hashes.go | 2 +- .../internal/modules/morph/generate.go | 4 +- .../internal/modules/morph/generate_test.go | 2 +- .../internal/modules/morph/group.go | 2 +- .../internal/modules/morph/initialize.go | 6 +- .../modules/morph/initialize_deploy.go | 8 +- .../internal/modules/morph/initialize_nns.go | 4 +- .../internal/modules/morph/initialize_test.go | 2 +- .../modules/morph/internal/types.pb.go | Bin 6579 -> 6615 bytes .../modules/morph/internal/types.proto | 2 +- .../modules/morph/netmap_candidates.go | 6 +- .../internal/modules/morph/remove_node.go | 2 +- .../internal/modules/morph/subnet.go | 12 +-- cmd/frostfs-adm/internal/modules/root.go | 16 +-- .../internal/modules/storagecfg/root.go | 4 +- cmd/frostfs-adm/main.go | 2 +- cmd/frostfs-cli/internal/client/client.go | 18 ++-- cmd/frostfs-cli/internal/client/prm.go | 10 +- cmd/frostfs-cli/internal/client/sdk.go | 12 +-- cmd/frostfs-cli/internal/common/eacl.go | 8 +- cmd/frostfs-cli/internal/common/token.go | 4 +- cmd/frostfs-cli/internal/common/verbose.go | 4 +- cmd/frostfs-cli/internal/key/key_test.go | 2 +- cmd/frostfs-cli/internal/key/raw.go | 4 +- cmd/frostfs-cli/internal/key/wallet.go | 2 +- cmd/frostfs-cli/main.go | 2 +- cmd/frostfs-cli/modules/accounting/balance.go | 14 +-- cmd/frostfs-cli/modules/accounting/root.go | 2 +- cmd/frostfs-cli/modules/acl/basic/print.go | 6 +- .../modules/acl/extended/create.go | 12 +-- .../modules/acl/extended/create_test.go | 4 +- cmd/frostfs-cli/modules/acl/extended/print.go | 6 +- cmd/frostfs-cli/modules/acl/root.go | 4 +- cmd/frostfs-cli/modules/bearer/create.go | 14 +-- cmd/frostfs-cli/modules/completion.go | 2 +- cmd/frostfs-cli/modules/container/create.go | 22 ++-- cmd/frostfs-cli/modules/container/delete.go | 14 +-- cmd/frostfs-cli/modules/container/get.go | 18 ++-- cmd/frostfs-cli/modules/container/get_eacl.go | 10 +- cmd/frostfs-cli/modules/container/list.go | 12 +-- .../modules/container/list_objects.go | 16 +-- cmd/frostfs-cli/modules/container/nodes.go | 14 +-- cmd/frostfs-cli/modules/container/root.go | 2 +- cmd/frostfs-cli/modules/container/set_eacl.go | 10 +- cmd/frostfs-cli/modules/container/util.go | 10 +- .../modules/control/drop_objects.go | 8 +- .../modules/control/evacuate_shard.go | 8 +- .../modules/control/flush_cache.go | 8 +- .../modules/control/healthcheck.go | 14 +-- cmd/frostfs-cli/modules/control/root.go | 2 +- .../modules/control/set_netmap_status.go | 12 +-- .../modules/control/shards_dump.go | 8 +- .../modules/control/shards_list.go | 10 +- .../modules/control/shards_restore.go | 8 +- .../modules/control/shards_set_mode.go | 8 +- .../modules/control/synchronize_tree.go | 14 +-- cmd/frostfs-cli/modules/control/util.go | 14 +-- cmd/frostfs-cli/modules/netmap/get_epoch.go | 8 +- cmd/frostfs-cli/modules/netmap/netinfo.go | 8 +- cmd/frostfs-cli/modules/netmap/nodeinfo.go | 12 +-- cmd/frostfs-cli/modules/netmap/root.go | 2 +- cmd/frostfs-cli/modules/netmap/snapshot.go | 8 +- cmd/frostfs-cli/modules/object/delete.go | 12 +-- cmd/frostfs-cli/modules/object/get.go | 14 +-- cmd/frostfs-cli/modules/object/hash.go | 14 +-- cmd/frostfs-cli/modules/object/head.go | 20 ++-- cmd/frostfs-cli/modules/object/lock.go | 20 ++-- cmd/frostfs-cli/modules/object/put.go | 16 +-- cmd/frostfs-cli/modules/object/range.go | 14 +-- cmd/frostfs-cli/modules/object/root.go | 2 +- cmd/frostfs-cli/modules/object/search.go | 14 +-- cmd/frostfs-cli/modules/object/util.go | 24 ++--- cmd/frostfs-cli/modules/root.go | 34 +++---- cmd/frostfs-cli/modules/session/create.go | 16 +-- .../modules/storagegroup/delete.go | 14 +-- cmd/frostfs-cli/modules/storagegroup/get.go | 18 ++-- cmd/frostfs-cli/modules/storagegroup/list.go | 14 +-- cmd/frostfs-cli/modules/storagegroup/put.go | 24 ++--- cmd/frostfs-cli/modules/storagegroup/root.go | 4 +- cmd/frostfs-cli/modules/storagegroup/util.go | 8 +- cmd/frostfs-cli/modules/tree/add.go | 10 +- cmd/frostfs-cli/modules/tree/add_by_path.go | 20 ++-- cmd/frostfs-cli/modules/tree/client.go | 6 +- cmd/frostfs-cli/modules/tree/get_by_path.go | 20 ++-- cmd/frostfs-cli/modules/tree/list.go | 10 +- cmd/frostfs-cli/modules/tree/root.go | 2 +- cmd/frostfs-cli/modules/util/acl.go | 4 +- cmd/frostfs-cli/modules/util/convert_eacl.go | 6 +- cmd/frostfs-cli/modules/util/keyer.go | 4 +- .../modules/util/locode_generate.go | 12 +-- cmd/frostfs-cli/modules/util/locode_info.go | 6 +- cmd/frostfs-cli/modules/util/root.go | 2 +- cmd/frostfs-cli/modules/util/sign_bearer.go | 8 +- cmd/frostfs-cli/modules/util/sign_session.go | 10 +- cmd/frostfs-ir/defaults.go | 2 +- cmd/frostfs-ir/main.go | 8 +- .../internal/blobovnicza/inspect.go | 8 +- cmd/frostfs-lens/internal/blobovnicza/list.go | 6 +- cmd/frostfs-lens/internal/blobovnicza/root.go | 4 +- cmd/frostfs-lens/internal/meta/inspect.go | 10 +- .../internal/meta/list-garbage.go | 4 +- .../internal/meta/list-graveyard.go | 4 +- cmd/frostfs-lens/internal/meta/root.go | 4 +- cmd/frostfs-lens/internal/printers.go | 6 +- .../internal/writecache/inspect.go | 6 +- cmd/frostfs-lens/internal/writecache/list.go | 6 +- cmd/frostfs-lens/internal/writecache/root.go | 4 +- cmd/frostfs-lens/root.go | 10 +- cmd/frostfs-node/accounting.go | 10 +- cmd/frostfs-node/attributes.go | 4 +- cmd/frostfs-node/cache.go | 16 +-- cmd/frostfs-node/config.go | 96 +++++++++--------- cmd/frostfs-node/config/apiclient/config.go | 2 +- .../config/apiclient/config_test.go | 6 +- cmd/frostfs-node/config/calls_test.go | 6 +- cmd/frostfs-node/config/cast_test.go | 4 +- cmd/frostfs-node/config/config.go | 4 +- cmd/frostfs-node/config/contracts/config.go | 2 +- .../config/contracts/config_test.go | 6 +- cmd/frostfs-node/config/control/config.go | 2 +- .../config/control/config_test.go | 6 +- cmd/frostfs-node/config/engine/config.go | 6 +- cmd/frostfs-node/config/engine/config_test.go | 16 +-- .../shard/blobstor/blobovnicza/config.go | 6 +- .../config/engine/shard/blobstor/config.go | 8 +- .../engine/shard/blobstor/fstree/config.go | 4 +- .../engine/shard/blobstor/storage/config.go | 2 +- .../config/engine/shard/boltdb/boltdb.go | 2 +- .../config/engine/shard/config.go | 14 +-- .../config/engine/shard/gc/config.go | 2 +- .../config/engine/shard/metabase/config.go | 4 +- .../config/engine/shard/pilorama/config.go | 2 +- .../config/engine/shard/writecache/config.go | 4 +- cmd/frostfs-node/config/grpc/config.go | 2 +- cmd/frostfs-node/config/grpc/config_test.go | 4 +- cmd/frostfs-node/config/internal/env_test.go | 2 +- cmd/frostfs-node/config/logger/config.go | 2 +- cmd/frostfs-node/config/logger/config_test.go | 6 +- cmd/frostfs-node/config/metrics/config.go | 2 +- .../config/metrics/config_test.go | 6 +- cmd/frostfs-node/config/morph/config.go | 4 +- cmd/frostfs-node/config/morph/config_test.go | 8 +- cmd/frostfs-node/config/node/config.go | 6 +- cmd/frostfs-node/config/node/config_test.go | 6 +- cmd/frostfs-node/config/object/config.go | 2 +- cmd/frostfs-node/config/object/config_test.go | 6 +- cmd/frostfs-node/config/object/delete.go | 2 +- cmd/frostfs-node/config/policer/config.go | 2 +- .../config/policer/config_test.go | 6 +- cmd/frostfs-node/config/profiler/config.go | 2 +- .../config/profiler/config_test.go | 6 +- cmd/frostfs-node/config/replicator/config.go | 2 +- .../config/replicator/config_test.go | 6 +- cmd/frostfs-node/config/test/config.go | 2 +- cmd/frostfs-node/config/tree/config.go | 2 +- cmd/frostfs-node/config/tree/config_test.go | 6 +- cmd/frostfs-node/container.go | 44 ++++---- cmd/frostfs-node/control.go | 10 +- cmd/frostfs-node/grpc.go | 4 +- cmd/frostfs-node/httpcomponent.go | 2 +- cmd/frostfs-node/main.go | 6 +- cmd/frostfs-node/metrics.go | 2 +- cmd/frostfs-node/morph.go | 16 +-- cmd/frostfs-node/netmap.go | 28 ++--- cmd/frostfs-node/notificator.go | 18 ++-- cmd/frostfs-node/object.go | 80 +++++++-------- cmd/frostfs-node/pprof.go | 4 +- cmd/frostfs-node/reputation.go | 52 +++++----- cmd/frostfs-node/reputation/common/remote.go | 12 +-- cmd/frostfs-node/reputation/common/util.go | 2 +- .../reputation/intermediate/calculator.go | 12 +-- .../reputation/intermediate/consumers.go | 12 +-- .../reputation/intermediate/contract.go | 12 +-- .../reputation/intermediate/daughters.go | 8 +- .../reputation/intermediate/remote.go | 16 +-- .../reputation/intermediate/storage.go | 8 +- .../reputation/internal/client/client.go | 8 +- cmd/frostfs-node/reputation/local/remote.go | 14 +-- cmd/frostfs-node/reputation/local/storage.go | 14 +-- cmd/frostfs-node/session.go | 22 ++-- cmd/frostfs-node/timers.go | 2 +- cmd/frostfs-node/tree.go | 16 +-- cmd/frostfs-node/validate.go | 16 +-- cmd/frostfs-node/validate_test.go | 4 +- cmd/internal/common/exit.go | 2 +- cmd/internal/common/netmap.go | 2 +- debian/control | 4 +- debian/copyright | 4 +- go.mod | 23 +++-- go.sum | 47 ++++----- pkg/core/client/client.go | 6 +- pkg/core/client/util.go | 4 +- pkg/core/container/delete.go | 4 +- pkg/core/container/storage.go | 12 +-- pkg/core/netmap/nodes.go | 2 +- pkg/core/netmap/storage.go | 2 +- pkg/core/object/address.go | 4 +- pkg/core/object/fmt.go | 18 ++-- pkg/core/object/fmt_test.go | 16 +-- pkg/core/object/object.go | 4 +- pkg/core/storagegroup/storagegroup.go | 10 +- pkg/core/version/version.go | 2 +- pkg/core/version/version_test.go | 4 +- pkg/innerring/bindings.go | 2 +- pkg/innerring/blocktimer.go | 14 +-- pkg/innerring/contracts.go | 2 +- pkg/innerring/fetcher.go | 4 +- pkg/innerring/innerring.go | 76 +++++++------- pkg/innerring/internal/client/client.go | 14 +-- pkg/innerring/internal/client/prm.go | 2 +- pkg/innerring/locode.go | 10 +- pkg/innerring/netmap.go | 4 +- pkg/innerring/notary.go | 4 +- pkg/innerring/processors/alphabet/handlers.go | 4 +- .../processors/alphabet/processor.go | 8 +- pkg/innerring/processors/audit/handlers.go | 2 +- pkg/innerring/processors/audit/process.go | 20 ++-- pkg/innerring/processors/audit/processor.go | 12 +-- pkg/innerring/processors/audit/scheduler.go | 2 +- .../processors/audit/scheduler_test.go | 6 +- pkg/innerring/processors/balance/handlers.go | 4 +- .../processors/balance/process_assets.go | 4 +- pkg/innerring/processors/balance/processor.go | 8 +- pkg/innerring/processors/container/common.go | 10 +- .../processors/container/handlers.go | 4 +- .../processors/container/process_container.go | 16 +-- .../processors/container/process_eacl.go | 8 +- .../processors/container/processor.go | 12 +-- pkg/innerring/processors/frostfs/handlers.go | 4 +- .../processors/frostfs/process_assets.go | 4 +- .../processors/frostfs/process_bind.go | 6 +- .../processors/frostfs/process_config.go | 4 +- pkg/innerring/processors/frostfs/processor.go | 14 +-- .../processors/governance/handlers.go | 4 +- .../processors/governance/process_update.go | 6 +- .../processors/governance/processor.go | 12 +-- .../processors/netmap/cleanup_table.go | 2 +- .../processors/netmap/cleanup_table_test.go | 2 +- pkg/innerring/processors/netmap/handlers.go | 8 +- .../netmap/nodevalidation/locode/calls.go | 4 +- .../nodevalidation/locode/calls_test.go | 8 +- .../netmap/nodevalidation/locode/deps.go | 4 +- .../netmap/nodevalidation/maddress/calls.go | 4 +- .../netmap/nodevalidation/state/validator.go | 2 +- .../nodevalidation/state/validator_test.go | 4 +- .../netmap/nodevalidation/subnet/calls.go | 6 +- .../netmap/nodevalidation/subnet/validator.go | 2 +- .../netmap/nodevalidation/validator.go | 4 +- .../processors/netmap/process_cleanup.go | 4 +- .../processors/netmap/process_epoch.go | 10 +- .../processors/netmap/process_peers.go | 10 +- pkg/innerring/processors/netmap/processor.go | 16 +-- .../processors/reputation/handlers.go | 4 +- .../processors/reputation/process_put.go | 6 +- .../processors/reputation/processor.go | 10 +- .../processors/settlement/audit/calculate.go | 12 +-- .../processors/settlement/audit/calculator.go | 2 +- .../processors/settlement/audit/prm.go | 6 +- .../processors/settlement/basic/collect.go | 4 +- .../processors/settlement/basic/context.go | 8 +- .../processors/settlement/basic/distribute.go | 2 +- pkg/innerring/processors/settlement/calls.go | 4 +- .../processors/settlement/common/types.go | 4 +- .../processors/settlement/common/util.go | 2 +- pkg/innerring/processors/settlement/deps.go | 2 +- pkg/innerring/processors/settlement/events.go | 2 +- .../processors/settlement/handlers.go | 2 +- pkg/innerring/processors/settlement/opts.go | 2 +- .../processors/settlement/processor.go | 6 +- pkg/innerring/processors/subnet/common.go | 2 +- .../processors/subnet/common_test.go | 2 +- pkg/innerring/processors/subnet/put.go | 6 +- pkg/innerring/processors/subnet/put_test.go | 8 +- pkg/innerring/rpc.go | 26 ++--- pkg/innerring/settlement.go | 34 +++---- pkg/innerring/state.go | 10 +- pkg/innerring/subnet.go | 20 ++-- .../blobovnicza/blobovnicza.go | 2 +- .../blobovnicza/blobovnicza_test.go | 6 +- .../blobovnicza/control.go | 2 +- .../blobovnicza/delete.go | 4 +- .../blobovnicza/errors.go | 2 +- .../blobovnicza/exists.go | 2 +- pkg/local_object_storage/blobovnicza/get.go | 4 +- .../blobovnicza/get_test.go | 2 +- .../blobovnicza/iterate.go | 2 +- .../blobovnicza/iterate_test.go | 2 +- pkg/local_object_storage/blobovnicza/put.go | 4 +- .../blobstor/blobovniczatree/blobovnicza.go | 12 +-- .../blobstor/blobovniczatree/control.go | 2 +- .../blobstor/blobovniczatree/delete.go | 8 +- .../blobstor/blobovniczatree/errors.go | 4 +- .../blobstor/blobovniczatree/exists.go | 4 +- .../blobstor/blobovniczatree/exists_test.go | 8 +- .../blobstor/blobovniczatree/generic_test.go | 6 +- .../blobstor/blobovniczatree/get.go | 10 +- .../blobstor/blobovniczatree/get_range.go | 10 +- .../blobstor/blobovniczatree/iterate.go | 8 +- .../blobstor/blobovniczatree/option.go | 6 +- .../blobstor/blobovniczatree/put.go | 4 +- pkg/local_object_storage/blobstor/blobstor.go | 10 +- .../blobstor/blobstor_test.go | 10 +- .../blobstor/common/delete.go | 2 +- .../blobstor/common/errors.go | 2 +- .../blobstor/common/exists.go | 2 +- .../blobstor/common/get.go | 4 +- .../blobstor/common/get_range.go | 4 +- .../blobstor/common/iterate.go | 2 +- .../blobstor/common/put.go | 4 +- .../blobstor/common/storage.go | 2 +- .../blobstor/compression/compress.go | 2 +- pkg/local_object_storage/blobstor/delete.go | 4 +- pkg/local_object_storage/blobstor/exists.go | 2 +- .../blobstor/exists_test.go | 10 +- .../blobstor/fstree/control.go | 2 +- .../blobstor/fstree/fstree.go | 16 +-- .../blobstor/fstree/fstree_test.go | 2 +- .../blobstor/fstree/generic_test.go | 4 +- .../blobstor/generic_test.go | 2 +- pkg/local_object_storage/blobstor/get.go | 6 +- .../blobstor/get_range.go | 6 +- .../blobstor/internal/blobstortest/common.go | 12 +-- .../blobstor/internal/blobstortest/control.go | 4 +- .../blobstor/internal/blobstortest/delete.go | 6 +- .../blobstor/internal/blobstortest/exists.go | 4 +- .../blobstor/internal/blobstortest/get.go | 6 +- .../internal/blobstortest/get_range.go | 6 +- .../blobstor/internal/blobstortest/iterate.go | 4 +- pkg/local_object_storage/blobstor/iterate.go | 4 +- .../blobstor/iterate_test.go | 96 +++++++++--------- pkg/local_object_storage/blobstor/logger.go | 6 +- pkg/local_object_storage/blobstor/mode.go | 2 +- pkg/local_object_storage/blobstor/put.go | 8 +- pkg/local_object_storage/engine/container.go | 4 +- pkg/local_object_storage/engine/control.go | 4 +- .../engine/control_test.go | 18 ++-- pkg/local_object_storage/engine/delete.go | 8 +- .../engine/delete_test.go | 14 +-- pkg/local_object_storage/engine/dump.go | 2 +- pkg/local_object_storage/engine/engine.go | 10 +- .../engine/engine_test.go | 34 +++---- pkg/local_object_storage/engine/error_test.go | 20 ++-- pkg/local_object_storage/engine/evacuate.go | 12 +-- .../engine/evacuate_test.go | 20 ++-- pkg/local_object_storage/engine/exists.go | 8 +- pkg/local_object_storage/engine/get.go | 12 +-- pkg/local_object_storage/engine/head.go | 12 +-- pkg/local_object_storage/engine/head_test.go | 8 +- pkg/local_object_storage/engine/info.go | 2 +- pkg/local_object_storage/engine/inhume.go | 10 +- .../engine/inhume_test.go | 8 +- pkg/local_object_storage/engine/list.go | 4 +- pkg/local_object_storage/engine/list_test.go | 6 +- pkg/local_object_storage/engine/lock.go | 12 +-- pkg/local_object_storage/engine/lock_test.go | 22 ++-- pkg/local_object_storage/engine/put.go | 14 +-- pkg/local_object_storage/engine/range.go | 12 +-- pkg/local_object_storage/engine/restore.go | 2 +- pkg/local_object_storage/engine/select.go | 8 +- pkg/local_object_storage/engine/shards.go | 10 +- pkg/local_object_storage/engine/tree.go | 6 +- pkg/local_object_storage/engine/tree_test.go | 6 +- pkg/local_object_storage/engine/writecache.go | 2 +- pkg/local_object_storage/internal/log/log.go | 2 +- .../internal/storagetest/storage.go | 2 +- .../metabase/containers.go | 2 +- .../metabase/containers_test.go | 10 +- pkg/local_object_storage/metabase/control.go | 6 +- .../metabase/control_test.go | 8 +- pkg/local_object_storage/metabase/counter.go | 4 +- .../metabase/counter_test.go | 10 +- pkg/local_object_storage/metabase/db.go | 8 +- pkg/local_object_storage/metabase/db_test.go | 26 ++--- pkg/local_object_storage/metabase/delete.go | 10 +- .../metabase/delete_test.go | 14 +-- pkg/local_object_storage/metabase/errors.go | 4 +- pkg/local_object_storage/metabase/exists.go | 12 +-- .../metabase/exists_test.go | 12 +-- .../metabase/generic_test.go | 2 +- pkg/local_object_storage/metabase/get.go | 10 +- pkg/local_object_storage/metabase/get_test.go | 14 +-- .../metabase/graveyard.go | 2 +- .../metabase/graveyard_test.go | 8 +- pkg/local_object_storage/metabase/inhume.go | 10 +- .../metabase/inhume_test.go | 10 +- .../metabase/iterators.go | 10 +- .../metabase/iterators_test.go | 12 +-- pkg/local_object_storage/metabase/list.go | 10 +- .../metabase/list_test.go | 10 +- pkg/local_object_storage/metabase/lock.go | 10 +- .../metabase/lock_test.go | 16 +-- pkg/local_object_storage/metabase/mode.go | 2 +- pkg/local_object_storage/metabase/movable.go | 2 +- .../metabase/movable_test.go | 6 +- pkg/local_object_storage/metabase/put.go | 12 +-- pkg/local_object_storage/metabase/put_test.go | 12 +-- pkg/local_object_storage/metabase/select.go | 8 +- .../metabase/select_test.go | 18 ++-- .../metabase/storage_id.go | 2 +- .../metabase/storage_id_test.go | 6 +- pkg/local_object_storage/metabase/util.go | 18 ++-- pkg/local_object_storage/metabase/version.go | 2 +- pkg/local_object_storage/pilorama/batch.go | 2 +- pkg/local_object_storage/pilorama/boltdb.go | 18 ++-- pkg/local_object_storage/pilorama/forest.go | 4 +- .../pilorama/forest_test.go | 6 +- .../pilorama/generic_test.go | 2 +- .../pilorama/interface.go | 6 +- pkg/local_object_storage/pilorama/types.go | 2 +- pkg/local_object_storage/shard/container.go | 2 +- pkg/local_object_storage/shard/control.go | 14 +-- .../shard/control_test.go | 32 +++--- pkg/local_object_storage/shard/delete.go | 8 +- pkg/local_object_storage/shard/delete_test.go | 8 +- pkg/local_object_storage/shard/dump.go | 6 +- pkg/local_object_storage/shard/dump_test.go | 26 ++--- pkg/local_object_storage/shard/errors.go | 4 +- pkg/local_object_storage/shard/exists.go | 6 +- pkg/local_object_storage/shard/gc.go | 12 +-- pkg/local_object_storage/shard/get.go | 16 +-- pkg/local_object_storage/shard/get_test.go | 10 +- pkg/local_object_storage/shard/head.go | 6 +- pkg/local_object_storage/shard/head_test.go | 8 +- pkg/local_object_storage/shard/id.go | 2 +- pkg/local_object_storage/shard/info.go | 10 +- pkg/local_object_storage/shard/inhume.go | 4 +- pkg/local_object_storage/shard/inhume_test.go | 8 +- pkg/local_object_storage/shard/list.go | 8 +- pkg/local_object_storage/shard/list_test.go | 6 +- pkg/local_object_storage/shard/lock.go | 6 +- pkg/local_object_storage/shard/lock_test.go | 24 ++--- .../shard/metrics_test.go | 18 ++-- pkg/local_object_storage/shard/mode.go | 4 +- pkg/local_object_storage/shard/move.go | 4 +- pkg/local_object_storage/shard/put.go | 8 +- pkg/local_object_storage/shard/range.go | 14 +-- pkg/local_object_storage/shard/range_test.go | 18 ++-- pkg/local_object_storage/shard/reload_test.go | 26 ++--- pkg/local_object_storage/shard/restore.go | 4 +- pkg/local_object_storage/shard/select.go | 8 +- pkg/local_object_storage/shard/shard.go | 16 +-- pkg/local_object_storage/shard/shard_test.go | 32 +++--- .../shard/shutdown_test.go | 10 +- pkg/local_object_storage/shard/tree.go | 6 +- pkg/local_object_storage/util/splitinfo.go | 2 +- .../util/splitinfo_test.go | 6 +- pkg/local_object_storage/writecache/delete.go | 6 +- pkg/local_object_storage/writecache/flush.go | 12 +-- .../writecache/flush_test.go | 30 +++--- .../writecache/generic_test.go | 4 +- pkg/local_object_storage/writecache/get.go | 10 +- pkg/local_object_storage/writecache/init.go | 10 +- .../writecache/iterate.go | 4 +- pkg/local_object_storage/writecache/mode.go | 4 +- .../writecache/options.go | 10 +- pkg/local_object_storage/writecache/put.go | 4 +- .../writecache/storage.go | 12 +-- .../writecache/writecache.go | 12 +-- pkg/morph/client/audit/client.go | 2 +- pkg/morph/client/audit/get_result.go | 4 +- pkg/morph/client/audit/list_results.go | 4 +- pkg/morph/client/audit/put_result.go | 4 +- pkg/morph/client/audit/result_test.go | 6 +- pkg/morph/client/balance/balanceOf.go | 4 +- pkg/morph/client/balance/burn.go | 2 +- pkg/morph/client/balance/client.go | 2 +- pkg/morph/client/balance/decimals.go | 2 +- pkg/morph/client/balance/lock.go | 2 +- pkg/morph/client/balance/mint.go | 2 +- pkg/morph/client/balance/transfer.go | 4 +- pkg/morph/client/client.go | 2 +- pkg/morph/client/constructor.go | 2 +- pkg/morph/client/container/client.go | 2 +- pkg/morph/client/container/delete.go | 4 +- pkg/morph/client/container/eacl.go | 14 +-- pkg/morph/client/container/eacl_set.go | 6 +- pkg/morph/client/container/estimations.go | 2 +- pkg/morph/client/container/get.go | 16 +-- pkg/morph/client/container/list.go | 6 +- pkg/morph/client/container/load.go | 8 +- pkg/morph/client/container/put.go | 10 +- pkg/morph/client/frostfs/bind.go | 2 +- pkg/morph/client/frostfs/cheque.go | 2 +- pkg/morph/client/frostfs/client.go | 2 +- pkg/morph/client/frostfsid/addrm_keys.go | 2 +- pkg/morph/client/frostfsid/client.go | 2 +- pkg/morph/client/frostfsid/keys.go | 4 +- pkg/morph/client/netmap/add_peer.go | 4 +- pkg/morph/client/netmap/client.go | 4 +- pkg/morph/client/netmap/config.go | 2 +- pkg/morph/client/netmap/epoch.go | 2 +- pkg/morph/client/netmap/innerring.go | 2 +- pkg/morph/client/netmap/netmap.go | 6 +- pkg/morph/client/netmap/netmap_test.go | 4 +- pkg/morph/client/netmap/new_epoch.go | 2 +- pkg/morph/client/netmap/snapshot.go | 4 +- pkg/morph/client/netmap/update_state.go | 4 +- pkg/morph/client/nns.go | 2 +- pkg/morph/client/notary.go | 2 +- pkg/morph/client/reputation/client.go | 2 +- pkg/morph/client/reputation/get.go | 4 +- pkg/morph/client/reputation/list.go | 2 +- pkg/morph/client/reputation/put.go | 4 +- pkg/morph/client/subnet/admin.go | 2 +- pkg/morph/client/subnet/client.go | 2 +- pkg/morph/client/subnet/clients.go | 2 +- pkg/morph/client/subnet/delete.go | 2 +- pkg/morph/client/subnet/get.go | 2 +- pkg/morph/client/subnet/node.go | 2 +- pkg/morph/client/subnet/nodes.go | 2 +- pkg/morph/client/subnet/put.go | 2 +- pkg/morph/event/balance/lock.go | 4 +- pkg/morph/event/balance/lock_test.go | 2 +- pkg/morph/event/container/delete.go | 6 +- pkg/morph/event/container/delete_notary.go | 2 +- pkg/morph/event/container/delete_test.go | 4 +- pkg/morph/event/container/eacl.go | 4 +- pkg/morph/event/container/eacl_notary.go | 2 +- pkg/morph/event/container/eacl_test.go | 2 +- pkg/morph/event/container/estimates.go | 4 +- pkg/morph/event/container/estimates_test.go | 2 +- pkg/morph/event/container/put.go | 6 +- pkg/morph/event/container/put_notary.go | 2 +- pkg/morph/event/container/put_test.go | 4 +- pkg/morph/event/frostfs/bind.go | 4 +- pkg/morph/event/frostfs/bind_test.go | 2 +- pkg/morph/event/frostfs/cheque.go | 4 +- pkg/morph/event/frostfs/cheque_test.go | 2 +- pkg/morph/event/frostfs/config.go | 4 +- pkg/morph/event/frostfs/config_test.go | 2 +- pkg/morph/event/frostfs/deposit.go | 4 +- pkg/morph/event/frostfs/deposit_test.go | 2 +- pkg/morph/event/frostfs/ir_update.go | 4 +- pkg/morph/event/frostfs/ir_update_test.go | 2 +- pkg/morph/event/frostfs/unbind.go | 2 +- pkg/morph/event/frostfs/unbind_test.go | 2 +- pkg/morph/event/frostfs/withdraw.go | 4 +- pkg/morph/event/frostfs/withdraw_test.go | 2 +- pkg/morph/event/listener.go | 6 +- pkg/morph/event/netmap/add_peer.go | 4 +- pkg/morph/event/netmap/add_peer_notary.go | 2 +- pkg/morph/event/netmap/add_peer_test.go | 2 +- pkg/morph/event/netmap/epoch.go | 4 +- pkg/morph/event/netmap/epoch_test.go | 2 +- pkg/morph/event/netmap/update_peer.go | 6 +- pkg/morph/event/netmap/update_peer_notary.go | 2 +- pkg/morph/event/netmap/update_peer_test.go | 4 +- pkg/morph/event/notary_preparator.go | 2 +- pkg/morph/event/notary_preparator_test.go | 2 +- pkg/morph/event/reputation/put.go | 6 +- pkg/morph/event/reputation/put_notary.go | 2 +- pkg/morph/event/reputation/put_test.go | 6 +- pkg/morph/event/rolemanagement/designate.go | 2 +- pkg/morph/event/subnet/delete.go | 4 +- pkg/morph/event/subnet/delete_test.go | 2 +- pkg/morph/event/subnet/put.go | 4 +- pkg/morph/event/subnet/put_test.go | 2 +- pkg/morph/event/subnet/remove_node.go | 4 +- pkg/morph/event/subnet/remove_node_test.go | 4 +- pkg/morph/event/utils.go | 6 +- pkg/morph/subscriber/subscriber.go | 4 +- pkg/morph/timer/block_test.go | 2 +- pkg/network/address.go | 2 +- pkg/network/cache/client.go | 4 +- pkg/network/cache/multi.go | 10 +- pkg/network/group.go | 2 +- .../transport/accounting/grpc/service.go | 6 +- .../transport/container/grpc/service.go | 6 +- pkg/network/transport/netmap/grpc/service.go | 6 +- pkg/network/transport/object/grpc/get.go | 4 +- pkg/network/transport/object/grpc/range.go | 4 +- pkg/network/transport/object/grpc/search.go | 4 +- pkg/network/transport/object/grpc/service.go | 8 +- .../transport/reputation/grpc/service.go | 6 +- pkg/network/transport/session/grpc/service.go | 6 +- pkg/network/validation.go | 2 +- pkg/network/validation_test.go | 2 +- pkg/services/accounting/executor.go | 2 +- pkg/services/accounting/morph/executor.go | 8 +- pkg/services/accounting/response.go | 6 +- pkg/services/accounting/server.go | 2 +- pkg/services/accounting/sign.go | 4 +- pkg/services/audit/auditor/context.go | 16 +-- pkg/services/audit/auditor/pdp.go | 10 +- pkg/services/audit/auditor/pop.go | 6 +- pkg/services/audit/auditor/por.go | 14 +-- pkg/services/audit/auditor/util.go | 2 +- pkg/services/audit/report.go | 6 +- pkg/services/audit/task.go | 8 +- pkg/services/audit/taskmanager/listen.go | 4 +- pkg/services/audit/taskmanager/manager.go | 8 +- pkg/services/audit/taskmanager/push.go | 2 +- .../announcement/load/controller/calls.go | 4 +- .../load/controller/calls_test.go | 6 +- .../announcement/load/controller/deps.go | 2 +- .../announcement/load/controller/opts.go | 2 +- .../announcement/load/controller/util.go | 2 +- .../announcement/load/route/calls.go | 4 +- .../container/announcement/load/route/deps.go | 4 +- .../container/announcement/load/route/opts.go | 2 +- .../load/route/placement/calls.go | 6 +- .../announcement/load/route/placement/deps.go | 4 +- .../announcement/load/route/router.go | 2 +- .../container/announcement/load/route/util.go | 2 +- .../announcement/load/storage/storage.go | 4 +- .../announcement/load/storage/storage_test.go | 4 +- pkg/services/container/executor.go | 4 +- pkg/services/container/morph/executor.go | 18 ++-- pkg/services/container/morph/executor_test.go | 24 ++--- pkg/services/container/response.go | 6 +- pkg/services/container/server.go | 2 +- pkg/services/container/sign.go | 4 +- pkg/services/control/convert.go | 4 +- pkg/services/control/ir/convert.go | 4 +- pkg/services/control/ir/rpc.go | 4 +- pkg/services/control/ir/server/calls.go | 2 +- pkg/services/control/ir/server/deps.go | 2 +- pkg/services/control/ir/server/sign.go | 8 +- pkg/services/control/ir/service.pb.go | Bin 14559 -> 14596 bytes pkg/services/control/ir/service.proto | 2 +- pkg/services/control/ir/service_frostfs.pb.go | Bin 5256 -> 5262 bytes pkg/services/control/ir/service_grpc.pb.go | Bin 3853 -> 3854 bytes pkg/services/control/ir/service_test.go | 2 +- pkg/services/control/ir/types.pb.go | Bin 7763 -> 7800 bytes pkg/services/control/ir/types.proto | 2 +- pkg/services/control/ir/types_frostfs.pb.go | Bin 1062 -> 1068 bytes pkg/services/control/rpc.go | 4 +- pkg/services/control/server/dump.go | 4 +- pkg/services/control/server/evacuate.go | 14 +-- pkg/services/control/server/flush_cache.go | 4 +- pkg/services/control/server/gc.go | 6 +- pkg/services/control/server/healthcheck.go | 2 +- pkg/services/control/server/helpers.go | 2 +- pkg/services/control/server/list_shards.go | 6 +- pkg/services/control/server/restore.go | 4 +- pkg/services/control/server/server.go | 10 +- .../control/server/set_netmap_status.go | 2 +- pkg/services/control/server/set_shard_mode.go | 4 +- pkg/services/control/server/sign.go | 8 +- .../control/server/syncronize_tree.go | 4 +- pkg/services/control/service.pb.go | Bin 111715 -> 111752 bytes pkg/services/control/service.proto | 2 +- pkg/services/control/service_frostfs.pb.go | Bin 52792 -> 52798 bytes pkg/services/control/service_grpc.pb.go | Bin 18216 -> 18217 bytes pkg/services/control/service_test.go | 2 +- pkg/services/control/types.pb.go | Bin 29388 -> 29425 bytes pkg/services/control/types.proto | 2 +- pkg/services/control/types_frostfs.pb.go | Bin 6917 -> 6923 bytes pkg/services/control/types_test.go | 6 +- pkg/services/netmap/executor.go | 10 +- pkg/services/netmap/response.go | 6 +- pkg/services/netmap/server.go | 2 +- pkg/services/netmap/sign.go | 4 +- pkg/services/notificator/deps.go | 2 +- pkg/services/notificator/nats/options.go | 2 +- pkg/services/notificator/nats/service.go | 4 +- pkg/services/notificator/service.go | 4 +- pkg/services/object/acl/acl.go | 22 ++-- pkg/services/object/acl/acl_test.go | 16 +-- pkg/services/object/acl/eacl/v2/eacl_test.go | 14 +-- pkg/services/object/acl/eacl/v2/headers.go | 18 ++-- pkg/services/object/acl/eacl/v2/localstore.go | 6 +- pkg/services/object/acl/eacl/v2/object.go | 10 +- pkg/services/object/acl/eacl/v2/opts.go | 6 +- pkg/services/object/acl/eacl/v2/xheader.go | 4 +- pkg/services/object/acl/v2/classifier.go | 12 +-- pkg/services/object/acl/v2/errors.go | 2 +- pkg/services/object/acl/v2/opts.go | 8 +- pkg/services/object/acl/v2/request.go | 14 +-- pkg/services/object/acl/v2/service.go | 22 ++-- pkg/services/object/acl/v2/types.go | 2 +- pkg/services/object/acl/v2/util.go | 18 ++-- pkg/services/object/acl/v2/util_test.go | 16 +-- pkg/services/object/common.go | 4 +- pkg/services/object/delete/delete.go | 2 +- pkg/services/object/delete/exec.go | 12 +-- pkg/services/object/delete/local.go | 4 +- pkg/services/object/delete/prm.go | 4 +- pkg/services/object/delete/service.go | 18 ++-- pkg/services/object/delete/util.go | 10 +- pkg/services/object/delete/v2/service.go | 4 +- pkg/services/object/delete/v2/util.go | 10 +- pkg/services/object/get/assemble.go | 6 +- pkg/services/object/get/container.go | 2 +- pkg/services/object/get/exec.go | 16 +-- pkg/services/object/get/get.go | 4 +- pkg/services/object/get/get_test.go | 30 +++--- pkg/services/object/get/local.go | 4 +- pkg/services/object/get/prm.go | 8 +- pkg/services/object/get/remote.go | 6 +- pkg/services/object/get/service.go | 18 ++-- pkg/services/object/get/util.go | 14 +-- pkg/services/object/get/v2/service.go | 10 +- pkg/services/object/get/v2/streamer.go | 6 +- pkg/services/object/get/v2/util.go | 40 ++++---- pkg/services/object/head/prm.go | 2 +- pkg/services/object/head/remote.go | 14 +-- pkg/services/object/internal/client/client.go | 16 +-- pkg/services/object/internal/client/error.go | 2 +- pkg/services/object/internal/key.go | 4 +- pkg/services/object/metrics.go | 4 +- pkg/services/object/put/distributed.go | 14 +-- pkg/services/object/put/local.go | 8 +- pkg/services/object/put/prm.go | 10 +- pkg/services/object/put/remote.go | 16 +-- pkg/services/object/put/res.go | 2 +- pkg/services/object/put/service.go | 14 +-- pkg/services/object/put/streamer.go | 16 +-- pkg/services/object/put/v2/service.go | 6 +- pkg/services/object/put/v2/streamer.go | 22 ++-- pkg/services/object/put/v2/util.go | 10 +- pkg/services/object/put/validation.go | 10 +- pkg/services/object/response.go | 6 +- pkg/services/object/search/container.go | 2 +- pkg/services/object/search/exec.go | 10 +- pkg/services/object/search/prm.go | 10 +- pkg/services/object/search/search_test.go | 22 ++-- pkg/services/object/search/service.go | 16 +-- pkg/services/object/search/util.go | 16 +-- pkg/services/object/search/v2/service.go | 8 +- pkg/services/object/search/v2/streamer.go | 8 +- pkg/services/object/search/v2/util.go | 28 ++--- pkg/services/object/server.go | 4 +- pkg/services/object/sign.go | 4 +- pkg/services/object/transport_splitter.go | 4 +- pkg/services/object/util/chain.go | 4 +- pkg/services/object/util/key.go | 8 +- pkg/services/object/util/key_test.go | 16 +-- pkg/services/object/util/log.go | 4 +- pkg/services/object/util/placement.go | 14 +-- pkg/services/object/util/prm.go | 6 +- .../object_manager/placement/netmap.go | 8 +- .../object_manager/placement/traverser.go | 10 +- .../placement/traverser_test.go | 12 +-- .../object_manager/storagegroup/collect.go | 14 +-- .../object_manager/storagegroup/search.go | 2 +- .../object_manager/tombstone/checker.go | 8 +- .../object_manager/tombstone/constructor.go | 2 +- .../object_manager/tombstone/source/source.go | 12 +-- .../object_manager/transformer/fmt.go | 10 +- .../object_manager/transformer/transformer.go | 8 +- .../object_manager/transformer/types.go | 4 +- pkg/services/policer/check.go | 18 ++-- pkg/services/policer/check_test.go | 2 +- pkg/services/policer/policer.go | 16 +-- pkg/services/policer/process.go | 4 +- pkg/services/policer/queue.go | 4 +- pkg/services/replicator/process.go | 6 +- pkg/services/replicator/replicator.go | 6 +- pkg/services/replicator/task.go | 6 +- pkg/services/reputation/common/deps.go | 4 +- pkg/services/reputation/common/managers.go | 10 +- .../reputation/common/router/calls.go | 4 +- pkg/services/reputation/common/router/deps.go | 4 +- pkg/services/reputation/common/router/opts.go | 2 +- .../reputation/common/router/router.go | 4 +- pkg/services/reputation/common/router/util.go | 4 +- .../eigentrust/calculator/calculator.go | 6 +- .../reputation/eigentrust/calculator/calls.go | 6 +- .../reputation/eigentrust/calculator/deps.go | 6 +- .../reputation/eigentrust/calculator/opts.go | 2 +- .../reputation/eigentrust/controller/calls.go | 2 +- .../eigentrust/controller/controller.go | 2 +- .../reputation/eigentrust/controller/opts.go | 2 +- .../reputation/eigentrust/iteration.go | 2 +- .../reputation/eigentrust/routes/builder.go | 4 +- .../reputation/eigentrust/routes/calls.go | 4 +- .../eigentrust/storage/consumers/calls.go | 8 +- .../eigentrust/storage/daughters/calls.go | 6 +- .../reputation/local/controller/calls.go | 6 +- .../reputation/local/controller/controller.go | 2 +- .../reputation/local/controller/deps.go | 4 +- .../reputation/local/controller/opts.go | 2 +- .../reputation/local/controller/util.go | 2 +- .../reputation/local/routes/builder.go | 4 +- pkg/services/reputation/local/routes/calls.go | 4 +- .../reputation/local/storage/calls.go | 4 +- pkg/services/reputation/rpc/response.go | 6 +- pkg/services/reputation/rpc/server.go | 2 +- pkg/services/reputation/rpc/sign.go | 4 +- pkg/services/reputation/trust.go | 2 +- pkg/services/session/executor.go | 4 +- pkg/services/session/response.go | 6 +- pkg/services/session/server.go | 2 +- pkg/services/session/sign.go | 4 +- .../session/storage/persistent/executor.go | 6 +- .../storage/persistent/executor_test.go | 6 +- .../session/storage/persistent/options.go | 2 +- .../session/storage/persistent/storage.go | 6 +- .../session/storage/persistent/util.go | 2 +- .../session/storage/temporary/executor.go | 6 +- .../session/storage/temporary/storage.go | 4 +- pkg/services/tree/cache.go | 2 +- pkg/services/tree/container.go | 8 +- pkg/services/tree/drop.go | 2 +- pkg/services/tree/getsubtree_test.go | 4 +- pkg/services/tree/options.go | 10 +- pkg/services/tree/redirect.go | 2 +- pkg/services/tree/replicator.go | 6 +- pkg/services/tree/service.go | 10 +- pkg/services/tree/service.pb.go | Bin 118667 -> 118703 bytes pkg/services/tree/service.proto | 2 +- pkg/services/tree/service_frostfs.pb.go | Bin 57231 -> 57237 bytes pkg/services/tree/signature.go | 20 ++-- pkg/services/tree/signature_test.go | 24 ++--- pkg/services/tree/sync.go | 10 +- pkg/services/tree/types.pb.go | Bin 9874 -> 9912 bytes pkg/services/tree/types.proto | 2 +- pkg/services/tree/types_frostfs.pb.go | Bin 3018 -> 3024 bytes pkg/services/util/response/client_stream.go | 2 +- pkg/services/util/response/server_stream.go | 2 +- pkg/services/util/response/service.go | 10 +- pkg/services/util/response/unary.go | 2 +- pkg/services/util/sign.go | 6 +- pkg/util/attributes/parser.go | 2 +- pkg/util/attributes/parser_test.go | 4 +- pkg/util/locode/column/coordinates.go | 2 +- pkg/util/locode/column/country.go | 2 +- pkg/util/locode/column/location.go | 2 +- pkg/util/locode/db/airports/calls.go | 4 +- pkg/util/locode/db/boltdb/calls.go | 4 +- .../locode/db/continents/geojson/calls.go | 2 +- pkg/util/locode/db/country.go | 2 +- pkg/util/locode/db/db.go | 2 +- pkg/util/locode/db/location.go | 2 +- pkg/util/locode/db/point.go | 2 +- pkg/util/locode/db/point_test.go | 2 +- pkg/util/locode/db/record.go | 4 +- pkg/util/locode/table/csv/calls.go | 4 +- pkg/util/logger/test/logger.go | 2 +- pkg/util/precision/converter_test.go | 2 +- pkg/util/salt_test.go | 2 +- pkg/util/state/storage_test.go | 2 +- 841 files changed, 3077 insertions(+), 3075 deletions(-) diff --git a/Makefile b/Makefile index 1355b6fb..8b01081b 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ protoc: @GOPRIVATE=github.com/TrueCloudLab go mod vendor # Install specific version for protobuf lib @go list -f '{{.Path}}/...@{{.Version}}' -m github.com/golang/protobuf | xargs go install -v - @GOBIN=$(abspath $(BIN)) go install -mod=mod -v github.com/TrueCloudLab/frostfs-api-go/v2/util/protogen + @GOBIN=$(abspath $(BIN)) go install -mod=mod -v git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/protogen # Protoc generate @for f in `find . -type f -name '*.proto' -not -path './vendor/*'`; do \ echo "⇒ Processing $$f "; \ diff --git a/README.md b/README.md index d906f426..81701c44 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ dApps directly from code level. This way dApps are not limited to on-chain storage and can manipulate large amounts of data without paying a prohibitive price. -FrostFS has a native [gRPC API](https://github.com/TrueCloudLab/frostfs-api) and has +FrostFS has a native [gRPC API](https://git.frostfs.info/TrueCloudLab/frostfs-api) and has protocol gateways for popular protocols such as [AWS S3](https://github.com/TrueCloudLab/frostfs-s3-gw), [HTTP](https://github.com/TrueCloudLab/frostfs-http-gw), diff --git a/cmd/frostfs-adm/README.md b/cmd/frostfs-adm/README.md index 82b77783..d9df256e 100644 --- a/cmd/frostfs-adm/README.md +++ b/cmd/frostfs-adm/README.md @@ -18,7 +18,7 @@ Build docker image with `make image-adm`. At FrostFS private install deployment, frostfs-adm requires compiled FrostFS contracts. Find them in the latest release of -[frostfs-contract repository](https://github.com/TrueCloudLab/frostfs-contract/releases). +[frostfs-contract repository](https://git.frostfs.info/TrueCloudLab/frostfs-contract/releases). ## Commands diff --git a/cmd/frostfs-adm/internal/modules/config/config.go b/cmd/frostfs-adm/internal/modules/config/config.go index 5f4ebc42..13e57593 100644 --- a/cmd/frostfs-adm/internal/modules/config/config.go +++ b/cmd/frostfs-adm/internal/modules/config/config.go @@ -7,7 +7,7 @@ import ( "path/filepath" "text/template" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/nspcc-dev/neo-go/cli/input" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/frostfs-adm/internal/modules/config/config_test.go b/cmd/frostfs-adm/internal/modules/config/config_test.go index c49b2cb5..292fe76d 100644 --- a/cmd/frostfs-adm/internal/modules/config/config_test.go +++ b/cmd/frostfs-adm/internal/modules/config/config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/spf13/viper" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-adm/internal/modules/morph/balance.go b/cmd/frostfs-adm/internal/modules/morph/balance.go index 72022aa3..72485eef 100644 --- a/cmd/frostfs-adm/internal/modules/morph/balance.go +++ b/cmd/frostfs-adm/internal/modules/morph/balance.go @@ -6,8 +6,8 @@ import ( "fmt" "math/big" - "github.com/TrueCloudLab/frostfs-contract/nns" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-contract/nns" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" diff --git a/cmd/frostfs-adm/internal/modules/morph/container.go b/cmd/frostfs-adm/internal/modules/morph/container.go index 26ff90e9..5c0b18e0 100644 --- a/cmd/frostfs-adm/internal/modules/morph/container.go +++ b/cmd/frostfs-adm/internal/modules/morph/container.go @@ -7,7 +7,7 @@ import ( "os" "sort" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/crypto/hash" "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/rpcclient/invoker" diff --git a/cmd/frostfs-adm/internal/modules/morph/deploy.go b/cmd/frostfs-adm/internal/modules/morph/deploy.go index 62170f09..2aaddce1 100644 --- a/cmd/frostfs-adm/internal/modules/morph/deploy.go +++ b/cmd/frostfs-adm/internal/modules/morph/deploy.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/TrueCloudLab/frostfs-contract/nns" + "git.frostfs.info/TrueCloudLab/frostfs-contract/nns" "github.com/nspcc-dev/neo-go/cli/cmdargs" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/encoding/address" diff --git a/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go b/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go index 030542fb..32f85bce 100644 --- a/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go +++ b/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go @@ -7,7 +7,7 @@ import ( "strings" "text/tabwriter" - "github.com/TrueCloudLab/frostfs-contract/nns" + "git.frostfs.info/TrueCloudLab/frostfs-contract/nns" "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/rpcclient/invoker" "github.com/nspcc-dev/neo-go/pkg/rpcclient/unwrap" diff --git a/cmd/frostfs-adm/internal/modules/morph/generate.go b/cmd/frostfs-adm/internal/modules/morph/generate.go index 52ffddb6..23637fed 100644 --- a/cmd/frostfs-adm/internal/modules/morph/generate.go +++ b/cmd/frostfs-adm/internal/modules/morph/generate.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/encoding/address" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" diff --git a/cmd/frostfs-adm/internal/modules/morph/generate_test.go b/cmd/frostfs-adm/internal/modules/morph/generate_test.go index d2478c02..39cfc571 100644 --- a/cmd/frostfs-adm/internal/modules/morph/generate_test.go +++ b/cmd/frostfs-adm/internal/modules/morph/generate_test.go @@ -9,7 +9,7 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/nspcc-dev/neo-go/cli/input" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/smartcontract" diff --git a/cmd/frostfs-adm/internal/modules/morph/group.go b/cmd/frostfs-adm/internal/modules/morph/group.go index cd30e1be..3fdffd4e 100644 --- a/cmd/frostfs-adm/internal/modules/morph/group.go +++ b/cmd/frostfs-adm/internal/modules/morph/group.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/smartcontract/manifest" "github.com/nspcc-dev/neo-go/pkg/util" diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize.go b/cmd/frostfs-adm/internal/modules/morph/initialize.go index dc4208c0..bab8e12c 100644 --- a/cmd/frostfs-adm/internal/modules/morph/initialize.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize.go @@ -7,9 +7,9 @@ import ( "path/filepath" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring" - morphClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring" + morphClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/native/nativenames" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/transaction" diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go b/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go index d12b2a52..1be94bf1 100644 --- a/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go @@ -12,10 +12,10 @@ import ( "path/filepath" "strings" - "github.com/TrueCloudLab/frostfs-contract/common" - "github.com/TrueCloudLab/frostfs-contract/nns" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring" - morphClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-contract/common" + "git.frostfs.info/TrueCloudLab/frostfs-contract/nns" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring" + morphClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/encoding/address" diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go b/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go index 3c6d05a7..7473d9e4 100644 --- a/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/TrueCloudLab/frostfs-contract/nns" - morphClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-contract/nns" + morphClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/encoding/address" diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize_test.go b/cmd/frostfs-adm/internal/modules/morph/initialize_test.go index e4927ce5..3c6adfc3 100644 --- a/cmd/frostfs-adm/internal/modules/morph/initialize_test.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/nspcc-dev/neo-go/pkg/config" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm" diff --git a/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go b/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go index 49cce0aeb18d9a45d326a7b8f299466f72040174..6754bf66e7e5386f6b77ed61db9c299a2f3a97bf 100644 GIT binary patch delta 160 zcmdmNeBF41Est8Vj)FmjX(EC&GY7HFEOodz4Jyn{Kpdmg$#;14HBzAxAZZBO3@nlc zRs$wYO@P`aPvuc&RG7Sr$C?Sq>E)E>gs29pm@Lf;7W}}Y$ZQDY)xZ0hcFrWtS5VL MfkZba@s)A|0MWN6;{X5v diff --git a/cmd/frostfs-adm/internal/modules/morph/internal/types.proto b/cmd/frostfs-adm/internal/modules/morph/internal/types.proto index 8f5ce70d..2ce61b3c 100644 --- a/cmd/frostfs-adm/internal/modules/morph/internal/types.proto +++ b/cmd/frostfs-adm/internal/modules/morph/internal/types.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package neo.fs.v2.refs; -option go_package = "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/internal"; +option go_package = "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/internal"; // Client group identifier in the FrostFS subnet. // diff --git a/cmd/frostfs-adm/internal/modules/morph/netmap_candidates.go b/cmd/frostfs-adm/internal/modules/morph/netmap_candidates.go index 241e274a..222b9902 100644 --- a/cmd/frostfs-adm/internal/modules/morph/netmap_candidates.go +++ b/cmd/frostfs-adm/internal/modules/morph/netmap_candidates.go @@ -1,9 +1,9 @@ package morph import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neo-go/pkg/rpcclient/invoker" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/frostfs-adm/internal/modules/morph/remove_node.go b/cmd/frostfs-adm/internal/modules/morph/remove_node.go index 481ea58a..df67433c 100644 --- a/cmd/frostfs-adm/internal/modules/morph/remove_node.go +++ b/cmd/frostfs-adm/internal/modules/morph/remove_node.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - netmapcontract "github.com/TrueCloudLab/frostfs-contract/netmap" + netmapcontract "git.frostfs.info/TrueCloudLab/frostfs-contract/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/smartcontract/callflag" diff --git a/cmd/frostfs-adm/internal/modules/morph/subnet.go b/cmd/frostfs-adm/internal/modules/morph/subnet.go index 6b6def2e..229a2cea 100644 --- a/cmd/frostfs-adm/internal/modules/morph/subnet.go +++ b/cmd/frostfs-adm/internal/modules/morph/subnet.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" - "github.com/TrueCloudLab/frostfs-sdk-go/subnet" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/cli/flags" "github.com/nspcc-dev/neo-go/cli/input" "github.com/nspcc-dev/neo-go/pkg/core/native/nativenames" diff --git a/cmd/frostfs-adm/internal/modules/root.go b/cmd/frostfs-adm/internal/modules/root.go index 67584e92..4e30d5e6 100644 --- a/cmd/frostfs-adm/internal/modules/root.go +++ b/cmd/frostfs-adm/internal/modules/root.go @@ -3,14 +3,14 @@ package modules import ( "os" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/storagecfg" - "github.com/TrueCloudLab/frostfs-node/misc" - "github.com/TrueCloudLab/frostfs-node/pkg/util/autocomplete" - utilConfig "github.com/TrueCloudLab/frostfs-node/pkg/util/config" - "github.com/TrueCloudLab/frostfs-node/pkg/util/gendoc" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/storagecfg" + "git.frostfs.info/TrueCloudLab/frostfs-node/misc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/autocomplete" + utilConfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/gendoc" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/frostfs-adm/internal/modules/storagecfg/root.go b/cmd/frostfs-adm/internal/modules/storagecfg/root.go index be795ed7..682350ba 100644 --- a/cmd/frostfs-adm/internal/modules/storagecfg/root.go +++ b/cmd/frostfs-adm/internal/modules/storagecfg/root.go @@ -16,7 +16,7 @@ import ( "text/template" "time" - netutil "github.com/TrueCloudLab/frostfs-node/pkg/network" + netutil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" "github.com/chzyer/readline" "github.com/nspcc-dev/neo-go/cli/flags" "github.com/nspcc-dev/neo-go/cli/input" @@ -153,7 +153,7 @@ func storageConfig(cmd *cobra.Command, args []string) { validator := netutil.Address{} err := validator.FromString(c.AnnouncedAddress) if err != nil { - cmd.Println("Incorrect address format. See https://github.com/TrueCloudLab/frostfs-node/blob/master/pkg/network/address.go for details.") + cmd.Println("Incorrect address format. See https://git.frostfs.info/TrueCloudLab/frostfs-node/src/branch/master/pkg/network/address.go for details.") continue } uriAddr, err := url.Parse(validator.URIAddr()) diff --git a/cmd/frostfs-adm/main.go b/cmd/frostfs-adm/main.go index 11db7450..eb91e3ab 100644 --- a/cmd/frostfs-adm/main.go +++ b/cmd/frostfs-adm/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules" ) func main() { diff --git a/cmd/frostfs-cli/internal/client/client.go b/cmd/frostfs-cli/internal/client/client.go index 71811032..cbf19eb4 100644 --- a/cmd/frostfs-cli/internal/client/client.go +++ b/cmd/frostfs-cli/internal/client/client.go @@ -7,15 +7,15 @@ import ( "fmt" "io" - "github.com/TrueCloudLab/frostfs-sdk-go/accounting" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + containerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" ) // BalanceOfPrm groups parameters of BalanceOf operation. diff --git a/cmd/frostfs-cli/internal/client/prm.go b/cmd/frostfs-cli/internal/client/prm.go index c98c612a..e5c1b41c 100644 --- a/cmd/frostfs-cli/internal/client/prm.go +++ b/cmd/frostfs-cli/internal/client/prm.go @@ -3,11 +3,11 @@ package internal import ( "io" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) // here are small structures with public setters to share between parameter structures diff --git a/cmd/frostfs-cli/internal/client/sdk.go b/cmd/frostfs-cli/internal/client/sdk.go index 27ca356d..4cf0b0a3 100644 --- a/cmd/frostfs-cli/internal/client/sdk.go +++ b/cmd/frostfs-cli/internal/client/sdk.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-sdk-go/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -48,7 +48,7 @@ func GetSDKClient(cmd *cobra.Command, key *ecdsa.PrivateKey, addr network.Addres ) prmInit.SetDefaultPrivateKey(*key) - prmInit.ResolveNeoFSFailures() + prmInit.ResolveFrostFSFailures() prmDial.SetServerURI(addr.URIAddr()) if timeout := viper.GetDuration(commonflags.Timeout); timeout > 0 { // In CLI we can only set a timeout for the whole operation. diff --git a/cmd/frostfs-cli/internal/common/eacl.go b/cmd/frostfs-cli/internal/common/eacl.go index 7efb3ff8..0a623b0e 100644 --- a/cmd/frostfs-cli/internal/common/eacl.go +++ b/cmd/frostfs-cli/internal/common/eacl.go @@ -4,10 +4,10 @@ import ( "errors" "os" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/core/version" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - versionSDK "github.com/TrueCloudLab/frostfs-sdk-go/version" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/version" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + versionSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/internal/common/token.go b/cmd/frostfs-cli/internal/common/token.go index abe16265..102a2d59 100644 --- a/cmd/frostfs-cli/internal/common/token.go +++ b/cmd/frostfs-cli/internal/common/token.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/internal/common/verbose.go b/cmd/frostfs-cli/internal/common/verbose.go index 0d45b1dc..2f95626f 100644 --- a/cmd/frostfs-cli/internal/common/verbose.go +++ b/cmd/frostfs-cli/internal/common/verbose.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-sdk-go/checksum" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/frostfs-cli/internal/key/key_test.go b/cmd/frostfs-cli/internal/key/key_test.go index 563cd954..e3127a3f 100644 --- a/cmd/frostfs-cli/internal/key/key_test.go +++ b/cmd/frostfs-cli/internal/key/key_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/nspcc-dev/neo-go/cli/input" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/wallet" diff --git a/cmd/frostfs-cli/internal/key/raw.go b/cmd/frostfs-cli/internal/key/raw.go index ceea935f..4b5591a8 100644 --- a/cmd/frostfs-cli/internal/key/raw.go +++ b/cmd/frostfs-cli/internal/key/raw.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/wallet" "github.com/spf13/cobra" diff --git a/cmd/frostfs-cli/internal/key/wallet.go b/cmd/frostfs-cli/internal/key/wallet.go index 26178c27..991c6633 100644 --- a/cmd/frostfs-cli/internal/key/wallet.go +++ b/cmd/frostfs-cli/internal/key/wallet.go @@ -4,7 +4,7 @@ import ( "crypto/ecdsa" "errors" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" "github.com/nspcc-dev/neo-go/cli/flags" "github.com/nspcc-dev/neo-go/cli/input" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" diff --git a/cmd/frostfs-cli/main.go b/cmd/frostfs-cli/main.go index 40dfbe0a..b2fa1dad 100644 --- a/cmd/frostfs-cli/main.go +++ b/cmd/frostfs-cli/main.go @@ -1,6 +1,6 @@ package main -import cmd "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules" +import cmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules" func main() { cmd.Execute() diff --git a/cmd/frostfs-cli/modules/accounting/balance.go b/cmd/frostfs-cli/modules/accounting/balance.go index bb80a2b3..bec40f1f 100644 --- a/cmd/frostfs-cli/modules/accounting/balance.go +++ b/cmd/frostfs-cli/modules/accounting/balance.go @@ -3,13 +3,13 @@ package accounting import ( "math/big" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/precision" - "github.com/TrueCloudLab/frostfs-sdk-go/accounting" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/precision" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/frostfs-cli/modules/accounting/root.go b/cmd/frostfs-cli/modules/accounting/root.go index 98d564f8..8ab8aa12 100644 --- a/cmd/frostfs-cli/modules/accounting/root.go +++ b/cmd/frostfs-cli/modules/accounting/root.go @@ -1,7 +1,7 @@ package accounting import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/frostfs-cli/modules/acl/basic/print.go b/cmd/frostfs-cli/modules/acl/basic/print.go index 7d76251a..cb037bbb 100644 --- a/cmd/frostfs-cli/modules/acl/basic/print.go +++ b/cmd/frostfs-cli/modules/acl/basic/print.go @@ -1,9 +1,9 @@ package basic import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/acl/extended/create.go b/cmd/frostfs-cli/modules/acl/extended/create.go index dc38f9fa..f089345e 100644 --- a/cmd/frostfs-cli/modules/acl/extended/create.go +++ b/cmd/frostfs-cli/modules/acl/extended/create.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/spf13/cobra" ) @@ -30,7 +30,7 @@ Filter consists of : Key is a valid unicode string corresponding to object or request header key. Well-known system object headers start with '$Object:' prefix. User defined headers start without prefix. - Read more about filter keys at github.com/TrueCloudLab/frostfs-api/blob/master/proto-docs/acl.md#message-eaclrecordfilter + Read more about filter keys at git.frostfs.info.com/TrueCloudLab/frostfs-api/src/branch/master/proto-docs/acl.md#message-eaclrecordfilter Match is '=' for matching and '!=' for non-matching filter. Value is a valid unicode string corresponding to object or request header value. diff --git a/cmd/frostfs-cli/modules/acl/extended/create_test.go b/cmd/frostfs-cli/modules/acl/extended/create_test.go index 213bc8aa..71f41e58 100644 --- a/cmd/frostfs-cli/modules/acl/extended/create_test.go +++ b/cmd/frostfs-cli/modules/acl/extended/create_test.go @@ -3,8 +3,8 @@ package extended import ( "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-cli/modules/acl/extended/print.go b/cmd/frostfs-cli/modules/acl/extended/print.go index 0008a123..3e46a70b 100644 --- a/cmd/frostfs-cli/modules/acl/extended/print.go +++ b/cmd/frostfs-cli/modules/acl/extended/print.go @@ -4,9 +4,9 @@ import ( "os" "strings" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/acl/root.go b/cmd/frostfs-cli/modules/acl/root.go index 61443cda..3f318914 100644 --- a/cmd/frostfs-cli/modules/acl/root.go +++ b/cmd/frostfs-cli/modules/acl/root.go @@ -1,8 +1,8 @@ package acl import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl/basic" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl/extended" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl/basic" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl/extended" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/bearer/create.go b/cmd/frostfs-cli/modules/bearer/create.go index d6b33169..2f1623d9 100644 --- a/cmd/frostfs-cli/modules/bearer/create.go +++ b/cmd/frostfs-cli/modules/bearer/create.go @@ -7,13 +7,13 @@ import ( "os" "time" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/completion.go b/cmd/frostfs-cli/modules/completion.go index bfcc3146..618317e0 100644 --- a/cmd/frostfs-cli/modules/completion.go +++ b/cmd/frostfs-cli/modules/completion.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/autocomplete" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/autocomplete" ) func init() { diff --git a/cmd/frostfs-cli/modules/container/create.go b/cmd/frostfs-cli/modules/container/create.go index 407309e9..78de4082 100644 --- a/cmd/frostfs-cli/modules/container/create.go +++ b/cmd/frostfs-cli/modules/container/create.go @@ -7,17 +7,17 @@ import ( "strings" "time" - containerApi "github.com/TrueCloudLab/frostfs-api-go/v2/container" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + containerApi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/delete.go b/cmd/frostfs-cli/modules/container/delete.go index 617da2a4..09e76d59 100644 --- a/cmd/frostfs-cli/modules/container/delete.go +++ b/cmd/frostfs-cli/modules/container/delete.go @@ -4,13 +4,13 @@ import ( "fmt" "time" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/get.go b/cmd/frostfs-cli/modules/container/get.go index 9a72c5ad..2db1f7c8 100644 --- a/cmd/frostfs-cli/modules/container/get.go +++ b/cmd/frostfs-cli/modules/container/get.go @@ -4,15 +4,15 @@ import ( "crypto/ecdsa" "os" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/get_eacl.go b/cmd/frostfs-cli/modules/container/get_eacl.go index 94c9d5a1..bc04a84f 100644 --- a/cmd/frostfs-cli/modules/container/get_eacl.go +++ b/cmd/frostfs-cli/modules/container/get_eacl.go @@ -3,11 +3,11 @@ package container import ( "os" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/list.go b/cmd/frostfs-cli/modules/container/list.go index e0c45e90..1dd0fe8c 100644 --- a/cmd/frostfs-cli/modules/container/list.go +++ b/cmd/frostfs-cli/modules/container/list.go @@ -3,12 +3,12 @@ package container import ( "strings" - "github.com/TrueCloudLab/frostfs-api-go/v2/container" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/list_objects.go b/cmd/frostfs-cli/modules/container/list_objects.go index 06359550..35649a08 100644 --- a/cmd/frostfs-cli/modules/container/list_objects.go +++ b/cmd/frostfs-cli/modules/container/list_objects.go @@ -3,14 +3,14 @@ package container import ( "strings" - v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/nodes.go b/cmd/frostfs-cli/modules/container/nodes.go index c273f3cb..d89772fc 100644 --- a/cmd/frostfs-cli/modules/container/nodes.go +++ b/cmd/frostfs-cli/modules/container/nodes.go @@ -3,13 +3,13 @@ package container import ( "crypto/sha256" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - containerAPI "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + containerAPI "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/root.go b/cmd/frostfs-cli/modules/container/root.go index fe789e18..30a82954 100644 --- a/cmd/frostfs-cli/modules/container/root.go +++ b/cmd/frostfs-cli/modules/container/root.go @@ -1,7 +1,7 @@ package container import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/set_eacl.go b/cmd/frostfs-cli/modules/container/set_eacl.go index 3d3f1457..0b781589 100644 --- a/cmd/frostfs-cli/modules/container/set_eacl.go +++ b/cmd/frostfs-cli/modules/container/set_eacl.go @@ -5,11 +5,11 @@ import ( "errors" "time" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/container/util.go b/cmd/frostfs-cli/modules/container/util.go index 6ea35ace..48265f78 100644 --- a/cmd/frostfs-cli/modules/container/util.go +++ b/cmd/frostfs-cli/modules/container/util.go @@ -3,11 +3,11 @@ package container import ( "errors" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/drop_objects.go b/cmd/frostfs-cli/modules/control/drop_objects.go index fc8afd0f..9de3ae8a 100644 --- a/cmd/frostfs-cli/modules/control/drop_objects.go +++ b/cmd/frostfs-cli/modules/control/drop_objects.go @@ -1,10 +1,10 @@ package control import ( - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/evacuate_shard.go b/cmd/frostfs-cli/modules/control/evacuate_shard.go index d7dad460..02ee88ce 100644 --- a/cmd/frostfs-cli/modules/control/evacuate_shard.go +++ b/cmd/frostfs-cli/modules/control/evacuate_shard.go @@ -1,10 +1,10 @@ package control import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/flush_cache.go b/cmd/frostfs-cli/modules/control/flush_cache.go index d86c91cb..48be393d 100644 --- a/cmd/frostfs-cli/modules/control/flush_cache.go +++ b/cmd/frostfs-cli/modules/control/flush_cache.go @@ -1,10 +1,10 @@ package control import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/healthcheck.go b/cmd/frostfs-cli/modules/control/healthcheck.go index deb54454..8d18a5c1 100644 --- a/cmd/frostfs-cli/modules/control/healthcheck.go +++ b/cmd/frostfs-cli/modules/control/healthcheck.go @@ -3,13 +3,13 @@ package control import ( "crypto/ecdsa" - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - ircontrol "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" - ircontrolsrv "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir/server" - "github.com/TrueCloudLab/frostfs-sdk-go/client" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + ircontrol "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir" + ircontrolsrv "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir/server" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/root.go b/cmd/frostfs-cli/modules/control/root.go index dd356011..d3b65639 100644 --- a/cmd/frostfs-cli/modules/control/root.go +++ b/cmd/frostfs-cli/modules/control/root.go @@ -1,7 +1,7 @@ package control import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/frostfs-cli/modules/control/set_netmap_status.go b/cmd/frostfs-cli/modules/control/set_netmap_status.go index 8c1d2b28..3aa74168 100644 --- a/cmd/frostfs-cli/modules/control/set_netmap_status.go +++ b/cmd/frostfs-cli/modules/control/set_netmap_status.go @@ -3,12 +3,12 @@ package control import ( "fmt" - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/shards_dump.go b/cmd/frostfs-cli/modules/control/shards_dump.go index ff5afb98..c0d0aca9 100644 --- a/cmd/frostfs-cli/modules/control/shards_dump.go +++ b/cmd/frostfs-cli/modules/control/shards_dump.go @@ -1,10 +1,10 @@ package control import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/shards_list.go b/cmd/frostfs-cli/modules/control/shards_list.go index 8faf5f6e..ec515e6b 100644 --- a/cmd/frostfs-cli/modules/control/shards_list.go +++ b/cmd/frostfs-cli/modules/control/shards_list.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/mr-tron/base58" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/shards_restore.go b/cmd/frostfs-cli/modules/control/shards_restore.go index 8ea069ef..edf97a73 100644 --- a/cmd/frostfs-cli/modules/control/shards_restore.go +++ b/cmd/frostfs-cli/modules/control/shards_restore.go @@ -1,10 +1,10 @@ package control import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/shards_set_mode.go b/cmd/frostfs-cli/modules/control/shards_set_mode.go index c514c1f9..4f6e2408 100644 --- a/cmd/frostfs-cli/modules/control/shards_set_mode.go +++ b/cmd/frostfs-cli/modules/control/shards_set_mode.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/mr-tron/base58" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/synchronize_tree.go b/cmd/frostfs-cli/modules/control/synchronize_tree.go index 60f06b3b..2287344d 100644 --- a/cmd/frostfs-cli/modules/control/synchronize_tree.go +++ b/cmd/frostfs-cli/modules/control/synchronize_tree.go @@ -4,13 +4,13 @@ import ( "crypto/sha256" "errors" - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - controlSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/control/server" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + controlSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/server" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/control/util.go b/cmd/frostfs-cli/modules/control/util.go index 8177d4a8..fdf17244 100644 --- a/cmd/frostfs-cli/modules/control/util.go +++ b/cmd/frostfs-cli/modules/control/util.go @@ -4,13 +4,13 @@ import ( "crypto/ecdsa" "errors" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - controlSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/control/server" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + controlSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/server" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/netmap/get_epoch.go b/cmd/frostfs-cli/modules/netmap/get_epoch.go index 2f5f85df..6e05721f 100644 --- a/cmd/frostfs-cli/modules/netmap/get_epoch.go +++ b/cmd/frostfs-cli/modules/netmap/get_epoch.go @@ -1,10 +1,10 @@ package netmap import ( - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/netmap/netinfo.go b/cmd/frostfs-cli/modules/netmap/netinfo.go index bd8e5e94..f34456c7 100644 --- a/cmd/frostfs-cli/modules/netmap/netinfo.go +++ b/cmd/frostfs-cli/modules/netmap/netinfo.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "time" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" "github.com/nspcc-dev/neo-go/pkg/config/netmode" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/netmap/nodeinfo.go b/cmd/frostfs-cli/modules/netmap/nodeinfo.go index 7bf9cb17..4a94d9e7 100644 --- a/cmd/frostfs-cli/modules/netmap/nodeinfo.go +++ b/cmd/frostfs-cli/modules/netmap/nodeinfo.go @@ -3,12 +3,12 @@ package netmap import ( "encoding/hex" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/netmap/root.go b/cmd/frostfs-cli/modules/netmap/root.go index bdb34f73..aaa83f12 100644 --- a/cmd/frostfs-cli/modules/netmap/root.go +++ b/cmd/frostfs-cli/modules/netmap/root.go @@ -1,7 +1,7 @@ package netmap import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/netmap/snapshot.go b/cmd/frostfs-cli/modules/netmap/snapshot.go index 709e38e8..0878f5ce 100644 --- a/cmd/frostfs-cli/modules/netmap/snapshot.go +++ b/cmd/frostfs-cli/modules/netmap/snapshot.go @@ -1,10 +1,10 @@ package netmap import ( - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/delete.go b/cmd/frostfs-cli/modules/object/delete.go index 4ac8d243..25d5703d 100644 --- a/cmd/frostfs-cli/modules/object/delete.go +++ b/cmd/frostfs-cli/modules/object/delete.go @@ -3,12 +3,12 @@ package object import ( "fmt" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/get.go b/cmd/frostfs-cli/modules/object/get.go index fc3c4dea..b077610f 100644 --- a/cmd/frostfs-cli/modules/object/get.go +++ b/cmd/frostfs-cli/modules/object/get.go @@ -6,13 +6,13 @@ import ( "io" "os" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/cheggaaa/pb" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/hash.go b/cmd/frostfs-cli/modules/object/hash.go index 0bc35443..c7d734e6 100644 --- a/cmd/frostfs-cli/modules/object/hash.go +++ b/cmd/frostfs-cli/modules/object/hash.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/checksum" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/head.go b/cmd/frostfs-cli/modules/object/head.go index 795fe355..fc2e7c9c 100644 --- a/cmd/frostfs-cli/modules/object/head.go +++ b/cmd/frostfs-cli/modules/object/head.go @@ -6,16 +6,16 @@ import ( "fmt" "os" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidSDK "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/lock.go b/cmd/frostfs-cli/modules/object/lock.go index 65035994..7f7da959 100644 --- a/cmd/frostfs-cli/modules/object/lock.go +++ b/cmd/frostfs-cli/modules/object/lock.go @@ -7,16 +7,16 @@ import ( "strconv" "time" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/put.go b/cmd/frostfs-cli/modules/object/put.go index 11bfedbd..ef3b6dcb 100644 --- a/cmd/frostfs-cli/modules/object/put.go +++ b/cmd/frostfs-cli/modules/object/put.go @@ -10,14 +10,14 @@ import ( "strings" "time" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/cheggaaa/pb" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/range.go b/cmd/frostfs-cli/modules/object/range.go index 7a4d3a38..a594204f 100644 --- a/cmd/frostfs-cli/modules/object/range.go +++ b/cmd/frostfs-cli/modules/object/range.go @@ -9,13 +9,13 @@ import ( "strconv" "strings" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/root.go b/cmd/frostfs-cli/modules/object/root.go index f79bb433..88615307 100644 --- a/cmd/frostfs-cli/modules/object/root.go +++ b/cmd/frostfs-cli/modules/object/root.go @@ -1,7 +1,7 @@ package object import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/search.go b/cmd/frostfs-cli/modules/object/search.go index d378abdb..de4a8a3b 100644 --- a/cmd/frostfs-cli/modules/object/search.go +++ b/cmd/frostfs-cli/modules/object/search.go @@ -5,13 +5,13 @@ import ( "os" "strings" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidSDK "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/object/util.go b/cmd/frostfs-cli/modules/object/util.go index 7832db44..25adffc1 100644 --- a/cmd/frostfs-cli/modules/object/util.go +++ b/cmd/frostfs-cli/modules/object/util.go @@ -7,18 +7,18 @@ import ( "os" "strings" - internal "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - sessionCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/session" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + internal "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + sessionCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/session" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/frostfs-cli/modules/root.go b/cmd/frostfs-cli/modules/root.go index 4bc317ba..cf6d1d40 100644 --- a/cmd/frostfs-cli/modules/root.go +++ b/cmd/frostfs-cli/modules/root.go @@ -4,23 +4,23 @@ import ( "os" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - accountingCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/accounting" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl" - bearerCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/bearer" - containerCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/container" - controlCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/control" - netmapCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/netmap" - objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" - sessionCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/session" - sgCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/storagegroup" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/tree" - utilCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/misc" - "github.com/TrueCloudLab/frostfs-node/pkg/util/config" - "github.com/TrueCloudLab/frostfs-node/pkg/util/gendoc" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + accountingCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl" + bearerCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/bearer" + containerCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/container" + controlCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/control" + netmapCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/netmap" + objectCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + sessionCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/session" + sgCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/tree" + utilCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/misc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/gendoc" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/frostfs-cli/modules/session/create.go b/cmd/frostfs-cli/modules/session/create.go index 61691b57..e1c951b9 100644 --- a/cmd/frostfs-cli/modules/session/create.go +++ b/cmd/frostfs-cli/modules/session/create.go @@ -4,14 +4,14 @@ import ( "fmt" "os" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "github.com/google/uuid" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/frostfs-cli/modules/storagegroup/delete.go b/cmd/frostfs-cli/modules/storagegroup/delete.go index 91945c96..83751de7 100644 --- a/cmd/frostfs-cli/modules/storagegroup/delete.go +++ b/cmd/frostfs-cli/modules/storagegroup/delete.go @@ -1,13 +1,13 @@ package storagegroup import ( - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/storagegroup/get.go b/cmd/frostfs-cli/modules/storagegroup/get.go index dcebdb6d..c59d3c51 100644 --- a/cmd/frostfs-cli/modules/storagegroup/get.go +++ b/cmd/frostfs-cli/modules/storagegroup/get.go @@ -3,15 +3,15 @@ package storagegroup import ( "bytes" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - storagegroupSDK "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + storagegroupSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/storagegroup/list.go b/cmd/frostfs-cli/modules/storagegroup/list.go index 973822a9..4c12453d 100644 --- a/cmd/frostfs-cli/modules/storagegroup/list.go +++ b/cmd/frostfs-cli/modules/storagegroup/list.go @@ -1,13 +1,13 @@ package storagegroup import ( - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/storagegroup/put.go b/cmd/frostfs-cli/modules/storagegroup/put.go index d6bad729..f4024a83 100644 --- a/cmd/frostfs-cli/modules/storagegroup/put.go +++ b/cmd/frostfs-cli/modules/storagegroup/put.go @@ -5,18 +5,18 @@ import ( "errors" "fmt" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - storagegroupSDK "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + storagegroupSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/storagegroup/root.go b/cmd/frostfs-cli/modules/storagegroup/root.go index f19d9b31..41331042 100644 --- a/cmd/frostfs-cli/modules/storagegroup/root.go +++ b/cmd/frostfs-cli/modules/storagegroup/root.go @@ -1,8 +1,8 @@ package storagegroup import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + objectCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/storagegroup/util.go b/cmd/frostfs-cli/modules/storagegroup/util.go index 70c41b77..5ca61a58 100644 --- a/cmd/frostfs-cli/modules/storagegroup/util.go +++ b/cmd/frostfs-cli/modules/storagegroup/util.go @@ -3,10 +3,10 @@ package storagegroup import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/tree/add.go b/cmd/frostfs-cli/modules/tree/add.go index 81930770..707a4d8e 100644 --- a/cmd/frostfs-cli/modules/tree/add.go +++ b/cmd/frostfs-cli/modules/tree/add.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/tree/add_by_path.go b/cmd/frostfs-cli/modules/tree/add_by_path.go index 33edc584..e83408a8 100644 --- a/cmd/frostfs-cli/modules/tree/add_by_path.go +++ b/cmd/frostfs-cli/modules/tree/add_by_path.go @@ -4,13 +4,13 @@ import ( "crypto/sha256" "strings" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/spf13/cobra" ) @@ -32,7 +32,7 @@ func initAddByPathCmd() { // tree service does not allow any attribute except // the 'FileName' but that's a limitation of the // current implementation, not the rule - //ff.String(pathAttributeFlagKey, "", "Path attribute") + // ff.String(pathAttributeFlagKey, "", "Path attribute") ff.String(pathFlagKey, "", "Path to a node") ff.StringSlice(metaFlagKey, nil, "Meta pairs in the form of Key1=[0x]Value1,Key2=[0x]Value2") @@ -62,14 +62,14 @@ func addByPath(cmd *cobra.Command, _ []string) { commonCmd.ExitOnErr(cmd, "meta data parsing: %w", err) path, _ := cmd.Flags().GetString(pathFlagKey) - //pAttr, _ := cmd.Flags().GetString(pathAttributeFlagKey) + // pAttr, _ := cmd.Flags().GetString(pathAttributeFlagKey) req := new(tree.AddByPathRequest) req.Body = &tree.AddByPathRequest_Body{ ContainerId: rawCID, TreeId: tid, PathAttribute: object.AttributeFileName, - //PathAttribute: pAttr, + // PathAttribute: pAttr, Path: strings.Split(path, "/"), Meta: meta, BearerToken: nil, // TODO: #1891 add token handling diff --git a/cmd/frostfs-cli/modules/tree/client.go b/cmd/frostfs-cli/modules/tree/client.go index 82cfdfca..f379de41 100644 --- a/cmd/frostfs-cli/modules/tree/client.go +++ b/cmd/frostfs-cli/modules/tree/client.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree" "github.com/spf13/viper" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/cmd/frostfs-cli/modules/tree/get_by_path.go b/cmd/frostfs-cli/modules/tree/get_by_path.go index cc735bb8..75acbaed 100644 --- a/cmd/frostfs-cli/modules/tree/get_by_path.go +++ b/cmd/frostfs-cli/modules/tree/get_by_path.go @@ -4,13 +4,13 @@ import ( "crypto/sha256" "strings" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/spf13/cobra" ) @@ -32,7 +32,7 @@ func initGetByPathCmd() { // tree service does not allow any attribute except // the 'FileName' but that's a limitation of the // current implementation, not the rule - //ff.String(pathAttributeFlagKey, "", "Path attribute") + // ff.String(pathAttributeFlagKey, "", "Path attribute") ff.String(pathFlagKey, "", "Path to a node") ff.Bool(latestOnlyFlagKey, false, "Look only for the latest version of a node") @@ -60,14 +60,14 @@ func getByPath(cmd *cobra.Command, _ []string) { latestOnly, _ := cmd.Flags().GetBool(latestOnlyFlagKey) path, _ := cmd.Flags().GetString(pathFlagKey) - //pAttr, _ := cmd.Flags().GetString(pathAttributeFlagKey) + // pAttr, _ := cmd.Flags().GetString(pathAttributeFlagKey) req := new(tree.GetNodeByPathRequest) req.Body = &tree.GetNodeByPathRequest_Body{ ContainerId: rawCID, TreeId: tid, PathAttribute: object.AttributeFileName, - //PathAttribute: pAttr, + // PathAttribute: pAttr, Path: strings.Split(path, "/"), LatestOnly: latestOnly, AllAttributes: true, diff --git a/cmd/frostfs-cli/modules/tree/list.go b/cmd/frostfs-cli/modules/tree/list.go index ffc7d8b5..8e4d2bd4 100644 --- a/cmd/frostfs-cli/modules/tree/list.go +++ b/cmd/frostfs-cli/modules/tree/list.go @@ -3,11 +3,11 @@ package tree import ( "crypto/sha256" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/tree/root.go b/cmd/frostfs-cli/modules/tree/root.go index 9dad9d52..c70e6f5e 100644 --- a/cmd/frostfs-cli/modules/tree/root.go +++ b/cmd/frostfs-cli/modules/tree/root.go @@ -1,7 +1,7 @@ package tree import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/util/acl.go b/cmd/frostfs-cli/modules/util/acl.go index 9314e223..6620ca70 100644 --- a/cmd/frostfs-cli/modules/util/acl.go +++ b/cmd/frostfs-cli/modules/util/acl.go @@ -9,8 +9,8 @@ import ( "strings" "text/tabwriter" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/flynn-archive/go-shlex" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/olekukonko/tablewriter" diff --git a/cmd/frostfs-cli/modules/util/convert_eacl.go b/cmd/frostfs-cli/modules/util/convert_eacl.go index e1635f51..1fb76c50 100644 --- a/cmd/frostfs-cli/modules/util/convert_eacl.go +++ b/cmd/frostfs-cli/modules/util/convert_eacl.go @@ -3,9 +3,9 @@ package util import ( "os" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/util/keyer.go b/cmd/frostfs-cli/modules/util/keyer.go index da71b2d6..53082a15 100644 --- a/cmd/frostfs-cli/modules/util/keyer.go +++ b/cmd/frostfs-cli/modules/util/keyer.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/keyer" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/keyer" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/util/locode_generate.go b/cmd/frostfs-cli/modules/util/locode_generate.go index b2cd1d2c..319dee1c 100644 --- a/cmd/frostfs-cli/modules/util/locode_generate.go +++ b/cmd/frostfs-cli/modules/util/locode_generate.go @@ -1,12 +1,12 @@ package util import ( - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" - airportsdb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/airports" - locodebolt "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" - continentsdb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/continents/geojson" - csvlocode "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/table/csv" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" + airportsdb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db/airports" + locodebolt "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" + continentsdb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db/continents/geojson" + csvlocode "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/table/csv" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/util/locode_info.go b/cmd/frostfs-cli/modules/util/locode_info.go index 2209df97..e89252de 100644 --- a/cmd/frostfs-cli/modules/util/locode_info.go +++ b/cmd/frostfs-cli/modules/util/locode_info.go @@ -1,9 +1,9 @@ package util import ( - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" - locodebolt "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" + locodebolt "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/util/root.go b/cmd/frostfs-cli/modules/util/root.go index aff1709f..3cdd236d 100644 --- a/cmd/frostfs-cli/modules/util/root.go +++ b/cmd/frostfs-cli/modules/util/root.go @@ -1,7 +1,7 @@ package util import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/frostfs-cli/modules/util/sign_bearer.go b/cmd/frostfs-cli/modules/util/sign_bearer.go index 0104a179..c641cf0a 100644 --- a/cmd/frostfs-cli/modules/util/sign_bearer.go +++ b/cmd/frostfs-cli/modules/util/sign_bearer.go @@ -3,10 +3,10 @@ package util import ( "os" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-cli/modules/util/sign_session.go b/cmd/frostfs-cli/modules/util/sign_session.go index 920c3cc7..2c77ee4d 100644 --- a/cmd/frostfs-cli/modules/util/sign_session.go +++ b/cmd/frostfs-cli/modules/util/sign_session.go @@ -7,11 +7,11 @@ import ( "fmt" "os" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" - commonCmd "github.com/TrueCloudLab/frostfs-node/cmd/internal/common" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-ir/defaults.go b/cmd/frostfs-ir/defaults.go index 1e09c75d..fa26eef2 100644 --- a/cmd/frostfs-ir/defaults.go +++ b/cmd/frostfs-ir/defaults.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/util/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/config" "github.com/spf13/viper" ) diff --git a/cmd/frostfs-ir/main.go b/cmd/frostfs-ir/main.go index 2094265f..e4386a08 100644 --- a/cmd/frostfs-ir/main.go +++ b/cmd/frostfs-ir/main.go @@ -9,10 +9,10 @@ import ( "os/signal" "syscall" - "github.com/TrueCloudLab/frostfs-node/misc" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring" - httputil "github.com/TrueCloudLab/frostfs-node/pkg/util/http" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/misc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring" + httputil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/http" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/viper" "go.uber.org/zap" diff --git a/cmd/frostfs-lens/internal/blobovnicza/inspect.go b/cmd/frostfs-lens/internal/blobovnicza/inspect.go index 6d41e2cb..3f4e8cfe 100644 --- a/cmd/frostfs-lens/internal/blobovnicza/inspect.go +++ b/cmd/frostfs-lens/internal/blobovnicza/inspect.go @@ -1,10 +1,10 @@ package blobovnicza import ( - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/blobovnicza/list.go b/cmd/frostfs-lens/internal/blobovnicza/list.go index e1be6ade..67242a7d 100644 --- a/cmd/frostfs-lens/internal/blobovnicza/list.go +++ b/cmd/frostfs-lens/internal/blobovnicza/list.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/blobovnicza/root.go b/cmd/frostfs-lens/internal/blobovnicza/root.go index 9551b9fe..0a0cd955 100644 --- a/cmd/frostfs-lens/internal/blobovnicza/root.go +++ b/cmd/frostfs-lens/internal/blobovnicza/root.go @@ -1,8 +1,8 @@ package blobovnicza import ( - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/meta/inspect.go b/cmd/frostfs-lens/internal/meta/inspect.go index 9cc82473..fb0065a6 100644 --- a/cmd/frostfs-lens/internal/meta/inspect.go +++ b/cmd/frostfs-lens/internal/meta/inspect.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/meta/list-garbage.go b/cmd/frostfs-lens/internal/meta/list-garbage.go index cae55ffb..3ab9a8f8 100644 --- a/cmd/frostfs-lens/internal/meta/list-garbage.go +++ b/cmd/frostfs-lens/internal/meta/list-garbage.go @@ -1,8 +1,8 @@ package meta import ( - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/meta/list-graveyard.go b/cmd/frostfs-lens/internal/meta/list-graveyard.go index d6c0f4aa..db90513e 100644 --- a/cmd/frostfs-lens/internal/meta/list-graveyard.go +++ b/cmd/frostfs-lens/internal/meta/list-graveyard.go @@ -1,8 +1,8 @@ package meta import ( - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/meta/root.go b/cmd/frostfs-lens/internal/meta/root.go index 3ed9b08a..9f35c26c 100644 --- a/cmd/frostfs-lens/internal/meta/root.go +++ b/cmd/frostfs-lens/internal/meta/root.go @@ -3,8 +3,8 @@ package meta import ( "time" - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "github.com/spf13/cobra" "go.etcd.io/bbolt" ) diff --git a/cmd/frostfs-lens/internal/printers.go b/cmd/frostfs-lens/internal/printers.go index d6abe933..a232409d 100644 --- a/cmd/frostfs-lens/internal/printers.go +++ b/cmd/frostfs-lens/internal/printers.go @@ -3,9 +3,9 @@ package common import ( "os" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/writecache/inspect.go b/cmd/frostfs-lens/internal/writecache/inspect.go index 0c02a12b..91f12ed0 100644 --- a/cmd/frostfs-lens/internal/writecache/inspect.go +++ b/cmd/frostfs-lens/internal/writecache/inspect.go @@ -1,9 +1,9 @@ package writecache import ( - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/writecache/list.go b/cmd/frostfs-lens/internal/writecache/list.go index 776047e4..f6d0cfff 100644 --- a/cmd/frostfs-lens/internal/writecache/list.go +++ b/cmd/frostfs-lens/internal/writecache/list.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-lens/internal/writecache/root.go b/cmd/frostfs-lens/internal/writecache/root.go index 6cf6c342..fec298d7 100644 --- a/cmd/frostfs-lens/internal/writecache/root.go +++ b/cmd/frostfs-lens/internal/writecache/root.go @@ -1,8 +1,8 @@ package writecache import ( - common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" "github.com/spf13/cobra" "go.etcd.io/bbolt" ) diff --git a/cmd/frostfs-lens/root.go b/cmd/frostfs-lens/root.go index c846fa0c..ab937add 100644 --- a/cmd/frostfs-lens/root.go +++ b/cmd/frostfs-lens/root.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/meta" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/writecache" - "github.com/TrueCloudLab/frostfs-node/misc" - "github.com/TrueCloudLab/frostfs-node/pkg/util/gendoc" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/meta" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/misc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/gendoc" "github.com/spf13/cobra" ) diff --git a/cmd/frostfs-node/accounting.go b/cmd/frostfs-node/accounting.go index 1d388935..26acc043 100644 --- a/cmd/frostfs-node/accounting.go +++ b/cmd/frostfs-node/accounting.go @@ -1,11 +1,11 @@ package main import ( - accountingGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/accounting/grpc" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" - accountingTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/accounting/grpc" - accountingService "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting" - accounting "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting/morph" + accountingGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + accountingTransportGRPC "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/transport/accounting/grpc" + accountingService "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/accounting" + accounting "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/accounting/morph" ) func initAccountingService(c *cfg) { diff --git a/cmd/frostfs-node/attributes.go b/cmd/frostfs-node/attributes.go index 97d07850..64c3beba 100644 --- a/cmd/frostfs-node/attributes.go +++ b/cmd/frostfs-node/attributes.go @@ -1,8 +1,8 @@ package main import ( - nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" - "github.com/TrueCloudLab/frostfs-node/pkg/util/attributes" + nodeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/attributes" ) func parseAttributes(c *cfg) { diff --git a/cmd/frostfs-node/cache.go b/cmd/frostfs-node/cache.go index ea11cbec..248c92ef 100644 --- a/cmd/frostfs-node/cache.go +++ b/cmd/frostfs-node/cache.go @@ -4,14 +4,14 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" lru "github.com/hashicorp/golang-lru/v2" ) diff --git a/cmd/frostfs-node/config.go b/cmd/frostfs-node/config.go index 16204be4..3aabb63d 100644 --- a/cmd/frostfs-node/config.go +++ b/cmd/frostfs-node/config.go @@ -15,54 +15,54 @@ import ( "syscall" "time" - netmapV2 "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - apiclientconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/apiclient" - contractsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/contracts" - engineconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" - shardconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" - blobovniczaconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza" - fstreeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/fstree" - loggerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger" - nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" - objectconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/object" - replicatorconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - netmapCore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - shardmode "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - "github.com/TrueCloudLab/frostfs-node/pkg/metrics" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - containerClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - netmap2 "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-node/pkg/network/cache" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - objectService "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/tombstone" - tsourse "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/tombstone/source" - "github.com/TrueCloudLab/frostfs-node/pkg/services/replicator" - trustcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" - truststorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" - "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-node/pkg/util/state" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - "github.com/TrueCloudLab/frostfs-sdk-go/user" - "github.com/TrueCloudLab/frostfs-sdk-go/version" + netmapV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + apiclientconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/apiclient" + contractsconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/contracts" + engineconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" + shardconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" + blobovniczaconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza" + 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" + 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" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + netmapCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + shardmode "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/metrics" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + containerClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + netmap2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/cache" + "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/tombstone" + tsourse "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/tombstone/source" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator" + trustcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" + truststorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/state" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" neogoutil "github.com/nspcc-dev/neo-go/pkg/util" "github.com/panjf2000/ants/v2" diff --git a/cmd/frostfs-node/config/apiclient/config.go b/cmd/frostfs-node/config/apiclient/config.go index 05176f36..7d82a4a1 100644 --- a/cmd/frostfs-node/config/apiclient/config.go +++ b/cmd/frostfs-node/config/apiclient/config.go @@ -3,7 +3,7 @@ package apiclientconfig import ( "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/frostfs-node/config/apiclient/config_test.go b/cmd/frostfs-node/config/apiclient/config_test.go index 589f043a..4d67753b 100644 --- a/cmd/frostfs-node/config/apiclient/config_test.go +++ b/cmd/frostfs-node/config/apiclient/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - apiclientconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/apiclient" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + apiclientconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/apiclient" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/calls_test.go b/cmd/frostfs-node/config/calls_test.go index e3a7f7f1..37ffd2e8 100644 --- a/cmd/frostfs-node/config/calls_test.go +++ b/cmd/frostfs-node/config/calls_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/cast_test.go b/cmd/frostfs-node/config/cast_test.go index 931b2cee..ef48bdc5 100644 --- a/cmd/frostfs-node/config/cast_test.go +++ b/cmd/frostfs-node/config/cast_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "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" ) diff --git a/cmd/frostfs-node/config/config.go b/cmd/frostfs-node/config/config.go index 8b606976..12c92306 100644 --- a/cmd/frostfs-node/config/config.go +++ b/cmd/frostfs-node/config/config.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" - "github.com/TrueCloudLab/frostfs-node/pkg/util/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/config" "github.com/spf13/viper" ) diff --git a/cmd/frostfs-node/config/contracts/config.go b/cmd/frostfs-node/config/contracts/config.go index 2db12350..0450d0d5 100644 --- a/cmd/frostfs-node/config/contracts/config.go +++ b/cmd/frostfs-node/config/contracts/config.go @@ -3,7 +3,7 @@ package contractsconfig import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/cmd/frostfs-node/config/contracts/config_test.go b/cmd/frostfs-node/config/contracts/config_test.go index 47032f07..8cfafb5c 100644 --- a/cmd/frostfs-node/config/contracts/config_test.go +++ b/cmd/frostfs-node/config/contracts/config_test.go @@ -3,9 +3,9 @@ package contractsconfig_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - contractsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/contracts" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + contractsconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/contracts" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/control/config.go b/cmd/frostfs-node/config/control/config.go index b35bf4fb..6bc06b76 100644 --- a/cmd/frostfs-node/config/control/config.go +++ b/cmd/frostfs-node/config/control/config.go @@ -3,7 +3,7 @@ package controlconfig import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/cmd/frostfs-node/config/control/config_test.go b/cmd/frostfs-node/config/control/config_test.go index f4ff5432..0c04cda6 100644 --- a/cmd/frostfs-node/config/control/config_test.go +++ b/cmd/frostfs-node/config/control/config_test.go @@ -3,9 +3,9 @@ package controlconfig_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - controlconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/control" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + controlconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/control" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/engine/config.go b/cmd/frostfs-node/config/engine/config.go index 53dd7fdb..36684f09 100644 --- a/cmd/frostfs-node/config/engine/config.go +++ b/cmd/frostfs-node/config/engine/config.go @@ -4,9 +4,9 @@ import ( "errors" "strconv" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - shardconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + shardconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" ) const ( diff --git a/cmd/frostfs-node/config/engine/config_test.go b/cmd/frostfs-node/config/engine/config_test.go index a797853b..72e57ee5 100644 --- a/cmd/frostfs-node/config/engine/config_test.go +++ b/cmd/frostfs-node/config/engine/config_test.go @@ -5,14 +5,14 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - engineconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" - shardconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" - blobovniczaconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza" - fstreeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/fstree" - piloramaconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/pilorama" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + engineconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" + shardconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" + blobovniczaconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza" + fstreeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/fstree" + piloramaconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/pilorama" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza/config.go b/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza/config.go index 36a7b81c..5595f10b 100644 --- a/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza/config.go +++ b/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza/config.go @@ -1,9 +1,9 @@ package blobovniczaconfig import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - boltdbconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + boltdbconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/engine/shard/blobstor/config.go b/cmd/frostfs-node/config/engine/shard/blobstor/config.go index b827b3f2..a6e34e80 100644 --- a/cmd/frostfs-node/config/engine/shard/blobstor/config.go +++ b/cmd/frostfs-node/config/engine/shard/blobstor/config.go @@ -3,10 +3,10 @@ package blobstorconfig import ( "strconv" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/storage" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/storage" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/engine/shard/blobstor/fstree/config.go b/cmd/frostfs-node/config/engine/shard/blobstor/fstree/config.go index 45eeae29..de9f6ba5 100644 --- a/cmd/frostfs-node/config/engine/shard/blobstor/fstree/config.go +++ b/cmd/frostfs-node/config/engine/shard/blobstor/fstree/config.go @@ -1,8 +1,8 @@ package fstree import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/engine/shard/blobstor/storage/config.go b/cmd/frostfs-node/config/engine/shard/blobstor/storage/config.go index 4d0db437..649e4980 100644 --- a/cmd/frostfs-node/config/engine/shard/blobstor/storage/config.go +++ b/cmd/frostfs-node/config/engine/shard/blobstor/storage/config.go @@ -3,7 +3,7 @@ package storage import ( "io/fs" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) type Config config.Config diff --git a/cmd/frostfs-node/config/engine/shard/boltdb/boltdb.go b/cmd/frostfs-node/config/engine/shard/boltdb/boltdb.go index 11ba913c..83d4e45c 100644 --- a/cmd/frostfs-node/config/engine/shard/boltdb/boltdb.go +++ b/cmd/frostfs-node/config/engine/shard/boltdb/boltdb.go @@ -4,7 +4,7 @@ import ( "io/fs" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/engine/shard/config.go b/cmd/frostfs-node/config/engine/shard/config.go index 4ced1799..1dc32fb8 100644 --- a/cmd/frostfs-node/config/engine/shard/config.go +++ b/cmd/frostfs-node/config/engine/shard/config.go @@ -3,13 +3,13 @@ package shardconfig import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - blobstorconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor" - gcconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/gc" - metabaseconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/metabase" - piloramaconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/pilorama" - writecacheconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/writecache" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + blobstorconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor" + gcconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/gc" + metabaseconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/metabase" + piloramaconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/pilorama" + writecacheconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/engine/shard/gc/config.go b/cmd/frostfs-node/config/engine/shard/gc/config.go index 9f5fb2b4..1aa01d90 100644 --- a/cmd/frostfs-node/config/engine/shard/gc/config.go +++ b/cmd/frostfs-node/config/engine/shard/gc/config.go @@ -3,7 +3,7 @@ package gcconfig import ( "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/engine/shard/metabase/config.go b/cmd/frostfs-node/config/engine/shard/metabase/config.go index 02ff7fda..3730094d 100644 --- a/cmd/frostfs-node/config/engine/shard/metabase/config.go +++ b/cmd/frostfs-node/config/engine/shard/metabase/config.go @@ -1,8 +1,8 @@ package metabaseconfig import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - boltdbconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + boltdbconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/engine/shard/pilorama/config.go b/cmd/frostfs-node/config/engine/shard/pilorama/config.go index 0e2090b6..7ac0eca9 100644 --- a/cmd/frostfs-node/config/engine/shard/pilorama/config.go +++ b/cmd/frostfs-node/config/engine/shard/pilorama/config.go @@ -4,7 +4,7 @@ import ( "io/fs" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/engine/shard/writecache/config.go b/cmd/frostfs-node/config/engine/shard/writecache/config.go index ec03940a..c003cefa 100644 --- a/cmd/frostfs-node/config/engine/shard/writecache/config.go +++ b/cmd/frostfs-node/config/engine/shard/writecache/config.go @@ -1,8 +1,8 @@ package writecacheconfig import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - boltdbconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + boltdbconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" ) // Config is a wrapper over the config section diff --git a/cmd/frostfs-node/config/grpc/config.go b/cmd/frostfs-node/config/grpc/config.go index f2ef3608..c25d2e71 100644 --- a/cmd/frostfs-node/config/grpc/config.go +++ b/cmd/frostfs-node/config/grpc/config.go @@ -4,7 +4,7 @@ import ( "errors" "strconv" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) var ( diff --git a/cmd/frostfs-node/config/grpc/config_test.go b/cmd/frostfs-node/config/grpc/config_test.go index bb94d7f1..25677ed6 100644 --- a/cmd/frostfs-node/config/grpc/config_test.go +++ b/cmd/frostfs-node/config/grpc/config_test.go @@ -3,8 +3,8 @@ package grpcconfig import ( "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "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" ) diff --git a/cmd/frostfs-node/config/internal/env_test.go b/cmd/frostfs-node/config/internal/env_test.go index 8e56b605..3d1af071 100644 --- a/cmd/frostfs-node/config/internal/env_test.go +++ b/cmd/frostfs-node/config/internal/env_test.go @@ -3,7 +3,7 @@ package internal_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/logger/config.go b/cmd/frostfs-node/config/logger/config.go index 47ca5eac..78e4377a 100644 --- a/cmd/frostfs-node/config/logger/config.go +++ b/cmd/frostfs-node/config/logger/config.go @@ -1,7 +1,7 @@ package loggerconfig import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/frostfs-node/config/logger/config_test.go b/cmd/frostfs-node/config/logger/config_test.go index c2df2fab..850f71d7 100644 --- a/cmd/frostfs-node/config/logger/config_test.go +++ b/cmd/frostfs-node/config/logger/config_test.go @@ -3,9 +3,9 @@ package loggerconfig_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - loggerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + loggerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/metrics/config.go b/cmd/frostfs-node/config/metrics/config.go index 3c2fff99..1e934ec9 100644 --- a/cmd/frostfs-node/config/metrics/config.go +++ b/cmd/frostfs-node/config/metrics/config.go @@ -3,7 +3,7 @@ package metricsconfig import ( "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/frostfs-node/config/metrics/config_test.go b/cmd/frostfs-node/config/metrics/config_test.go index ad355e11..ed850916 100644 --- a/cmd/frostfs-node/config/metrics/config_test.go +++ b/cmd/frostfs-node/config/metrics/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - metricsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + metricsconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/morph/config.go b/cmd/frostfs-node/config/morph/config.go index f87c72ac..4ab608ef 100644 --- a/cmd/frostfs-node/config/morph/config.go +++ b/cmd/frostfs-node/config/morph/config.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) const ( diff --git a/cmd/frostfs-node/config/morph/config_test.go b/cmd/frostfs-node/config/morph/config_test.go index e719aaa7..e6235101 100644 --- a/cmd/frostfs-node/config/morph/config_test.go +++ b/cmd/frostfs-node/config/morph/config_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - morphconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + morphconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/node/config.go b/cmd/frostfs-node/config/node/config.go index 510946e8..a2794422 100644 --- a/cmd/frostfs-node/config/node/config.go +++ b/cmd/frostfs-node/config/node/config.go @@ -6,9 +6,9 @@ import ( "strconv" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - utilConfig "github.com/TrueCloudLab/frostfs-node/pkg/util/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + utilConfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/config" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/cmd/frostfs-node/config/node/config_test.go b/cmd/frostfs-node/config/node/config_test.go index 575f6c38..30329265 100644 --- a/cmd/frostfs-node/config/node/config_test.go +++ b/cmd/frostfs-node/config/node/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" - "github.com/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" "github.com/nspcc-dev/neo-go/pkg/encoding/address" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/object/config.go b/cmd/frostfs-node/config/object/config.go index 9a36980e..cd969852 100644 --- a/cmd/frostfs-node/config/object/config.go +++ b/cmd/frostfs-node/config/object/config.go @@ -1,7 +1,7 @@ package objectconfig import ( - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) // PutConfig is a wrapper over "put" config section which provides access diff --git a/cmd/frostfs-node/config/object/config_test.go b/cmd/frostfs-node/config/object/config_test.go index b154ed44..e29c86dc 100644 --- a/cmd/frostfs-node/config/object/config_test.go +++ b/cmd/frostfs-node/config/object/config_test.go @@ -3,9 +3,9 @@ package objectconfig_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - objectconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/object" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + objectconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/object" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/object/delete.go b/cmd/frostfs-node/config/object/delete.go index d2cd2aff..3a4abe19 100644 --- a/cmd/frostfs-node/config/object/delete.go +++ b/cmd/frostfs-node/config/object/delete.go @@ -1,6 +1,6 @@ package objectconfig -import "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" +import "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" const ( deleteSubsection = "delete" diff --git a/cmd/frostfs-node/config/policer/config.go b/cmd/frostfs-node/config/policer/config.go index 6b5990fb..51e55c34 100644 --- a/cmd/frostfs-node/config/policer/config.go +++ b/cmd/frostfs-node/config/policer/config.go @@ -3,7 +3,7 @@ package policerconfig import ( "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/frostfs-node/config/policer/config_test.go b/cmd/frostfs-node/config/policer/config_test.go index a67e6f36..97b7bcef 100644 --- a/cmd/frostfs-node/config/policer/config_test.go +++ b/cmd/frostfs-node/config/policer/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - policerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/policer" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + policerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/policer" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/profiler/config.go b/cmd/frostfs-node/config/profiler/config.go index 17aabaa8..f891833a 100644 --- a/cmd/frostfs-node/config/profiler/config.go +++ b/cmd/frostfs-node/config/profiler/config.go @@ -3,7 +3,7 @@ package profilerconfig import ( "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/frostfs-node/config/profiler/config_test.go b/cmd/frostfs-node/config/profiler/config_test.go index edb457bb..1b132a88 100644 --- a/cmd/frostfs-node/config/profiler/config_test.go +++ b/cmd/frostfs-node/config/profiler/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - profilerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/profiler" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + profilerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/profiler" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/replicator/config.go b/cmd/frostfs-node/config/replicator/config.go index dcff08ea..0fbac935 100644 --- a/cmd/frostfs-node/config/replicator/config.go +++ b/cmd/frostfs-node/config/replicator/config.go @@ -3,7 +3,7 @@ package replicatorconfig import ( "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/frostfs-node/config/replicator/config_test.go b/cmd/frostfs-node/config/replicator/config_test.go index 64d410c9..1c366df8 100644 --- a/cmd/frostfs-node/config/replicator/config_test.go +++ b/cmd/frostfs-node/config/replicator/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - replicatorconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + replicatorconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/config/test/config.go b/cmd/frostfs-node/config/test/config.go index 19012c6b..ac6d92c4 100644 --- a/cmd/frostfs-node/config/test/config.go +++ b/cmd/frostfs-node/config/test/config.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) func fromFile(path string) *config.Config { diff --git a/cmd/frostfs-node/config/tree/config.go b/cmd/frostfs-node/config/tree/config.go index 7007bedf..f6087c53 100644 --- a/cmd/frostfs-node/config/tree/config.go +++ b/cmd/frostfs-node/config/tree/config.go @@ -3,7 +3,7 @@ package treeconfig import ( "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/frostfs-node/config/tree/config_test.go b/cmd/frostfs-node/config/tree/config_test.go index 67015843..90837d43 100644 --- a/cmd/frostfs-node/config/tree/config_test.go +++ b/cmd/frostfs-node/config/tree/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" - treeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + treeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" "github.com/stretchr/testify/require" ) diff --git a/cmd/frostfs-node/container.go b/cmd/frostfs-node/container.go index 28981170..bfa555db 100644 --- a/cmd/frostfs-node/container.go +++ b/cmd/frostfs-node/container.go @@ -9,28 +9,28 @@ import ( "fmt" "strconv" - containerV2 "github.com/TrueCloudLab/frostfs-api-go/v2/container" - containerGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/container/grpc" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - containerCore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - netmapCore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" - containerTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/container/grpc" - containerService "github.com/TrueCloudLab/frostfs-node/pkg/services/container" - loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" - loadroute "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route" - placementrouter "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route/placement" - loadstorage "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/storage" - containerMorph "github.com/TrueCloudLab/frostfs-node/pkg/services/container/morph" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apiClient "github.com/TrueCloudLab/frostfs-sdk-go/client" - containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + containerV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + containerGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + containerCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + netmapCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/container" + containerTransportGRPC "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/transport/container/grpc" + containerService "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container" + loadcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + loadroute "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route" + placementrouter "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route/placement" + loadstorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/storage" + containerMorph "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/morph" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apiClient "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + containerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/control.go b/cmd/frostfs-node/control.go index 1ff73812..ad6b9bbb 100644 --- a/cmd/frostfs-node/control.go +++ b/cmd/frostfs-node/control.go @@ -4,11 +4,11 @@ import ( "context" "net" - controlconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/control" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - controlSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/control/server" - "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + controlconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + controlSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/server" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" "google.golang.org/grpc" ) diff --git a/cmd/frostfs-node/grpc.go b/cmd/frostfs-node/grpc.go index b441eb9e..a56c7660 100644 --- a/cmd/frostfs-node/grpc.go +++ b/cmd/frostfs-node/grpc.go @@ -7,8 +7,8 @@ import ( "net" "time" - grpcconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/grpc" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + grpcconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/cmd/frostfs-node/httpcomponent.go b/cmd/frostfs-node/httpcomponent.go index 7410b807..9fa6d2f6 100644 --- a/cmd/frostfs-node/httpcomponent.go +++ b/cmd/frostfs-node/httpcomponent.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - httputil "github.com/TrueCloudLab/frostfs-node/pkg/util/http" + httputil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/http" ) type httpComponent struct { diff --git a/cmd/frostfs-node/main.go b/cmd/frostfs-node/main.go index 11ee7a97..57d8bc80 100644 --- a/cmd/frostfs-node/main.go +++ b/cmd/frostfs-node/main.go @@ -7,9 +7,9 @@ import ( "log" "os" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - "github.com/TrueCloudLab/frostfs-node/misc" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/misc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/metrics.go b/cmd/frostfs-node/metrics.go index 249c7e9c..f18bbe65 100644 --- a/cmd/frostfs-node/metrics.go +++ b/cmd/frostfs-node/metrics.go @@ -1,7 +1,7 @@ package main import ( - metricsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" + metricsconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/cmd/frostfs-node/morph.go b/cmd/frostfs-node/morph.go index 34c67424..6c09ae02 100644 --- a/cmd/frostfs-node/morph.go +++ b/cmd/frostfs-node/morph.go @@ -6,14 +6,14 @@ import ( "fmt" "time" - morphconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/subscriber" - "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" + morphconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + netmapEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/subscriber" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" diff --git a/cmd/frostfs-node/netmap.go b/cmd/frostfs-node/netmap.go index 580da8e0..d5f3036c 100644 --- a/cmd/frostfs-node/netmap.go +++ b/cmd/frostfs-node/netmap.go @@ -5,20 +5,20 @@ import ( "errors" "fmt" - netmapGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/netmap/grpc" - nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/metrics" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - netmapTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/netmap/grpc" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - netmapService "github.com/TrueCloudLab/frostfs-node/pkg/services/netmap" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" - "github.com/TrueCloudLab/frostfs-sdk-go/version" + netmapGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap/grpc" + nodeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/metrics" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + netmapEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + netmapTransportGRPC "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/transport/netmap/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + netmapService "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/netmap" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/notificator.go b/cmd/frostfs-node/notificator.go index 8acc4b43..9722db3a 100644 --- a/cmd/frostfs-node/notificator.go +++ b/cmd/frostfs-node/notificator.go @@ -4,15 +4,15 @@ import ( "encoding/hex" "fmt" - nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/notificator" - "github.com/TrueCloudLab/frostfs-node/pkg/services/notificator/nats" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + nodeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/notificator" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/notificator/nats" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/object.go b/cmd/frostfs-node/object.go index 23dc6272..8ff63f41 100644 --- a/cmd/frostfs-node/object.go +++ b/cmd/frostfs-node/object.go @@ -6,46 +6,46 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" - metricsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" - policerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/policer" - replicatorconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator" - coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - morphClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - objectTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/object/grpc" - objectService "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/acl" - v2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/acl/v2" - deletesvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/delete" - deletesvcV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/delete/v2" - getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" - getsvcV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get/v2" - headsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/head" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - putsvcV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put/v2" - searchsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/search" - searchsvcV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/search/v2" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/services/policer" - "github.com/TrueCloudLab/frostfs-node/pkg/services/replicator" - truststorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object/grpc" + metricsconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" + policerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/policer" + replicatorconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator" + coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + morphClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + objectTransportGRPC "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/transport/object/grpc" + objectService "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/acl" + v2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/acl/v2" + deletesvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/delete" + deletesvcV2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/delete/v2" + getsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get" + getsvcV2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get/v2" + headsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/head" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + putsvcV2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put/v2" + searchsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/search" + searchsvcV2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/search/v2" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/policer" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator" + truststorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/pprof.go b/cmd/frostfs-node/pprof.go index 02d37649..9be2dd9d 100644 --- a/cmd/frostfs-node/pprof.go +++ b/cmd/frostfs-node/pprof.go @@ -1,8 +1,8 @@ package main import ( - profilerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/profiler" - httputil "github.com/TrueCloudLab/frostfs-node/pkg/util/http" + profilerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/profiler" + httputil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/http" ) func pprofComponent(c *cfg) (*httpComponent, bool) { diff --git a/cmd/frostfs-node/reputation.go b/cmd/frostfs-node/reputation.go index a9a28c54..e9626b14 100644 --- a/cmd/frostfs-node/reputation.go +++ b/cmd/frostfs-node/reputation.go @@ -4,32 +4,32 @@ import ( "context" "fmt" - v2reputation "github.com/TrueCloudLab/frostfs-api-go/v2/reputation" - v2reputationgrpc "github.com/TrueCloudLab/frostfs-api-go/v2/reputation/grpc" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" - intermediatereputation "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/intermediate" - localreputation "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/local" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/ticker" - repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - grpcreputation "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/reputation/grpc" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - reputationrouter "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common/router" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" - eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" - eigentrustctrl "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/controller" - intermediateroutes "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/routes" - consumerstorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" - localtrustcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" - localroutes "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/routes" - truststorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" - reputationrpc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/rpc" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + v2reputation "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/reputation" + v2reputationgrpc "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/reputation/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" + intermediatereputation "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/intermediate" + localreputation "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/local" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/ticker" + repClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + grpcreputation "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/transport/reputation/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + reputationrouter "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common/router" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigentrustcalc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + eigentrustctrl "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/controller" + intermediateroutes "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/routes" + consumerstorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" + localtrustcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" + localroutes "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/routes" + truststorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" + reputationrpc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/rpc" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/reputation/common/remote.go b/cmd/frostfs-node/reputation/common/remote.go index b527fbf7..0fe0a7fd 100644 --- a/cmd/frostfs-node/reputation/common/remote.go +++ b/cmd/frostfs-node/reputation/common/remote.go @@ -3,12 +3,12 @@ package common import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - reputationrouter "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common/router" - trustcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + reputationrouter "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common/router" + trustcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" ) type clientCache interface { diff --git a/cmd/frostfs-node/reputation/common/util.go b/cmd/frostfs-node/reputation/common/util.go index f10ce2ae..c0a5cbc7 100644 --- a/cmd/frostfs-node/reputation/common/util.go +++ b/cmd/frostfs-node/reputation/common/util.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" ) // EpochContext is a std context extended with epoch data. diff --git a/cmd/frostfs-node/reputation/intermediate/calculator.go b/cmd/frostfs-node/reputation/intermediate/calculator.go index 1cd61fa9..8bc74324 100644 --- a/cmd/frostfs-node/reputation/intermediate/calculator.go +++ b/cmd/frostfs-node/reputation/intermediate/calculator.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" - eigencalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" - eigentrustctrl "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/controller" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigencalc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + eigentrustctrl "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/controller" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) // InitialTrustSource is an implementation of the diff --git a/cmd/frostfs-node/reputation/intermediate/consumers.go b/cmd/frostfs-node/reputation/intermediate/consumers.go index b69483cd..fb89c439 100644 --- a/cmd/frostfs-node/reputation/intermediate/consumers.go +++ b/cmd/frostfs-node/reputation/intermediate/consumers.go @@ -1,12 +1,12 @@ package intermediate import ( - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" - eigencalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" - consumerstorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigencalc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + consumerstorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/reputation/intermediate/contract.go b/cmd/frostfs-node/reputation/intermediate/contract.go index 56b830c6..7e641132 100644 --- a/cmd/frostfs-node/reputation/intermediate/contract.go +++ b/cmd/frostfs-node/reputation/intermediate/contract.go @@ -4,12 +4,12 @@ import ( "crypto/ecdsa" "fmt" - repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" - eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + repClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigentrustcalc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/reputation/intermediate/daughters.go b/cmd/frostfs-node/reputation/intermediate/daughters.go index fff159ad..641a0afe 100644 --- a/cmd/frostfs-node/reputation/intermediate/daughters.go +++ b/cmd/frostfs-node/reputation/intermediate/daughters.go @@ -1,10 +1,10 @@ package intermediate import ( - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/reputation/intermediate/remote.go b/cmd/frostfs-node/reputation/intermediate/remote.go index 2b63b1a9..224da943 100644 --- a/cmd/frostfs-node/reputation/intermediate/remote.go +++ b/cmd/frostfs-node/reputation/intermediate/remote.go @@ -3,14 +3,14 @@ package intermediate import ( "crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/internal/client" - coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - reputationapi "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/internal/client" + coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + eigentrustcalc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + reputationapi "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/reputation/intermediate/storage.go b/cmd/frostfs-node/reputation/intermediate/storage.go index 5eec832d..0f614d9f 100644 --- a/cmd/frostfs-node/reputation/intermediate/storage.go +++ b/cmd/frostfs-node/reputation/intermediate/storage.go @@ -3,10 +3,10 @@ package intermediate import ( "fmt" - eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" - consumerstorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + eigentrustcalc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + consumerstorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) // DaughterTrustIteratorProvider is an implementation of the diff --git a/cmd/frostfs-node/reputation/internal/client/client.go b/cmd/frostfs-node/reputation/internal/client/client.go index b9cc37c8..79bc3d44 100644 --- a/cmd/frostfs-node/reputation/internal/client/client.go +++ b/cmd/frostfs-node/reputation/internal/client/client.go @@ -3,10 +3,10 @@ package internal import ( "context" - coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) type commonPrm struct { diff --git a/cmd/frostfs-node/reputation/local/remote.go b/cmd/frostfs-node/reputation/local/remote.go index b9a64445..2fa93ff6 100644 --- a/cmd/frostfs-node/reputation/local/remote.go +++ b/cmd/frostfs-node/reputation/local/remote.go @@ -3,13 +3,13 @@ package local import ( "crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" - internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/internal/client" - coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - reputationapi "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/internal/client" + coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + reputationapi "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/reputation/local/storage.go b/cmd/frostfs-node/reputation/local/storage.go index 952a999a..92d10dfe 100644 --- a/cmd/frostfs-node/reputation/local/storage.go +++ b/cmd/frostfs-node/reputation/local/storage.go @@ -4,13 +4,13 @@ import ( "bytes" "errors" - netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - trustcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" - truststorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + trustcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" + truststorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/session.go b/cmd/frostfs-node/session.go index 1dd9cc23..95e3b820 100644 --- a/cmd/frostfs-node/session.go +++ b/cmd/frostfs-node/session.go @@ -5,17 +5,17 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - sessionGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/session/grpc" - nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - sessionTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/session/grpc" - sessionSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/session" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage/persistent" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage/temporary" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + sessionGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session/grpc" + nodeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + sessionTransportGRPC "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/transport/session/grpc" + sessionSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage/persistent" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage/temporary" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) type sessionStorage interface { diff --git a/cmd/frostfs-node/timers.go b/cmd/frostfs-node/timers.go index da2f6419..2ee2e865 100644 --- a/cmd/frostfs-node/timers.go +++ b/cmd/frostfs-node/timers.go @@ -3,7 +3,7 @@ package main import ( "sync" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/ticker" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/ticker" ) type eigenTrustTickers struct { diff --git a/cmd/frostfs-node/tree.go b/cmd/frostfs-node/tree.go index a271fc70..cee32a0b 100644 --- a/cmd/frostfs-node/tree.go +++ b/cmd/frostfs-node/tree.go @@ -5,14 +5,14 @@ import ( "errors" "time" - treeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - containerClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" - "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + treeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + containerClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/cmd/frostfs-node/validate.go b/cmd/frostfs-node/validate.go index 31fd8664..3896fd6b 100644 --- a/cmd/frostfs-node/validate.go +++ b/cmd/frostfs-node/validate.go @@ -4,14 +4,14 @@ import ( "fmt" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - engineconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" - shardconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" - loggerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger" - treeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + engineconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" + shardconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" + loggerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger" + treeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" ) // validateConfig validates storage node configuration. diff --git a/cmd/frostfs-node/validate_test.go b/cmd/frostfs-node/validate_test.go index 90cab2d3..e35fc1af 100644 --- a/cmd/frostfs-node/validate_test.go +++ b/cmd/frostfs-node/validate_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" - configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "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" ) diff --git a/cmd/internal/common/exit.go b/cmd/internal/common/exit.go index cae47788..9b912ddc 100644 --- a/cmd/internal/common/exit.go +++ b/cmd/internal/common/exit.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - sdkstatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + sdkstatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" "github.com/spf13/cobra" ) diff --git a/cmd/internal/common/netmap.go b/cmd/internal/common/netmap.go index a16b4a94..94964e0d 100644 --- a/cmd/internal/common/netmap.go +++ b/cmd/internal/common/netmap.go @@ -3,7 +3,7 @@ package common import ( "encoding/hex" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/spf13/cobra" ) diff --git a/debian/control b/debian/control index 88e54d38..575a27e3 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: NeoSPCC Build-Depends: debhelper-compat (= 13), dh-sequence-bash-completion, devscripts Standards-Version: 4.5.1 Homepage: https://fs.neo.org/ -Vcs-Git: https://github.com/TrueCloudLab/frostfs-node.git -Vcs-Browser: https://github.com/TrueCloudLab/frostfs-node +Vcs-Git: https://git.frostfs.info/TrueCloudLab/frostfs-node.git +Vcs-Browser: https://git.frostfs.info/TrueCloudLab/frostfs-node Package: frostfs-storage Architecture: any diff --git a/debian/copyright b/debian/copyright index 4aae83f6..61286340 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,12 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: frostfs-node Upstream-Contact: tech@frostfs.info -Source: https://github.com/TrueCloudLab/frostfs-node +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://github.com/TrueCloudLab/frostfs-node/blob/master/CREDITS.md) + (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 diff --git a/go.mod b/go.mod index cf21b902..f27cf415 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ -module github.com/TrueCloudLab/frostfs-node +module git.frostfs.info/TrueCloudLab/frostfs-node go 1.18 require ( - github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68 - github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42 - github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556 - github.com/TrueCloudLab/hrw v1.1.1-0.20230227111858-79b208bebf52 - github.com/TrueCloudLab/tzhash v1.7.0 + git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51 + git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb + git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599 + git.frostfs.info/TrueCloudLab/hrw v1.2.0 + git.frostfs.info/TrueCloudLab/tzhash v1.8.0 github.com/cheggaaa/pb v1.0.29 github.com/chzyer/readline v1.5.1 github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 @@ -40,9 +40,9 @@ require ( ) require ( - github.com/TrueCloudLab/frostfs-crypto v0.5.0 // indirect - github.com/TrueCloudLab/rfc6979 v0.3.0 // indirect - github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect + git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 // indirect + git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 // indirect + github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 // indirect github.com/benbjohnson/clock v1.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect @@ -54,7 +54,7 @@ require ( github.com/golang/snappy v0.0.3 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect - github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/holiman/uint256 v1.2.0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect @@ -89,8 +89,9 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect github.com/twmb/murmur3 v1.1.5 // indirect github.com/urfave/cli v1.22.5 // indirect - go.uber.org/multierr v1.8.0 // indirect + go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.4.0 // indirect + golang.org/x/exp v0.0.0-20221227203929-1b447090c38c // indirect golang.org/x/net v0.4.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.3.0 // indirect diff --git a/go.sum b/go.sum index b81b444f..c743d706 100644 --- a/go.sum +++ b/go.sum @@ -36,28 +36,26 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51 h1:l4+K1hN+NuWNtlZZoV8yRRP3Uu7PifL05ukEqKcb0Ks= +git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51/go.mod h1:n0DxKYulu2Ar73R6OcNF34LiL/Xa+iDR7GZuaOChbLE= +git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb h1:S/TrbOOu9qEXZRZ9/Ddw7crnxbBUQLo68PSzQWYrc9M= +git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb/go.mod h1:nkR5gaGeez3Zv2SE7aceP0YwxG2FzIB5cGKpQO2vV2o= +git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 h1:FxqFDhQYYgpe41qsIHVOcdzSVCB8JNSfPG7Uk4r2oSk= +git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0/go.mod h1:RUIKZATQLJ+TaYQa60X2fTDwfuhMfm8Ar60bQ5fr+vU= +git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599 h1:mzGX2RX8R8H/tUqrUu1TcYk4QRDBcBIWGYscPncfLOQ= +git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599/go.mod h1:z7zcpGY+puI5puyy5oyFbf20vWp84WtslCxcr6/kv5c= +git.frostfs.info/TrueCloudLab/hrw v1.2.0 h1:KvAES7xIqmQBGd2q8KanNosD9+4BhU/zqD5Kt5KSflk= +git.frostfs.info/TrueCloudLab/hrw v1.2.0/go.mod h1:mq2sbvYfO+BB6iFZwYBkgC0yc6mJNx+qZi4jW918m+Y= +git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 h1:M2KR3iBj7WpY3hP10IevfIB9MURr4O9mwVfJ+SjT3HA= +git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0/go.mod h1:okpbKfVYf/BpejtfFTfhZqFP+sZ8rsHrP8Rr/jYPNRc= +git.frostfs.info/TrueCloudLab/tzhash v1.8.0 h1:UFMnUIk0Zh17m8rjGHJMqku2hCgaXDqjqZzS4gsb4UA= +git.frostfs.info/TrueCloudLab/tzhash v1.8.0/go.mod h1:dhY+oy274hV8wGvGL4MwwMpdL3GYvaX1a8GQZQHvlF8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CityOfZion/neo-go v0.62.1-pre.0.20191114145240-e740fbe708f8/go.mod h1:MJCkWUBhi9pn/CrYO1Q3P687y2KeahrOPS9BD9LDGb0= github.com/CityOfZion/neo-go v0.70.1-pre.0.20191209120015-fccb0085941e/go.mod h1:0enZl0az8xA6PVkwzEOwPWVJGqlt/GO4hA4kmQ5Xzig= github.com/CityOfZion/neo-go v0.70.1-pre.0.20191212173117-32ac01130d4c/go.mod h1:JtlHfeqLywZLswKIKFnAp+yzezY4Dji9qlfQKB2OD/I= github.com/CityOfZion/neo-go v0.71.1-pre.0.20200129171427-f773ec69fb84/go.mod h1:FLI526IrRWHmcsO+mHsCbj64pJZhwQFTLJZu+A4PGOA= -github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68 h1:mwZr15qCuIcWojIOmH6LILPohbWIkknZe9vhBRapmfQ= -github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68/go.mod h1:u3P6aL/NpAIY5IFRsJhmV+61Q3pJ3BkLENqySkf5zZQ= -github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42 h1:P/gisZxTzJ9R3tuYDaQWe0tY6m1Zea3gzdPpNYK+NP4= -github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42/go.mod h1:qmf648elr+FWBZH3hqND8KVrXMnqu/e0z48k+sX8C2s= -github.com/TrueCloudLab/frostfs-crypto v0.5.0 h1:ZoLjixSkQv3j1EwZ1WJzMEJY2NR+9nO4Pd8WSyM/RRI= -github.com/TrueCloudLab/frostfs-crypto v0.5.0/go.mod h1:775MUewpH8AWpXrimAG2NYWOXB6lpKOI5kqgu+eI5zs= -github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556 h1:Cc1jjYxKPfyw7TIJh3Bje7m8DOSn2dx+2zmr0yusWGw= -github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556/go.mod h1:4ZiG4jNLzrqeJbmZUrPI7wDZhQVPaf0zEIWa/eBsqBg= -github.com/TrueCloudLab/hrw v1.1.0 h1:2U69PpUX1UtMWgh/RAg6D8mQW+/WsxbLNE+19EUhLhY= -github.com/TrueCloudLab/hrw v1.1.0/go.mod h1:Pzi8Hy3qx12cew+ajVxgbtDVM4sRG9/gJnJLcL/yRyY= -github.com/TrueCloudLab/hrw v1.1.1-0.20230227111858-79b208bebf52 h1:fBeG0EkL7Pa2D0SIiZt3yQYGpP/IvrXg4xEPAZ4Jjys= -github.com/TrueCloudLab/hrw v1.1.1-0.20230227111858-79b208bebf52/go.mod h1:BG6NztCuNc0UFr6MWJ4MM1sUl9lxx6PBRwLmTxdre20= -github.com/TrueCloudLab/rfc6979 v0.3.0 h1:0SYMAfQWh/TjnofqYQHy+s3rmQ5gi0fvOaDbqd60/Ic= -github.com/TrueCloudLab/rfc6979 v0.3.0/go.mod h1:qylxFXFQ/sMvpZC/8JyWp+mfzk5Zj/KDT5FAbekhobc= -github.com/TrueCloudLab/tzhash v1.7.0 h1:btGORepc7Dg+n4MxgJxv73c9eYhwSBI5HqsqUBRmJiw= -github.com/TrueCloudLab/tzhash v1.7.0/go.mod h1:gDQxqjhTqhR58Qfx0gxGtuyGAkixOukwbFGX9O6UGg4= github.com/Workiva/go-datastructures v1.0.50/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/abiosoft/ishell v2.0.0+incompatible/go.mod h1:HQR9AqF2R3P4XXpMpI0NAzgHf/aS6+zVXRj14cVk9qg= github.com/abiosoft/ishell/v2 v2.0.2/go.mod h1:E4oTCXfo6QjoCart0QYa5m9w4S+deXs/P/9jA77A9Bs= @@ -72,8 +70,8 @@ github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGn github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521073959-f0d4d129b7f1/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves= -github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 h1:npHgfD4Tl2WJS3AJaMUi5ynGDPUBfkg3U3fCzDyXZ+4= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -243,8 +241,9 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4= +github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru/v2 v2.0.1 h1:5pv5N1lT1fjLg2VQ5KWc7kmucp2x/kvFOnxuVTqZ6x4= github.com/hashicorp/golang-lru/v2 v2.0.1/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -513,8 +512,8 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= @@ -546,6 +545,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20221227203929-1b447090c38c h1:Govq2W3bnHJimHT2ium65kXcI7ZzTniZHcFATnLJM0Q= +golang.org/x/exp v0.0.0-20221227203929-1b447090c38c/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -570,7 +571,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -778,7 +779,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= +golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/core/client/client.go b/pkg/core/client/client.go index f07dedc0..d74adddc 100644 --- a/pkg/core/client/client.go +++ b/pkg/core/client/client.go @@ -3,9 +3,9 @@ package client import ( "context" - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-sdk-go/client" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" ) // Client is an interface of FrostFS storage diff --git a/pkg/core/client/util.go b/pkg/core/client/util.go index bdf3fc6d..80c8f49b 100644 --- a/pkg/core/client/util.go +++ b/pkg/core/client/util.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-sdk-go/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" ) func nodeInfoFromKeyAddr(dst *NodeInfo, k []byte, a, external network.AddressGroup) { diff --git a/pkg/core/container/delete.go b/pkg/core/container/delete.go index 066a9602..e3379446 100644 --- a/pkg/core/container/delete.go +++ b/pkg/core/container/delete.go @@ -1,8 +1,8 @@ package container import ( - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) // RemovalWitness groups the information required diff --git a/pkg/core/container/storage.go b/pkg/core/container/storage.go index 73f79de4..3ed54529 100644 --- a/pkg/core/container/storage.go +++ b/pkg/core/container/storage.go @@ -3,12 +3,12 @@ package container import ( "errors" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) // Container groups information about the FrostFS container stored in the FrostFS network. diff --git a/pkg/core/netmap/nodes.go b/pkg/core/netmap/nodes.go index 1fd9fdf2..17fccc62 100644 --- a/pkg/core/netmap/nodes.go +++ b/pkg/core/netmap/nodes.go @@ -1,6 +1,6 @@ package netmap -import "github.com/TrueCloudLab/frostfs-sdk-go/netmap" +import "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" // Node is a named type of netmap.NodeInfo which provides interface needed // in the current repository. Node is expected to be used everywhere instead diff --git a/pkg/core/netmap/storage.go b/pkg/core/netmap/storage.go index 44536713..7770c61c 100644 --- a/pkg/core/netmap/storage.go +++ b/pkg/core/netmap/storage.go @@ -1,7 +1,7 @@ package netmap import ( - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // Source is an interface that wraps diff --git a/pkg/core/object/address.go b/pkg/core/object/address.go index 800fe316..cd5559d9 100644 --- a/pkg/core/object/address.go +++ b/pkg/core/object/address.go @@ -1,8 +1,8 @@ package object import ( - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // AddressWithType groups object address with its FrostFS diff --git a/pkg/core/object/fmt.go b/pkg/core/object/fmt.go index 6157661f..b3bafe6c 100644 --- a/pkg/core/object/fmt.go +++ b/pkg/core/object/fmt.go @@ -6,15 +6,15 @@ import ( "fmt" "strconv" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) // FormatValidator represents an object format validator. diff --git a/pkg/core/object/fmt_test.go b/pkg/core/object/fmt_test.go index 817d689b..3f2ea463 100644 --- a/pkg/core/object/fmt_test.go +++ b/pkg/core/object/fmt_test.go @@ -5,14 +5,14 @@ import ( "strconv" "testing" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - sessiontest "github.com/TrueCloudLab/frostfs-sdk-go/session/test" - "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + sessiontest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/object/object.go b/pkg/core/object/object.go index 9824c3d6..8fb656ac 100644 --- a/pkg/core/object/object.go +++ b/pkg/core/object/object.go @@ -1,8 +1,8 @@ package object import ( - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // AddressOf returns the address of the object. diff --git a/pkg/core/storagegroup/storagegroup.go b/pkg/core/storagegroup/storagegroup.go index 8a70fbea..6474377b 100644 --- a/pkg/core/storagegroup/storagegroup.go +++ b/pkg/core/storagegroup/storagegroup.go @@ -3,11 +3,11 @@ package storagegroup import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" ) // SearchSGPrm groups the parameters which are formed by Processor to search the storage group objects. diff --git a/pkg/core/version/version.go b/pkg/core/version/version.go index e84ad30f..eb759a99 100644 --- a/pkg/core/version/version.go +++ b/pkg/core/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" ) // IsValid checks if Version is not earlier than the genesis version of the FrostFS. diff --git a/pkg/core/version/version_test.go b/pkg/core/version/version_test.go index 3d229e92..1ef18c52 100644 --- a/pkg/core/version/version_test.go +++ b/pkg/core/version/version_test.go @@ -3,8 +3,8 @@ package version_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/version" - versionSDK "github.com/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/version" + versionSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/bindings.go b/pkg/innerring/bindings.go index 8bf9ed44..0e10125c 100644 --- a/pkg/innerring/bindings.go +++ b/pkg/innerring/bindings.go @@ -1,7 +1,7 @@ package innerring import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" ) type ( diff --git a/pkg/innerring/blocktimer.go b/pkg/innerring/blocktimer.go index 543ffbf0..747f36fd 100644 --- a/pkg/innerring/blocktimer.go +++ b/pkg/innerring/blocktimer.go @@ -3,13 +3,13 @@ package innerring import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/alphabet" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" - timerEvent "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/timer" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/alphabet" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" + timerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/timers" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/timer" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/util" "go.uber.org/zap" ) diff --git a/pkg/innerring/contracts.go b/pkg/innerring/contracts.go index 4cac9183..c280eb4b 100644 --- a/pkg/innerring/contracts.go +++ b/pkg/innerring/contracts.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/spf13/viper" ) diff --git a/pkg/innerring/fetcher.go b/pkg/innerring/fetcher.go index 3d48b2f2..4a80ebf3 100644 --- a/pkg/innerring/fetcher.go +++ b/pkg/innerring/fetcher.go @@ -1,8 +1,8 @@ package innerring import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index fa56315c..79555aa1 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -8,44 +8,44 @@ import ( "io" "net" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/config" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/alphabet" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/balance" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/container" - frostfs "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/frostfs" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" - nodevalidator "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation" - addrvalidator "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/maddress" - statevalidation "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" - subnetvalidator "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/subnet" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" - auditSettlement "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/audit" - timerEvent "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers" - "github.com/TrueCloudLab/frostfs-node/pkg/metrics" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - auditClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/audit" - balanceClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - frostfsClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" - morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/subscriber" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/timer" - audittask "github.com/TrueCloudLab/frostfs-node/pkg/services/audit/taskmanager" - control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" - controlsrv "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir/server" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - util2 "github.com/TrueCloudLab/frostfs-node/pkg/util" - utilConfig "github.com/TrueCloudLab/frostfs-node/pkg/util/config" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-node/pkg/util/precision" - "github.com/TrueCloudLab/frostfs-node/pkg/util/state" + "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/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/balance" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/container" + frostfs "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" + nodevalidator "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation" + addrvalidator "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/maddress" + statevalidation "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" + subnetvalidator "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" + auditSettlement "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/audit" + timerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/timers" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/metrics" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + auditClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/audit" + balanceClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + frostfsClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + repClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + morphsubnet "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/subscriber" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/timer" + audittask "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit/taskmanager" + control "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir" + controlsrv "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir/server" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + util2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + utilConfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/config" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/precision" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/state" "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" diff --git a/pkg/innerring/internal/client/client.go b/pkg/innerring/internal/client/client.go index 668af543..edcbc6ae 100644 --- a/pkg/innerring/internal/client/client.go +++ b/pkg/innerring/internal/client/client.go @@ -7,13 +7,13 @@ import ( "fmt" "io" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // Client represents FrostFS API client cut down to the needs of a purely IR application. diff --git a/pkg/innerring/internal/client/prm.go b/pkg/innerring/internal/client/prm.go index 5f47e196..3c749fe6 100644 --- a/pkg/innerring/internal/client/prm.go +++ b/pkg/innerring/internal/client/prm.go @@ -3,7 +3,7 @@ package frostfsapiclient import ( "context" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type contextPrm struct { diff --git a/pkg/innerring/locode.go b/pkg/innerring/locode.go index 700ebb81..a9a9498b 100644 --- a/pkg/innerring/locode.go +++ b/pkg/innerring/locode.go @@ -1,11 +1,11 @@ package innerring import ( - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" - irlocode "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/locode" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" - locodebolt "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" + irlocode "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/locode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" + locodebolt "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" "github.com/spf13/viper" ) diff --git a/pkg/innerring/netmap.go b/pkg/innerring/netmap.go index a1041571..9961710c 100644 --- a/pkg/innerring/netmap.go +++ b/pkg/innerring/netmap.go @@ -3,8 +3,8 @@ package innerring import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" - netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" + netmapclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" ) /* diff --git a/pkg/innerring/notary.go b/pkg/innerring/notary.go index eccfcdc9..8680066e 100644 --- a/pkg/innerring/notary.go +++ b/pkg/innerring/notary.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/spf13/viper" "go.uber.org/zap" diff --git a/pkg/innerring/processors/alphabet/handlers.go b/pkg/innerring/processors/alphabet/handlers.go index 927b8061..9d61aa81 100644 --- a/pkg/innerring/processors/alphabet/handlers.go +++ b/pkg/innerring/processors/alphabet/handlers.go @@ -1,8 +1,8 @@ package alphabet import ( - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/timers" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/alphabet/processor.go b/pkg/innerring/processors/alphabet/processor.go index 9dd61184..f57d281e 100644 --- a/pkg/innerring/processors/alphabet/processor.go +++ b/pkg/innerring/processors/alphabet/processor.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/panjf2000/ants/v2" "go.uber.org/zap" diff --git a/pkg/innerring/processors/audit/handlers.go b/pkg/innerring/processors/audit/handlers.go index bed8e550..8b2354bb 100644 --- a/pkg/innerring/processors/audit/handlers.go +++ b/pkg/innerring/processors/audit/handlers.go @@ -1,7 +1,7 @@ package audit import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/audit/process.go b/pkg/innerring/processors/audit/process.go index d592dddb..7feecb7b 100644 --- a/pkg/innerring/processors/audit/process.go +++ b/pkg/innerring/processors/audit/process.go @@ -4,16 +4,16 @@ import ( "context" "crypto/sha256" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/storagegroup" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/audit/processor.go b/pkg/innerring/processors/audit/processor.go index 2a623437..cb514b16 100644 --- a/pkg/innerring/processors/audit/processor.go +++ b/pkg/innerring/processors/audit/processor.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/storagegroup" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" ) diff --git a/pkg/innerring/processors/audit/scheduler.go b/pkg/innerring/processors/audit/scheduler.go index 6e32c5d6..dd660d4e 100644 --- a/pkg/innerring/processors/audit/scheduler.go +++ b/pkg/innerring/processors/audit/scheduler.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/audit/scheduler_test.go b/pkg/innerring/processors/audit/scheduler_test.go index c7fd46b2..51461beb 100644 --- a/pkg/innerring/processors/audit/scheduler_test.go +++ b/pkg/innerring/processors/audit/scheduler_test.go @@ -3,9 +3,9 @@ package audit_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/processors/balance/handlers.go b/pkg/innerring/processors/balance/handlers.go index 39683f77..4c5a2ddc 100644 --- a/pkg/innerring/processors/balance/handlers.go +++ b/pkg/innerring/processors/balance/handlers.go @@ -3,8 +3,8 @@ package balance import ( "encoding/hex" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + balanceEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/balance" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/balance/process_assets.go b/pkg/innerring/processors/balance/process_assets.go index 197ce555..754dda34 100644 --- a/pkg/innerring/processors/balance/process_assets.go +++ b/pkg/innerring/processors/balance/process_assets.go @@ -1,8 +1,8 @@ package balance import ( - frostfsContract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" - balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance" + frostfsContract "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" + balanceEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/balance" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/balance/processor.go b/pkg/innerring/processors/balance/processor.go index b4a4d749..2527b7ec 100644 --- a/pkg/innerring/processors/balance/processor.go +++ b/pkg/innerring/processors/balance/processor.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + frostfscontract "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + balanceEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/balance" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/panjf2000/ants/v2" "go.uber.org/zap" diff --git a/pkg/innerring/processors/container/common.go b/pkg/innerring/processors/container/common.go index 07920d08..bfbf6c78 100644 --- a/pkg/innerring/processors/container/common.go +++ b/pkg/innerring/processors/container/common.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/session" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) var ( diff --git a/pkg/innerring/processors/container/handlers.go b/pkg/innerring/processors/container/handlers.go index 6f26d1af..f9f8b584 100644 --- a/pkg/innerring/processors/container/handlers.go +++ b/pkg/innerring/processors/container/handlers.go @@ -3,8 +3,8 @@ package container import ( "crypto/sha256" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/container" "github.com/mr-tron/base58" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/container/process_container.go b/pkg/innerring/processors/container/process_container.go index 9f4acc5d..8b244aa5 100644 --- a/pkg/innerring/processors/container/process_container.go +++ b/pkg/innerring/processors/container/process_container.go @@ -3,14 +3,14 @@ package container import ( "fmt" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" - containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/session" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + morphsubnet "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/container" + containerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" "github.com/nspcc-dev/neo-go/pkg/network/payload" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/container/process_eacl.go b/pkg/innerring/processors/container/process_eacl.go index 0f3b6e71..e8bbb5db 100644 --- a/pkg/innerring/processors/container/process_eacl.go +++ b/pkg/innerring/processors/container/process_eacl.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/container/processor.go b/pkg/innerring/processors/container/processor.go index d12f7f21..ae0d2872 100644 --- a/pkg/innerring/processors/container/processor.go +++ b/pkg/innerring/processors/container/processor.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" - morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" + morphsubnet "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/panjf2000/ants/v2" "go.uber.org/zap" diff --git a/pkg/innerring/processors/frostfs/handlers.go b/pkg/innerring/processors/frostfs/handlers.go index 588e5b8c..bc0dbec7 100644 --- a/pkg/innerring/processors/frostfs/handlers.go +++ b/pkg/innerring/processors/frostfs/handlers.go @@ -3,8 +3,8 @@ package frostfs import ( "encoding/hex" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + frostfsEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" "github.com/nspcc-dev/neo-go/pkg/util/slice" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/frostfs/process_assets.go b/pkg/innerring/processors/frostfs/process_assets.go index d6330fac..b28efaa3 100644 --- a/pkg/innerring/processors/frostfs/process_assets.go +++ b/pkg/innerring/processors/frostfs/process_assets.go @@ -1,8 +1,8 @@ package frostfs import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" - frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + frostfsEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" "github.com/nspcc-dev/neo-go/pkg/util" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/frostfs/process_bind.go b/pkg/innerring/processors/frostfs/process_bind.go index d1c28fcf..0abce582 100644 --- a/pkg/innerring/processors/frostfs/process_bind.go +++ b/pkg/innerring/processors/frostfs/process_bind.go @@ -4,9 +4,9 @@ import ( "crypto/elliptic" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" - frostfs "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" "go.uber.org/zap" diff --git a/pkg/innerring/processors/frostfs/process_config.go b/pkg/innerring/processors/frostfs/process_config.go index 05492e35..ecc90332 100644 --- a/pkg/innerring/processors/frostfs/process_config.go +++ b/pkg/innerring/processors/frostfs/process_config.go @@ -1,8 +1,8 @@ package frostfs import ( - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + frostfsEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/frostfs/processor.go b/pkg/innerring/processors/frostfs/processor.go index ff9eeb95..e9504cdb 100644 --- a/pkg/innerring/processors/frostfs/processor.go +++ b/pkg/innerring/processors/frostfs/processor.go @@ -5,13 +5,13 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + frostfsEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" lru "github.com/hashicorp/golang-lru/v2" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" diff --git a/pkg/innerring/processors/governance/handlers.go b/pkg/innerring/processors/governance/handlers.go index 4d6776cd..bfa88d3f 100644 --- a/pkg/innerring/processors/governance/handlers.go +++ b/pkg/innerring/processors/governance/handlers.go @@ -1,8 +1,8 @@ package governance import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/rolemanagement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/rolemanagement" "github.com/nspcc-dev/neo-go/pkg/core/native" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/util" diff --git a/pkg/innerring/processors/governance/process_update.go b/pkg/innerring/processors/governance/process_update.go index 705165d4..913ad3d7 100644 --- a/pkg/innerring/processors/governance/process_update.go +++ b/pkg/innerring/processors/governance/process_update.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + frostfscontract "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" "go.uber.org/zap" diff --git a/pkg/innerring/processors/governance/processor.go b/pkg/innerring/processors/governance/processor.go index 1c0a6ee9..9397186e 100644 --- a/pkg/innerring/processors/governance/processor.go +++ b/pkg/innerring/processors/governance/processor.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/rolemanagement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + frostfscontract "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/rolemanagement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/native" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" diff --git a/pkg/innerring/processors/netmap/cleanup_table.go b/pkg/innerring/processors/netmap/cleanup_table.go index 38b9ffb3..e4024e95 100644 --- a/pkg/innerring/processors/netmap/cleanup_table.go +++ b/pkg/innerring/processors/netmap/cleanup_table.go @@ -4,7 +4,7 @@ import ( "bytes" "sync" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) type ( diff --git a/pkg/innerring/processors/netmap/cleanup_table_test.go b/pkg/innerring/processors/netmap/cleanup_table_test.go index 8bf44a5b..95971039 100644 --- a/pkg/innerring/processors/netmap/cleanup_table_test.go +++ b/pkg/innerring/processors/netmap/cleanup_table_test.go @@ -3,7 +3,7 @@ package netmap import ( "testing" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/processors/netmap/handlers.go b/pkg/innerring/processors/netmap/handlers.go index 846d9643..54e4ea3a 100644 --- a/pkg/innerring/processors/netmap/handlers.go +++ b/pkg/innerring/processors/netmap/handlers.go @@ -3,10 +3,10 @@ package netmap import ( "encoding/hex" - timerEvent "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + timerEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/timers" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + netmapEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + subnetevents "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go b/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go index 8e3f5b5a..d071a779 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go +++ b/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) var errMissingRequiredAttr = errors.New("missing required attribute in DB record") diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go b/pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go index 5a692123..6697391e 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go +++ b/pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/locode" - locodestd "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/locode" + locodestd "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/deps.go b/pkg/innerring/processors/netmap/nodevalidation/locode/deps.go index 0a6b0085..e6332261 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/locode/deps.go +++ b/pkg/innerring/processors/netmap/nodevalidation/locode/deps.go @@ -1,8 +1,8 @@ package locode import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" ) // Record is an interface of read-only diff --git a/pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go b/pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go index 0e864577..126f3658 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go +++ b/pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go @@ -3,8 +3,8 @@ package maddress import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // VerifyAndUpdate calls network.VerifyAddress. diff --git a/pkg/innerring/processors/netmap/nodevalidation/state/validator.go b/pkg/innerring/processors/netmap/nodevalidation/state/validator.go index 7db7e518..4094e50a 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/state/validator.go +++ b/pkg/innerring/processors/netmap/nodevalidation/state/validator.go @@ -9,7 +9,7 @@ package state import ( "errors" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // ErrMaintenanceModeDisallowed is returned when maintenance mode is disallowed. diff --git a/pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go b/pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go index 87601944..a557628f 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go +++ b/pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go @@ -3,8 +3,8 @@ package state_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go b/pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go index 9d32f9f7..4c859703 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go +++ b/pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go @@ -3,9 +3,9 @@ package subnet import ( "fmt" - morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + morphsubnet "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" ) // VerifyAndUpdate calls subnet contract's `NodeAllowed` method. diff --git a/pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go b/pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go index 04ad8917..f9ae4e61 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go +++ b/pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go @@ -3,7 +3,7 @@ package subnet import ( "errors" - morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + morphsubnet "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" ) // Validator is an utility that verifies node subnet diff --git a/pkg/innerring/processors/netmap/nodevalidation/validator.go b/pkg/innerring/processors/netmap/nodevalidation/validator.go index bf9c8438..e9b24e02 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/validator.go +++ b/pkg/innerring/processors/netmap/nodevalidation/validator.go @@ -1,8 +1,8 @@ package nodevalidation import ( - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" - apinetmap "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" + apinetmap "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // CompositeValidator wraps `netmap.NodeValidator`s. diff --git a/pkg/innerring/processors/netmap/process_cleanup.go b/pkg/innerring/processors/netmap/process_cleanup.go index 3b7ac629..e4425ef1 100644 --- a/pkg/innerring/processors/netmap/process_cleanup.go +++ b/pkg/innerring/processors/netmap/process_cleanup.go @@ -1,8 +1,8 @@ package netmap import ( - v2netmap "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" - netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + v2netmap "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap" + netmapclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/netmap/process_epoch.go b/pkg/innerring/processors/netmap/process_epoch.go index fca2a4c9..48de528e 100644 --- a/pkg/innerring/processors/netmap/process_epoch.go +++ b/pkg/innerring/processors/netmap/process_epoch.go @@ -1,11 +1,11 @@ package netmap import ( - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + netmapEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/netmap/process_peers.go b/pkg/innerring/processors/netmap/process_peers.go index eba59cb1..3734bae0 100644 --- a/pkg/innerring/processors/netmap/process_peers.go +++ b/pkg/innerring/processors/netmap/process_peers.go @@ -4,11 +4,11 @@ import ( "bytes" "encoding/hex" - netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - subnetEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + netmapclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + netmapEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + subnetEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/netmap/processor.go b/pkg/innerring/processors/netmap/processor.go index 220c41cf..de145d48 100644 --- a/pkg/innerring/processors/netmap/processor.go +++ b/pkg/innerring/processors/netmap/processor.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" - subnetEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + netmapEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + subnetEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/panjf2000/ants/v2" diff --git a/pkg/innerring/processors/reputation/handlers.go b/pkg/innerring/processors/reputation/handlers.go index 50ddf103..36c9579e 100644 --- a/pkg/innerring/processors/reputation/handlers.go +++ b/pkg/innerring/processors/reputation/handlers.go @@ -3,8 +3,8 @@ package reputation import ( "encoding/hex" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + reputationEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/reputation/process_put.go b/pkg/innerring/processors/reputation/process_put.go index 1183a263..31e93763 100644 --- a/pkg/innerring/processors/reputation/process_put.go +++ b/pkg/innerring/processors/reputation/process_put.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" - reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + repClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + reputationEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/reputation/processor.go b/pkg/innerring/processors/reputation/processor.go index c5f64df8..99035825 100644 --- a/pkg/innerring/processors/reputation/processor.go +++ b/pkg/innerring/processors/reputation/processor.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + repClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + reputationEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/panjf2000/ants/v2" "go.uber.org/zap" diff --git a/pkg/innerring/processors/settlement/audit/calculate.go b/pkg/innerring/processors/settlement/audit/calculate.go index 585c4b2a..d819865d 100644 --- a/pkg/innerring/processors/settlement/audit/calculate.go +++ b/pkg/innerring/processors/settlement/audit/calculate.go @@ -7,12 +7,12 @@ import ( "encoding/hex" "math/big" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/audit" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/audit" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/audit/calculator.go b/pkg/innerring/processors/settlement/audit/calculator.go index 239860b7..fb8d8207 100644 --- a/pkg/innerring/processors/settlement/audit/calculator.go +++ b/pkg/innerring/processors/settlement/audit/calculator.go @@ -1,7 +1,7 @@ package audit import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/audit/prm.go b/pkg/innerring/processors/settlement/audit/prm.go index ebd8be5d..d357f0d4 100644 --- a/pkg/innerring/processors/settlement/audit/prm.go +++ b/pkg/innerring/processors/settlement/audit/prm.go @@ -1,9 +1,9 @@ package audit import ( - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" - "github.com/TrueCloudLab/frostfs-sdk-go/audit" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/audit" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // CalculatorPrm groups the parameters of Calculator's constructor. diff --git a/pkg/innerring/processors/settlement/basic/collect.go b/pkg/innerring/processors/settlement/basic/collect.go index 6b00b98b..72f4eb8d 100644 --- a/pkg/innerring/processors/settlement/basic/collect.go +++ b/pkg/innerring/processors/settlement/basic/collect.go @@ -3,8 +3,8 @@ package basic import ( "math/big" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" - cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/basic/context.go b/pkg/innerring/processors/settlement/basic/context.go index 0047821e..a605c053 100644 --- a/pkg/innerring/processors/settlement/basic/context.go +++ b/pkg/innerring/processors/settlement/basic/context.go @@ -4,10 +4,10 @@ import ( "math/big" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/innerring/processors/settlement/basic/distribute.go b/pkg/innerring/processors/settlement/basic/distribute.go index 258cb607..a2baa36a 100644 --- a/pkg/innerring/processors/settlement/basic/distribute.go +++ b/pkg/innerring/processors/settlement/basic/distribute.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "math/big" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/calls.go b/pkg/innerring/processors/settlement/calls.go index 91262ce3..b4f44543 100644 --- a/pkg/innerring/processors/settlement/calls.go +++ b/pkg/innerring/processors/settlement/calls.go @@ -1,8 +1,8 @@ package settlement import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/common/types.go b/pkg/innerring/processors/settlement/common/types.go index ee4ae59c..9dca0fd0 100644 --- a/pkg/innerring/processors/settlement/common/types.go +++ b/pkg/innerring/processors/settlement/common/types.go @@ -3,8 +3,8 @@ package common import ( "math/big" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) // NodeInfo groups the data about the storage node diff --git a/pkg/innerring/processors/settlement/common/util.go b/pkg/innerring/processors/settlement/common/util.go index 6374f2d8..6f40fb57 100644 --- a/pkg/innerring/processors/settlement/common/util.go +++ b/pkg/innerring/processors/settlement/common/util.go @@ -3,7 +3,7 @@ package common import ( "math/big" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) type TransferTable struct { diff --git a/pkg/innerring/processors/settlement/deps.go b/pkg/innerring/processors/settlement/deps.go index d20c91c6..37d7955a 100644 --- a/pkg/innerring/processors/settlement/deps.go +++ b/pkg/innerring/processors/settlement/deps.go @@ -1,7 +1,7 @@ package settlement import ( - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" ) // AuditProcessor is an interface of data audit fee processor. diff --git a/pkg/innerring/processors/settlement/events.go b/pkg/innerring/processors/settlement/events.go index 6e4eaae2..a47a3e89 100644 --- a/pkg/innerring/processors/settlement/events.go +++ b/pkg/innerring/processors/settlement/events.go @@ -1,7 +1,7 @@ package settlement import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" ) // AuditEvent is an event of the start of diff --git a/pkg/innerring/processors/settlement/handlers.go b/pkg/innerring/processors/settlement/handlers.go index 4eed411e..f73b6198 100644 --- a/pkg/innerring/processors/settlement/handlers.go +++ b/pkg/innerring/processors/settlement/handlers.go @@ -1,6 +1,6 @@ package settlement -import "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" type auditEventHandler struct { log *logger.Logger diff --git a/pkg/innerring/processors/settlement/opts.go b/pkg/innerring/processors/settlement/opts.go index de59510d..b344f98d 100644 --- a/pkg/innerring/processors/settlement/opts.go +++ b/pkg/innerring/processors/settlement/opts.go @@ -1,7 +1,7 @@ package settlement import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/processor.go b/pkg/innerring/processors/settlement/processor.go index e656e6f9..e86666d5 100644 --- a/pkg/innerring/processors/settlement/processor.go +++ b/pkg/innerring/processors/settlement/processor.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" - nodeutil "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" + nodeutil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/subnet/common.go b/pkg/innerring/processors/subnet/common.go index b40f2bdc..2026c864 100644 --- a/pkg/innerring/processors/subnet/common.go +++ b/pkg/innerring/processors/subnet/common.go @@ -3,7 +3,7 @@ package subnetevents import ( "fmt" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" ) // common interface of subnet notifications with subnet ID. diff --git a/pkg/innerring/processors/subnet/common_test.go b/pkg/innerring/processors/subnet/common_test.go index 3986352a..23e61a44 100644 --- a/pkg/innerring/processors/subnet/common_test.go +++ b/pkg/innerring/processors/subnet/common_test.go @@ -1,6 +1,6 @@ package subnetevents -import subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" +import subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" type idEvent struct { id subnetid.ID diff --git a/pkg/innerring/processors/subnet/put.go b/pkg/innerring/processors/subnet/put.go index 338eeab0..ba158875 100644 --- a/pkg/innerring/processors/subnet/put.go +++ b/pkg/innerring/processors/subnet/put.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-sdk-go/subnet" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) // Put represents a notification about FrostFS subnet creation. diff --git a/pkg/innerring/processors/subnet/put_test.go b/pkg/innerring/processors/subnet/put_test.go index 4380a6d4..dda6ee90 100644 --- a/pkg/innerring/processors/subnet/put_test.go +++ b/pkg/innerring/processors/subnet/put_test.go @@ -4,12 +4,12 @@ import ( "errors" "testing" - "github.com/TrueCloudLab/frostfs-sdk-go/user" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" "github.com/stretchr/testify/require" - "github.com/TrueCloudLab/frostfs-sdk-go/subnet" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" ) type put struct { diff --git a/pkg/innerring/rpc.go b/pkg/innerring/rpc.go index 949c08b8..013023b0 100644 --- a/pkg/innerring/rpc.go +++ b/pkg/innerring/rpc.go @@ -6,19 +6,19 @@ import ( "fmt" "time" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - storagegroup2 "github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup" - frostfsapiclient "github.com/TrueCloudLab/frostfs-node/pkg/innerring/internal/client" - "github.com/TrueCloudLab/frostfs-node/pkg/network/cache" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + storagegroup2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/storagegroup" + frostfsapiclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/cache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" "go.uber.org/zap" ) diff --git a/pkg/innerring/settlement.go b/pkg/innerring/settlement.go index 839fa720..08e7a9f4 100644 --- a/pkg/innerring/settlement.go +++ b/pkg/innerring/settlement.go @@ -9,23 +9,23 @@ import ( "fmt" "math/big" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" - auditClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/audit" - balanceClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" - containerClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" - netmapClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - auditAPI "github.com/TrueCloudLab/frostfs-sdk-go/audit" - containerAPI "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - netmapAPI "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + auditClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/audit" + balanceClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + containerClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" + netmapClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + auditAPI "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/audit" + containerAPI "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + netmapAPI "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.uber.org/zap" ) diff --git a/pkg/innerring/state.go b/pkg/innerring/state.go index ccc8cae0..b7551049 100644 --- a/pkg/innerring/state.go +++ b/pkg/innerring/state.go @@ -4,11 +4,11 @@ import ( "fmt" "sort" - "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" - auditClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" - control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" - "github.com/TrueCloudLab/frostfs-node/pkg/util/state" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" + auditClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit" + control "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/state" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/spf13/viper" "go.uber.org/zap" diff --git a/pkg/innerring/subnet.go b/pkg/innerring/subnet.go index c6f9da5f..5375029d 100644 --- a/pkg/innerring/subnet.go +++ b/pkg/innerring/subnet.go @@ -6,16 +6,16 @@ import ( "errors" "fmt" - irsubnet "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/subnet" - netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/subnet" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + irsubnet "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors/subnet" + netmapclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + morphsubnet "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + subnetevents "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" neogoutil "github.com/nspcc-dev/neo-go/pkg/util" diff --git a/pkg/local_object_storage/blobovnicza/blobovnicza.go b/pkg/local_object_storage/blobovnicza/blobovnicza.go index 8cc0581c..a4932440 100644 --- a/pkg/local_object_storage/blobovnicza/blobovnicza.go +++ b/pkg/local_object_storage/blobovnicza/blobovnicza.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.etcd.io/bbolt" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/pkg/local_object_storage/blobovnicza/blobovnicza_test.go b/pkg/local_object_storage/blobovnicza/blobovnicza_test.go index 43b359d6..43dbe1b9 100644 --- a/pkg/local_object_storage/blobovnicza/blobovnicza_test.go +++ b/pkg/local_object_storage/blobovnicza/blobovnicza_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger/test" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger/test" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobovnicza/control.go b/pkg/local_object_storage/blobovnicza/control.go index a64dbc58..3912deac 100644 --- a/pkg/local_object_storage/blobovnicza/control.go +++ b/pkg/local_object_storage/blobovnicza/control.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobovnicza/delete.go b/pkg/local_object_storage/blobovnicza/delete.go index 371f5460..1f885bd8 100644 --- a/pkg/local_object_storage/blobovnicza/delete.go +++ b/pkg/local_object_storage/blobovnicza/delete.go @@ -1,8 +1,8 @@ package blobovnicza import ( - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobovnicza/errors.go b/pkg/local_object_storage/blobovnicza/errors.go index dba86298..2b0575c9 100644 --- a/pkg/local_object_storage/blobovnicza/errors.go +++ b/pkg/local_object_storage/blobovnicza/errors.go @@ -3,7 +3,7 @@ package blobovnicza import ( "errors" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) // IsErrNotFound checks if the error returned by Blobovnicza Get/Delete method diff --git a/pkg/local_object_storage/blobovnicza/exists.go b/pkg/local_object_storage/blobovnicza/exists.go index 733a0ae5..8ac45c4a 100644 --- a/pkg/local_object_storage/blobovnicza/exists.go +++ b/pkg/local_object_storage/blobovnicza/exists.go @@ -1,7 +1,7 @@ package blobovnicza import ( - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobovnicza/get.go b/pkg/local_object_storage/blobovnicza/get.go index 665a2d00..776f08d2 100644 --- a/pkg/local_object_storage/blobovnicza/get.go +++ b/pkg/local_object_storage/blobovnicza/get.go @@ -3,8 +3,8 @@ package blobovnicza import ( "errors" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/util/slice" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobovnicza/get_test.go b/pkg/local_object_storage/blobovnicza/get_test.go index 7f6b1806..98097e9c 100644 --- a/pkg/local_object_storage/blobovnicza/get_test.go +++ b/pkg/local_object_storage/blobovnicza/get_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobovnicza/iterate.go b/pkg/local_object_storage/blobovnicza/iterate.go index 5187d2e0..1adfacbc 100644 --- a/pkg/local_object_storage/blobovnicza/iterate.go +++ b/pkg/local_object_storage/blobovnicza/iterate.go @@ -3,7 +3,7 @@ package blobovnicza import ( "fmt" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobovnicza/iterate_test.go b/pkg/local_object_storage/blobovnicza/iterate_test.go index 8d51a3a4..6ecb20c7 100644 --- a/pkg/local_object_storage/blobovnicza/iterate_test.go +++ b/pkg/local_object_storage/blobovnicza/iterate_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/nspcc-dev/neo-go/pkg/util/slice" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" diff --git a/pkg/local_object_storage/blobovnicza/put.go b/pkg/local_object_storage/blobovnicza/put.go index 00da5a84..37ed57e1 100644 --- a/pkg/local_object_storage/blobovnicza/put.go +++ b/pkg/local_object_storage/blobovnicza/put.go @@ -3,8 +3,8 @@ package blobovnicza import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go b/pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go index 27ae8154..c628c96b 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go @@ -7,12 +7,12 @@ import ( "strconv" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/hrw" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/hrw" "github.com/hashicorp/golang-lru/v2/simplelru" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/control.go b/pkg/local_object_storage/blobstor/blobovniczatree/control.go index 1c8a5e85..e7e890e5 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/control.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/control.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/delete.go b/pkg/local_object_storage/blobstor/blobovniczatree/delete.go index 01e8b044..7e14d6d8 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/delete.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/delete.go @@ -3,10 +3,10 @@ package blobovniczatree import ( "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/errors.go b/pkg/local_object_storage/blobstor/blobovniczatree/errors.go index ef6612da..4ef053d5 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/errors.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/errors.go @@ -3,8 +3,8 @@ package blobovniczatree import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) func isErrOutOfRange(err error) bool { diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/exists.go b/pkg/local_object_storage/blobstor/blobovniczatree/exists.go index df2dbc43..e13e4935 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/exists.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/exists.go @@ -3,8 +3,8 @@ package blobovniczatree import ( "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go b/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go index 024f68a5..8b6db9fa 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/util/slice" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/generic_test.go b/pkg/local_object_storage/blobstor/blobovniczatree/generic_test.go index 88cbbfab..f1bc0b22 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/generic_test.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/generic_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/get.go b/pkg/local_object_storage/blobstor/blobovniczatree/get.go index 3c7998f9..89ea9b64 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/get.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/get.go @@ -4,11 +4,11 @@ import ( "fmt" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go b/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go index 4eab3215..29df2394 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go @@ -4,11 +4,11 @@ import ( "fmt" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/iterate.go b/pkg/local_object_storage/blobstor/blobovniczatree/iterate.go index a36d34e4..9918801b 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/iterate.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/iterate.go @@ -4,10 +4,10 @@ import ( "fmt" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/hrw" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/hrw" ) // Iterate iterates over all objects in b. diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/option.go b/pkg/local_object_storage/blobstor/blobovniczatree/option.go index a231e211..95ef8635 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/option.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/option.go @@ -3,9 +3,9 @@ package blobovniczatree import ( "io/fs" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/put.go b/pkg/local_object_storage/blobstor/blobovniczatree/put.go index 8da731d5..614d66fe 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/put.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/put.go @@ -4,8 +4,8 @@ import ( "errors" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobstor.go b/pkg/local_object_storage/blobstor/blobstor.go index 3f8344c5..a6fe9935 100644 --- a/pkg/local_object_storage/blobstor/blobstor.go +++ b/pkg/local_object_storage/blobstor/blobstor.go @@ -3,11 +3,11 @@ package blobstor import ( "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobstor_test.go b/pkg/local_object_storage/blobstor/blobstor_test.go index ed9316e8..e6d680cb 100644 --- a/pkg/local_object_storage/blobstor/blobstor_test.go +++ b/pkg/local_object_storage/blobstor/blobstor_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/common/delete.go b/pkg/local_object_storage/blobstor/common/delete.go index 9afc3348..1b04eab1 100644 --- a/pkg/local_object_storage/blobstor/common/delete.go +++ b/pkg/local_object_storage/blobstor/common/delete.go @@ -1,7 +1,7 @@ package common import ( - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // DeletePrm groups the parameters of Delete operation. diff --git a/pkg/local_object_storage/blobstor/common/errors.go b/pkg/local_object_storage/blobstor/common/errors.go index a709a6d3..46a84c73 100644 --- a/pkg/local_object_storage/blobstor/common/errors.go +++ b/pkg/local_object_storage/blobstor/common/errors.go @@ -1,7 +1,7 @@ package common import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" ) // ErrReadOnly MUST be returned for modifying operations when the storage was opened diff --git a/pkg/local_object_storage/blobstor/common/exists.go b/pkg/local_object_storage/blobstor/common/exists.go index 48f7173f..d9bdbd33 100644 --- a/pkg/local_object_storage/blobstor/common/exists.go +++ b/pkg/local_object_storage/blobstor/common/exists.go @@ -1,6 +1,6 @@ package common -import oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" +import oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" // ExistsPrm groups the parameters of Exists operation. type ExistsPrm struct { diff --git a/pkg/local_object_storage/blobstor/common/get.go b/pkg/local_object_storage/blobstor/common/get.go index 09eb0064..0d036219 100644 --- a/pkg/local_object_storage/blobstor/common/get.go +++ b/pkg/local_object_storage/blobstor/common/get.go @@ -1,8 +1,8 @@ package common import ( - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type GetPrm struct { diff --git a/pkg/local_object_storage/blobstor/common/get_range.go b/pkg/local_object_storage/blobstor/common/get_range.go index 543246bd..1c4f95c0 100644 --- a/pkg/local_object_storage/blobstor/common/get_range.go +++ b/pkg/local_object_storage/blobstor/common/get_range.go @@ -1,8 +1,8 @@ package common import ( - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type GetRangePrm struct { diff --git a/pkg/local_object_storage/blobstor/common/iterate.go b/pkg/local_object_storage/blobstor/common/iterate.go index 3cec9f68..a6f0da26 100644 --- a/pkg/local_object_storage/blobstor/common/iterate.go +++ b/pkg/local_object_storage/blobstor/common/iterate.go @@ -1,6 +1,6 @@ package common -import oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" +import oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" // IterationElement represents a unit of elements through which Iterate operation passes. type IterationElement struct { diff --git a/pkg/local_object_storage/blobstor/common/put.go b/pkg/local_object_storage/blobstor/common/put.go index 34947ac6..51bb9624 100644 --- a/pkg/local_object_storage/blobstor/common/put.go +++ b/pkg/local_object_storage/blobstor/common/put.go @@ -1,8 +1,8 @@ package common import ( - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // PutPrm groups the parameters of Put operation. diff --git a/pkg/local_object_storage/blobstor/common/storage.go b/pkg/local_object_storage/blobstor/common/storage.go index aac88da1..76dd6d96 100644 --- a/pkg/local_object_storage/blobstor/common/storage.go +++ b/pkg/local_object_storage/blobstor/common/storage.go @@ -1,6 +1,6 @@ package common -import "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" // Storage represents key-value object storage. // It is used as a building block for a blobstor of a shard. diff --git a/pkg/local_object_storage/blobstor/compression/compress.go b/pkg/local_object_storage/blobstor/compression/compress.go index 6cab3c29..79e37f8a 100644 --- a/pkg/local_object_storage/blobstor/compression/compress.go +++ b/pkg/local_object_storage/blobstor/compression/compress.go @@ -4,7 +4,7 @@ import ( "bytes" "strings" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/klauspost/compress/zstd" ) diff --git a/pkg/local_object_storage/blobstor/delete.go b/pkg/local_object_storage/blobstor/delete.go index 48d11788..8c5a7aba 100644 --- a/pkg/local_object_storage/blobstor/delete.go +++ b/pkg/local_object_storage/blobstor/delete.go @@ -3,8 +3,8 @@ package blobstor import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) func (b *BlobStor) Delete(prm common.DeletePrm) (common.DeleteRes, error) { diff --git a/pkg/local_object_storage/blobstor/exists.go b/pkg/local_object_storage/blobstor/exists.go index 09ce0ebc..7a5a0095 100644 --- a/pkg/local_object_storage/blobstor/exists.go +++ b/pkg/local_object_storage/blobstor/exists.go @@ -1,7 +1,7 @@ package blobstor import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/exists_test.go b/pkg/local_object_storage/blobstor/exists_test.go index 492ab418..54f3eb1f 100644 --- a/pkg/local_object_storage/blobstor/exists_test.go +++ b/pkg/local_object_storage/blobstor/exists_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/fstree/control.go b/pkg/local_object_storage/blobstor/fstree/control.go index 3fd14f60..1ff74893 100644 --- a/pkg/local_object_storage/blobstor/fstree/control.go +++ b/pkg/local_object_storage/blobstor/fstree/control.go @@ -1,7 +1,7 @@ package fstree import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" ) // Open implements common.Storage. diff --git a/pkg/local_object_storage/blobstor/fstree/fstree.go b/pkg/local_object_storage/blobstor/fstree/fstree.go index 0446cfcc..3265e68f 100644 --- a/pkg/local_object_storage/blobstor/fstree/fstree.go +++ b/pkg/local_object_storage/blobstor/fstree/fstree.go @@ -11,14 +11,14 @@ import ( "strings" "syscall" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // FSTree represents an object storage as a filesystem tree. diff --git a/pkg/local_object_storage/blobstor/fstree/fstree_test.go b/pkg/local_object_storage/blobstor/fstree/fstree_test.go index 97fd6032..0e5525e7 100644 --- a/pkg/local_object_storage/blobstor/fstree/fstree_test.go +++ b/pkg/local_object_storage/blobstor/fstree/fstree_test.go @@ -3,7 +3,7 @@ package fstree import ( "testing" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/fstree/generic_test.go b/pkg/local_object_storage/blobstor/fstree/generic_test.go index 0abc74c6..49f487d3 100644 --- a/pkg/local_object_storage/blobstor/fstree/generic_test.go +++ b/pkg/local_object_storage/blobstor/fstree/generic_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" ) func TestGeneric(t *testing.T) { diff --git a/pkg/local_object_storage/blobstor/generic_test.go b/pkg/local_object_storage/blobstor/generic_test.go index 2f34969e..533efcb5 100644 --- a/pkg/local_object_storage/blobstor/generic_test.go +++ b/pkg/local_object_storage/blobstor/generic_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" ) func TestGeneric(t *testing.T) { diff --git a/pkg/local_object_storage/blobstor/get.go b/pkg/local_object_storage/blobstor/get.go index 3f9fa996..6caa61b8 100644 --- a/pkg/local_object_storage/blobstor/get.go +++ b/pkg/local_object_storage/blobstor/get.go @@ -3,9 +3,9 @@ package blobstor import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) // Get reads the object from b. diff --git a/pkg/local_object_storage/blobstor/get_range.go b/pkg/local_object_storage/blobstor/get_range.go index 7666927f..93939cab 100644 --- a/pkg/local_object_storage/blobstor/get_range.go +++ b/pkg/local_object_storage/blobstor/get_range.go @@ -3,9 +3,9 @@ package blobstor import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) // GetRange reads object payload data from b. diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/common.go b/pkg/local_object_storage/blobstor/internal/blobstortest/common.go index 798c9bf1..b2663be2 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/common.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/common.go @@ -4,12 +4,12 @@ import ( "math/rand" "testing" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/control.go b/pkg/local_object_storage/blobstor/internal/blobstortest/control.go index c5ebb859..0a74495d 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/control.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/control.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go b/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go index b13498a4..f3bb4c3f 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go @@ -3,9 +3,9 @@ package blobstortest import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go b/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go index 744ccdbf..ee16ddcb 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go @@ -3,8 +3,8 @@ package blobstortest import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/get.go b/pkg/local_object_storage/blobstor/internal/blobstortest/get.go index 4b7110e6..cc3da6b4 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/get.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/get.go @@ -3,9 +3,9 @@ package blobstortest import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go b/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go index 01ddc6ea..9e4b1a44 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go @@ -4,9 +4,9 @@ import ( "math" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go b/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go index a598098f..231df3ef 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/iterate.go b/pkg/local_object_storage/blobstor/iterate.go index 4583b62b..0461dd80 100644 --- a/pkg/local_object_storage/blobstor/iterate.go +++ b/pkg/local_object_storage/blobstor/iterate.go @@ -3,8 +3,8 @@ package blobstor import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/iterate_test.go b/pkg/local_object_storage/blobstor/iterate_test.go index c2c1c05d..b2a7ddfb 100644 --- a/pkg/local_object_storage/blobstor/iterate_test.go +++ b/pkg/local_object_storage/blobstor/iterate_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) @@ -89,25 +89,25 @@ func TestIterateObjects(t *testing.T) { func TestIterate_IgnoreErrors(t *testing.T) { t.Skip() - //dir := t.TempDir() + // dir := t.TempDir() // - //const ( + // const ( // smallSize = 512 // objCount = 5 - //) - //bsOpts := []Option{ + // ) + // bsOpts := []Option{ // WithCompressObjects(true), // WithRootPath(dir), // WithSmallSizeLimit(smallSize * 2), // + header // WithBlobovniczaOpenedCacheSize(1), // WithBlobovniczaShallowWidth(1), // WithBlobovniczaShallowDepth(1)} - //bs := New(bsOpts...) - //require.NoError(t, bs.Open(false)) - //require.NoError(t, bs.Init()) + // bs := New(bsOpts...) + // require.NoError(t, bs.Open(false)) + // require.NoError(t, bs.Init()) // - //addrs := make([]oid.Address, objCount) - //for i := range addrs { + // addrs := make([]oid.Address, objCount) + // for i := range addrs { // addrs[i] = oidtest.Address() // // obj := object.New() @@ -120,54 +120,54 @@ func TestIterate_IgnoreErrors(t *testing.T) { // // _, err = bs.PutRaw(addrs[i], objData, true) // require.NoError(t, err) - //} + // } // - //// Construct corrupted compressed object. - //buf := bytes.NewBuffer(nil) - //badObject := make([]byte, smallSize/2+1) - //enc, err := zstd.NewWriter(buf) - //require.NoError(t, err) - //rawData := enc.EncodeAll(badObject, nil) - //for i := 4; /* magic size */ i < len(rawData); i += 2 { + // // Construct corrupted compressed object. + // buf := bytes.NewBuffer(nil) + // badObject := make([]byte, smallSize/2+1) + // enc, err := zstd.NewWriter(buf) + // require.NoError(t, err) + // rawData := enc.EncodeAll(badObject, nil) + // for i := 4; /* magic size */ i < len(rawData); i += 2 { // rawData[i] ^= 0xFF - //} - //// Will be put uncompressed but fetched as compressed because of magic. - //_, err = bs.PutRaw(oidtest.Address(), rawData, false) - //require.NoError(t, err) - //require.NoError(t, bs.fsTree.Put(oidtest.Address(), rawData)) + // } + // // Will be put uncompressed but fetched as compressed because of magic. + // _, err = bs.PutRaw(oidtest.Address(), rawData, false) + // require.NoError(t, err) + // require.NoError(t, bs.fsTree.Put(oidtest.Address(), rawData)) // - //require.NoError(t, bs.Close()) + // require.NoError(t, bs.Close()) // - //// Increase width to have blobovnicza which is definitely empty. - //b := New(append(bsOpts, WithBlobovniczaShallowWidth(2))...) - //require.NoError(t, b.Open(false)) - //require.NoError(t, b.Init()) + // // Increase width to have blobovnicza which is definitely empty. + // b := New(append(bsOpts, WithBlobovniczaShallowWidth(2))...) + // require.NoError(t, b.Open(false)) + // require.NoError(t, b.Init()) // - //var p string - //for i := 0; i < 2; i++ { + // var p string + // for i := 0; i < 2; i++ { // bp := filepath.Join(bs.rootPath, "1", strconv.FormatUint(uint64(i), 10)) // if _, ok := bs.blobovniczas.opened.Get(bp); !ok { // p = bp // break // } - //} - //require.NotEqual(t, "", p, "expected to not have at least 1 blobovnicza in cache") - //require.NoError(t, os.Chmod(p, 0)) + // } + // require.NotEqual(t, "", p, "expected to not have at least 1 blobovnicza in cache") + // require.NoError(t, os.Chmod(p, 0)) // - //require.NoError(t, b.Close()) - //require.NoError(t, bs.Open(false)) - //require.NoError(t, bs.Init()) + // require.NoError(t, b.Close()) + // require.NoError(t, bs.Open(false)) + // require.NoError(t, bs.Init()) // - //var prm IteratePrm - //prm.SetIterationHandler(func(e IterationElement) error { + // var prm IteratePrm + // prm.SetIterationHandler(func(e IterationElement) error { // return nil - //}) - //_, err = bs.Iterate(prm) - //require.Error(t, err) + // }) + // _, err = bs.Iterate(prm) + // require.Error(t, err) // - //prm.IgnoreErrors() + // prm.IgnoreErrors() // - //t.Run("skip invalid objects", func(t *testing.T) { + // t.Run("skip invalid objects", func(t *testing.T) { // actual := make([]oid.Address, 0, len(addrs)) // prm.SetIterationHandler(func(e IterationElement) error { // obj := object.New() @@ -188,8 +188,8 @@ func TestIterate_IgnoreErrors(t *testing.T) { // _, err := bs.Iterate(prm) // require.NoError(t, err) // require.ElementsMatch(t, addrs, actual) - //}) - //t.Run("return errors from handler", func(t *testing.T) { + // }) + // t.Run("return errors from handler", func(t *testing.T) { // n := 0 // expectedErr := errors.New("expected error") // prm.SetIterationHandler(func(e IterationElement) error { @@ -200,5 +200,5 @@ func TestIterate_IgnoreErrors(t *testing.T) { // }) // _, err := bs.Iterate(prm) // require.ErrorIs(t, err, expectedErr) - //}) + // }) } diff --git a/pkg/local_object_storage/blobstor/logger.go b/pkg/local_object_storage/blobstor/logger.go index d21e0500..f201f18d 100644 --- a/pkg/local_object_storage/blobstor/logger.go +++ b/pkg/local_object_storage/blobstor/logger.go @@ -1,9 +1,9 @@ package blobstor import ( - storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) const deleteOp = "DELETE" diff --git a/pkg/local_object_storage/blobstor/mode.go b/pkg/local_object_storage/blobstor/mode.go index 42a4afc5..e6d0edc0 100644 --- a/pkg/local_object_storage/blobstor/mode.go +++ b/pkg/local_object_storage/blobstor/mode.go @@ -3,7 +3,7 @@ package blobstor import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" ) // SetMode sets the blobstor mode of operation. diff --git a/pkg/local_object_storage/blobstor/put.go b/pkg/local_object_storage/blobstor/put.go index 9d94d7b1..a4009ae4 100644 --- a/pkg/local_object_storage/blobstor/put.go +++ b/pkg/local_object_storage/blobstor/put.go @@ -3,10 +3,10 @@ package blobstor import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) // ErrNoPlaceFound is returned when object can't be saved to any sub-storage component diff --git a/pkg/local_object_storage/engine/container.go b/pkg/local_object_storage/engine/container.go index ea508ab6..03483711 100644 --- a/pkg/local_object_storage/engine/container.go +++ b/pkg/local_object_storage/engine/container.go @@ -1,8 +1,8 @@ package engine import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/control.go b/pkg/local_object_storage/engine/control.go index b9a83135..c5e51a7f 100644 --- a/pkg/local_object_storage/engine/control.go +++ b/pkg/local_object_storage/engine/control.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/control_test.go b/pkg/local_object_storage/engine/control_test.go index c2d7a321..65a8d434 100644 --- a/pkg/local_object_storage/engine/control_test.go +++ b/pkg/local_object_storage/engine/control_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" "go.uber.org/zap/zaptest" diff --git a/pkg/local_object_storage/engine/delete.go b/pkg/local_object_storage/engine/delete.go index 9a355b56..a49b1e8f 100644 --- a/pkg/local_object_storage/engine/delete.go +++ b/pkg/local_object_storage/engine/delete.go @@ -3,10 +3,10 @@ package engine import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/delete_test.go b/pkg/local_object_storage/engine/delete_test.go index 6aefde08..ff604f66 100644 --- a/pkg/local_object_storage/engine/delete_test.go +++ b/pkg/local_object_storage/engine/delete_test.go @@ -4,13 +4,13 @@ import ( "os" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/engine/dump.go b/pkg/local_object_storage/engine/dump.go index 0b7c4864..f5cf8c32 100644 --- a/pkg/local_object_storage/engine/dump.go +++ b/pkg/local_object_storage/engine/dump.go @@ -1,6 +1,6 @@ package engine -import "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" // DumpShard dumps objects from the shard with provided identifier. // diff --git a/pkg/local_object_storage/engine/engine.go b/pkg/local_object_storage/engine/engine.go index cacb23b8..4d154d28 100644 --- a/pkg/local_object_storage/engine/engine.go +++ b/pkg/local_object_storage/engine/engine.go @@ -4,11 +4,11 @@ import ( "errors" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/engine_test.go b/pkg/local_object_storage/engine/engine_test.go index 69514b53..a2dced60 100644 --- a/pkg/local_object_storage/engine/engine_test.go +++ b/pkg/local_object_storage/engine/engine_test.go @@ -6,23 +6,23 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/checksum" - checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" - "github.com/TrueCloudLab/frostfs-sdk-go/version" - "github.com/TrueCloudLab/hrw" - "github.com/TrueCloudLab/tzhash/tz" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + checksumtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum/test" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/hrw" + "git.frostfs.info/TrueCloudLab/tzhash/tz" "github.com/panjf2000/ants/v2" "github.com/stretchr/testify/require" "go.uber.org/atomic" diff --git a/pkg/local_object_storage/engine/error_test.go b/pkg/local_object_storage/engine/error_test.go index 0444dde1..bc205d83 100644 --- a/pkg/local_object_storage/engine/error_test.go +++ b/pkg/local_object_storage/engine/error_test.go @@ -7,16 +7,16 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/engine/evacuate.go b/pkg/local_object_storage/engine/evacuate.go index 6ff61ed0..59965ba4 100644 --- a/pkg/local_object_storage/engine/evacuate.go +++ b/pkg/local_object_storage/engine/evacuate.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/hrw" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/hrw" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/evacuate_test.go b/pkg/local_object_storage/engine/evacuate_test.go index 907e011e..a70a70dc 100644 --- a/pkg/local_object_storage/engine/evacuate_test.go +++ b/pkg/local_object_storage/engine/evacuate_test.go @@ -8,16 +8,16 @@ import ( "strconv" "testing" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/engine/exists.go b/pkg/local_object_storage/engine/exists.go index 0248cf94..a43c7f23 100644 --- a/pkg/local_object_storage/engine/exists.go +++ b/pkg/local_object_storage/engine/exists.go @@ -3,10 +3,10 @@ package engine import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) func (e *StorageEngine) exists(addr oid.Address) (bool, error) { diff --git a/pkg/local_object_storage/engine/get.go b/pkg/local_object_storage/engine/get.go index 3db3e7c6..264ace58 100644 --- a/pkg/local_object_storage/engine/get.go +++ b/pkg/local_object_storage/engine/get.go @@ -3,12 +3,12 @@ package engine import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/head.go b/pkg/local_object_storage/engine/head.go index 6f4b3b36..689b46de 100644 --- a/pkg/local_object_storage/engine/head.go +++ b/pkg/local_object_storage/engine/head.go @@ -3,12 +3,12 @@ package engine import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // HeadPrm groups the parameters of Head operation. diff --git a/pkg/local_object_storage/engine/head_test.go b/pkg/local_object_storage/engine/head_test.go index 4d19b15a..47f09f7a 100644 --- a/pkg/local_object_storage/engine/head_test.go +++ b/pkg/local_object_storage/engine/head_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/info.go b/pkg/local_object_storage/engine/info.go index da0d50b6..41b75af6 100644 --- a/pkg/local_object_storage/engine/info.go +++ b/pkg/local_object_storage/engine/info.go @@ -1,7 +1,7 @@ package engine import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" ) // Info groups the information about StorageEngine. diff --git a/pkg/local_object_storage/engine/inhume.go b/pkg/local_object_storage/engine/inhume.go index 3e65343f..13aa9094 100644 --- a/pkg/local_object_storage/engine/inhume.go +++ b/pkg/local_object_storage/engine/inhume.go @@ -4,11 +4,11 @@ import ( "context" "errors" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/inhume_test.go b/pkg/local_object_storage/engine/inhume_test.go index e48a6873..8cf0b166 100644 --- a/pkg/local_object_storage/engine/inhume_test.go +++ b/pkg/local_object_storage/engine/inhume_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/list.go b/pkg/local_object_storage/engine/list.go index 92cf2abf..8644a7f7 100644 --- a/pkg/local_object_storage/engine/list.go +++ b/pkg/local_object_storage/engine/list.go @@ -3,8 +3,8 @@ package engine import ( "sort" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" ) // ErrEndOfListing is returned from an object listing with cursor diff --git a/pkg/local_object_storage/engine/list_test.go b/pkg/local_object_storage/engine/list_test.go index 43e177e6..1771cf08 100644 --- a/pkg/local_object_storage/engine/list_test.go +++ b/pkg/local_object_storage/engine/list_test.go @@ -6,9 +6,9 @@ import ( "sort" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/lock.go b/pkg/local_object_storage/engine/lock.go index 9b5652e9..20a4d68e 100644 --- a/pkg/local_object_storage/engine/lock.go +++ b/pkg/local_object_storage/engine/lock.go @@ -3,12 +3,12 @@ package engine import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) var errLockFailed = errors.New("lock operation failed") diff --git a/pkg/local_object_storage/engine/lock_test.go b/pkg/local_object_storage/engine/lock_test.go index 03ba5a41..4d3ade8e 100644 --- a/pkg/local_object_storage/engine/lock_test.go +++ b/pkg/local_object_storage/engine/lock_test.go @@ -7,17 +7,17 @@ import ( "testing" "time" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + objecttest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/panjf2000/ants/v2" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/put.go b/pkg/local_object_storage/engine/put.go index 9adb19b9..68a4467f 100644 --- a/pkg/local_object_storage/engine/put.go +++ b/pkg/local_object_storage/engine/put.go @@ -3,13 +3,13 @@ package engine import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/range.go b/pkg/local_object_storage/engine/range.go index 12984b04..d6e6b08f 100644 --- a/pkg/local_object_storage/engine/range.go +++ b/pkg/local_object_storage/engine/range.go @@ -3,12 +3,12 @@ package engine import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/restore.go b/pkg/local_object_storage/engine/restore.go index fd4ec456..84c750cd 100644 --- a/pkg/local_object_storage/engine/restore.go +++ b/pkg/local_object_storage/engine/restore.go @@ -1,6 +1,6 @@ package engine -import "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" // RestoreShard restores objects from dump to the shard with provided identifier. // diff --git a/pkg/local_object_storage/engine/select.go b/pkg/local_object_storage/engine/select.go index 35a80cc1..7b9b8be6 100644 --- a/pkg/local_object_storage/engine/select.go +++ b/pkg/local_object_storage/engine/select.go @@ -1,10 +1,10 @@ package engine import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // SelectPrm groups the parameters of Select operation. diff --git a/pkg/local_object_storage/engine/shards.go b/pkg/local_object_storage/engine/shards.go index 2b8226e7..34210d83 100644 --- a/pkg/local_object_storage/engine/shards.go +++ b/pkg/local_object_storage/engine/shards.go @@ -3,11 +3,11 @@ package engine import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/hrw" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/hrw" "github.com/google/uuid" "github.com/panjf2000/ants/v2" "go.uber.org/atomic" diff --git a/pkg/local_object_storage/engine/tree.go b/pkg/local_object_storage/engine/tree.go index c52e345f..8a580040 100644 --- a/pkg/local_object_storage/engine/tree.go +++ b/pkg/local_object_storage/engine/tree.go @@ -3,9 +3,9 @@ package engine import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/tree_test.go b/pkg/local_object_storage/engine/tree_test.go index 3c85002b..0312e018 100644 --- a/pkg/local_object_storage/engine/tree_test.go +++ b/pkg/local_object_storage/engine/tree_test.go @@ -4,9 +4,9 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) func BenchmarkTreeVsSearch(b *testing.B) { diff --git a/pkg/local_object_storage/engine/writecache.go b/pkg/local_object_storage/engine/writecache.go index a9bb51fd..26600a3e 100644 --- a/pkg/local_object_storage/engine/writecache.go +++ b/pkg/local_object_storage/engine/writecache.go @@ -1,7 +1,7 @@ package engine import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" ) // FlushWriteCachePrm groups the parameters of FlushWriteCache operation. diff --git a/pkg/local_object_storage/internal/log/log.go b/pkg/local_object_storage/internal/log/log.go index b8eff90f..82024ffa 100644 --- a/pkg/local_object_storage/internal/log/log.go +++ b/pkg/local_object_storage/internal/log/log.go @@ -1,7 +1,7 @@ package storagelog import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/internal/storagetest/storage.go b/pkg/local_object_storage/internal/storagetest/storage.go index 658ff71d..9fbf689a 100644 --- a/pkg/local_object_storage/internal/storagetest/storage.go +++ b/pkg/local_object_storage/internal/storagetest/storage.go @@ -3,7 +3,7 @@ package storagetest import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/containers.go b/pkg/local_object_storage/metabase/containers.go index 6fab579b..3d69649a 100644 --- a/pkg/local_object_storage/metabase/containers.go +++ b/pkg/local_object_storage/metabase/containers.go @@ -3,7 +3,7 @@ package meta import ( "encoding/binary" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/containers_test.go b/pkg/local_object_storage/metabase/containers_test.go index 08fcef03..0e2aacab 100644 --- a/pkg/local_object_storage/metabase/containers_test.go +++ b/pkg/local_object_storage/metabase/containers_test.go @@ -5,11 +5,11 @@ import ( "sort" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/control.go b/pkg/local_object_storage/metabase/control.go index 10f42d32..1a19c3e2 100644 --- a/pkg/local_object_storage/metabase/control.go +++ b/pkg/local_object_storage/metabase/control.go @@ -5,9 +5,9 @@ import ( "fmt" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - "github.com/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/metabase/control_test.go b/pkg/local_object_storage/metabase/control_test.go index 634be90f..a98b4510 100644 --- a/pkg/local_object_storage/metabase/control_test.go +++ b/pkg/local_object_storage/metabase/control_test.go @@ -3,10 +3,10 @@ package meta_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/counter.go b/pkg/local_object_storage/metabase/counter.go index d36e994f..a0732802 100644 --- a/pkg/local_object_storage/metabase/counter.go +++ b/pkg/local_object_storage/metabase/counter.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "fmt" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/counter_test.go b/pkg/local_object_storage/metabase/counter_test.go index ca92460b..9729deb2 100644 --- a/pkg/local_object_storage/metabase/counter_test.go +++ b/pkg/local_object_storage/metabase/counter_test.go @@ -3,11 +3,11 @@ package meta_test import ( "testing" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/db.go b/pkg/local_object_storage/metabase/db.go index d5036553..5a9ca3aa 100644 --- a/pkg/local_object_storage/metabase/db.go +++ b/pkg/local_object_storage/metabase/db.go @@ -11,10 +11,10 @@ import ( "sync" "time" - v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/mr-tron/base58" "go.etcd.io/bbolt" "go.uber.org/zap" diff --git a/pkg/local_object_storage/metabase/db_test.go b/pkg/local_object_storage/metabase/db_test.go index fd97150c..3e70a30b 100644 --- a/pkg/local_object_storage/metabase/db_test.go +++ b/pkg/local_object_storage/metabase/db_test.go @@ -5,19 +5,19 @@ import ( "strconv" "testing" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-sdk-go/checksum" - checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" - "github.com/TrueCloudLab/frostfs-sdk-go/version" - "github.com/TrueCloudLab/tzhash/tz" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + checksumtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum/test" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/tzhash/tz" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/delete.go b/pkg/local_object_storage/metabase/delete.go index 511300b1..79f87037 100644 --- a/pkg/local_object_storage/metabase/delete.go +++ b/pkg/local_object_storage/metabase/delete.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/delete_test.go b/pkg/local_object_storage/metabase/delete_test.go index ab46c3ee..3cd314dc 100644 --- a/pkg/local_object_storage/metabase/delete_test.go +++ b/pkg/local_object_storage/metabase/delete_test.go @@ -4,13 +4,13 @@ import ( "errors" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/errors.go b/pkg/local_object_storage/metabase/errors.go index 9772971f..bc16dc01 100644 --- a/pkg/local_object_storage/metabase/errors.go +++ b/pkg/local_object_storage/metabase/errors.go @@ -3,8 +3,8 @@ package meta import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) // ErrObjectIsExpired is returned when the requested object's diff --git a/pkg/local_object_storage/metabase/exists.go b/pkg/local_object_storage/metabase/exists.go index d9b1ed52..59bd9f4f 100644 --- a/pkg/local_object_storage/metabase/exists.go +++ b/pkg/local_object_storage/metabase/exists.go @@ -4,12 +4,12 @@ import ( "fmt" "strconv" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/exists_test.go b/pkg/local_object_storage/metabase/exists_test.go index 122ac53a..ddc1f47b 100644 --- a/pkg/local_object_storage/metabase/exists_test.go +++ b/pkg/local_object_storage/metabase/exists_test.go @@ -4,12 +4,12 @@ import ( "errors" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/generic_test.go b/pkg/local_object_storage/metabase/generic_test.go index 54da0bf6..227aa9f8 100644 --- a/pkg/local_object_storage/metabase/generic_test.go +++ b/pkg/local_object_storage/metabase/generic_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" ) func TestGeneric(t *testing.T) { diff --git a/pkg/local_object_storage/metabase/get.go b/pkg/local_object_storage/metabase/get.go index d3a3ad46..c0feda06 100644 --- a/pkg/local_object_storage/metabase/get.go +++ b/pkg/local_object_storage/metabase/get.go @@ -3,11 +3,11 @@ package meta import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/get_test.go b/pkg/local_object_storage/metabase/get_test.go index 3f7c6fab..0cfef27f 100644 --- a/pkg/local_object_storage/metabase/get_test.go +++ b/pkg/local_object_storage/metabase/get_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/graveyard.go b/pkg/local_object_storage/metabase/graveyard.go index bcd67bc7..393c9f4d 100644 --- a/pkg/local_object_storage/metabase/graveyard.go +++ b/pkg/local_object_storage/metabase/graveyard.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/graveyard_test.go b/pkg/local_object_storage/metabase/graveyard_test.go index a7b6629a..e18ef911 100644 --- a/pkg/local_object_storage/metabase/graveyard_test.go +++ b/pkg/local_object_storage/metabase/graveyard_test.go @@ -3,10 +3,10 @@ package meta_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/inhume.go b/pkg/local_object_storage/metabase/inhume.go index 2d2107b6..ce772576 100644 --- a/pkg/local_object_storage/metabase/inhume.go +++ b/pkg/local_object_storage/metabase/inhume.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/inhume_test.go b/pkg/local_object_storage/metabase/inhume_test.go index 2d69ffde..09b101ad 100644 --- a/pkg/local_object_storage/metabase/inhume_test.go +++ b/pkg/local_object_storage/metabase/inhume_test.go @@ -3,11 +3,11 @@ package meta_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/iterators.go b/pkg/local_object_storage/metabase/iterators.go index 5a9e9dc2..9741225d 100644 --- a/pkg/local_object_storage/metabase/iterators.go +++ b/pkg/local_object_storage/metabase/iterators.go @@ -5,11 +5,11 @@ import ( "fmt" "strconv" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/iterators_test.go b/pkg/local_object_storage/metabase/iterators_test.go index a8b07323..3c3d0ea5 100644 --- a/pkg/local_object_storage/metabase/iterators_test.go +++ b/pkg/local_object_storage/metabase/iterators_test.go @@ -4,12 +4,12 @@ import ( "strconv" "testing" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - object2 "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + object2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/list.go b/pkg/local_object_storage/metabase/list.go index 5220e48f..93b7efb9 100644 --- a/pkg/local_object_storage/metabase/list.go +++ b/pkg/local_object_storage/metabase/list.go @@ -1,11 +1,11 @@ package meta import ( - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/list_test.go b/pkg/local_object_storage/metabase/list_test.go index a873216f..d18f101a 100644 --- a/pkg/local_object_storage/metabase/list_test.go +++ b/pkg/local_object_storage/metabase/list_test.go @@ -5,11 +5,11 @@ import ( "sort" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/lock.go b/pkg/local_object_storage/metabase/lock.go index 68ce0a89..0ecd8cfe 100644 --- a/pkg/local_object_storage/metabase/lock.go +++ b/pkg/local_object_storage/metabase/lock.go @@ -4,11 +4,11 @@ import ( "bytes" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/lock_test.go b/pkg/local_object_storage/metabase/lock_test.go index d7c6a153..9cfa9c5b 100644 --- a/pkg/local_object_storage/metabase/lock_test.go +++ b/pkg/local_object_storage/metabase/lock_test.go @@ -3,14 +3,14 @@ package meta_test import ( "testing" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/test" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + objecttest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/mode.go b/pkg/local_object_storage/metabase/mode.go index 1bd59a04..dd1cdc90 100644 --- a/pkg/local_object_storage/metabase/mode.go +++ b/pkg/local_object_storage/metabase/mode.go @@ -3,7 +3,7 @@ package meta import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" ) // SetMode sets the metabase mode of operation. diff --git a/pkg/local_object_storage/metabase/movable.go b/pkg/local_object_storage/metabase/movable.go index bdc1b593..e6990dc5 100644 --- a/pkg/local_object_storage/metabase/movable.go +++ b/pkg/local_object_storage/metabase/movable.go @@ -3,7 +3,7 @@ package meta import ( "fmt" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/movable_test.go b/pkg/local_object_storage/metabase/movable_test.go index 67b6cd56..7564f81b 100644 --- a/pkg/local_object_storage/metabase/movable_test.go +++ b/pkg/local_object_storage/metabase/movable_test.go @@ -3,9 +3,9 @@ package meta_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/put.go b/pkg/local_object_storage/metabase/put.go index c534c926..06b1d3ac 100644 --- a/pkg/local_object_storage/metabase/put.go +++ b/pkg/local_object_storage/metabase/put.go @@ -6,12 +6,12 @@ import ( "fmt" gio "io" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/io" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/put_test.go b/pkg/local_object_storage/metabase/put_test.go index 1593c4c0..89b0a53b 100644 --- a/pkg/local_object_storage/metabase/put_test.go +++ b/pkg/local_object_storage/metabase/put_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + objecttest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/atomic" ) diff --git a/pkg/local_object_storage/metabase/select.go b/pkg/local_object_storage/metabase/select.go index 5ca73149..20985f47 100644 --- a/pkg/local_object_storage/metabase/select.go +++ b/pkg/local_object_storage/metabase/select.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/metabase/select_test.go b/pkg/local_object_storage/metabase/select_test.go index 848b701f..685432bb 100644 --- a/pkg/local_object_storage/metabase/select_test.go +++ b/pkg/local_object_storage/metabase/select_test.go @@ -5,15 +5,15 @@ import ( "strconv" "testing" - v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/version" + v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/storage_id.go b/pkg/local_object_storage/metabase/storage_id.go index 4cda0b25..ae309d4b 100644 --- a/pkg/local_object_storage/metabase/storage_id.go +++ b/pkg/local_object_storage/metabase/storage_id.go @@ -3,7 +3,7 @@ package meta import ( "errors" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/util/slice" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/storage_id_test.go b/pkg/local_object_storage/metabase/storage_id_test.go index e72611a6..8ab61a13 100644 --- a/pkg/local_object_storage/metabase/storage_id_test.go +++ b/pkg/local_object_storage/metabase/storage_id_test.go @@ -3,9 +3,9 @@ package meta_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/util.go b/pkg/local_object_storage/metabase/util.go index 701d4f69..b60c97fd 100644 --- a/pkg/local_object_storage/metabase/util.go +++ b/pkg/local_object_storage/metabase/util.go @@ -5,9 +5,9 @@ import ( "crypto/sha256" "fmt" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) @@ -53,9 +53,9 @@ const ( // shardInfoPrefix is used for storing shard ID. All keys are custom and are not connected to the container. shardInfoPrefix - //====================== + // ====================== // Unique index buckets. - //====================== + // ====================== // primaryPrefix is used for prefixing buckets containing objects of REGULAR type. // Key: object ID @@ -82,9 +82,9 @@ const ( // Value: split info rootPrefix - //==================== + // ==================== // FKBT index buckets. - //==================== + // ==================== // ownerPrefix is used for prefixing FKBT index buckets mapping owner to object IDs. // Key: owner ID @@ -95,9 +95,9 @@ const ( // Value: bucket containing object IDs as keys userAttributePrefix - //==================== + // ==================== // List index buckets. - //==================== + // ==================== // payloadHashPrefix is used for prefixing List index buckets mapping payload hash to a list of object IDs. // Key: payload hash diff --git a/pkg/local_object_storage/metabase/version.go b/pkg/local_object_storage/metabase/version.go index c8cfc08f..5748b64e 100644 --- a/pkg/local_object_storage/metabase/version.go +++ b/pkg/local_object_storage/metabase/version.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/pilorama/batch.go b/pkg/local_object_storage/pilorama/batch.go index 43375ba1..3065c837 100644 --- a/pkg/local_object_storage/pilorama/batch.go +++ b/pkg/local_object_storage/pilorama/batch.go @@ -5,7 +5,7 @@ import ( "sync" "time" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/pilorama/boltdb.go b/pkg/local_object_storage/pilorama/boltdb.go index 247d07d2..85f7a43d 100644 --- a/pkg/local_object_storage/pilorama/boltdb.go +++ b/pkg/local_object_storage/pilorama/boltdb.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/io" "go.etcd.io/bbolt" ) @@ -845,19 +845,19 @@ func (t *boltForest) logFromBytes(lm *Move, data []byte) error { func (t *boltForest) logToBytes(lm *Move) []byte { w := io.NewBufBinWriter() size := 8 + 8 + lm.Meta.Size() + 1 - //if lm.HasOld { + // if lm.HasOld { // size += 8 + lm.Old.Meta.Size() - //} + // } w.Grow(size) w.WriteU64LE(lm.Child) w.WriteU64LE(lm.Parent) lm.Meta.EncodeBinary(w.BinWriter) - //w.WriteBool(lm.HasOld) - //if lm.HasOld { + // w.WriteBool(lm.HasOld) + // if lm.HasOld { // w.WriteU64LE(lm.Old.Parent) // lm.Old.Meta.EncodeBinary(w.BinWriter) - //} + // } return w.Bytes() } diff --git a/pkg/local_object_storage/pilorama/forest.go b/pkg/local_object_storage/pilorama/forest.go index 5b1896e2..96206364 100644 --- a/pkg/local_object_storage/pilorama/forest.go +++ b/pkg/local_object_storage/pilorama/forest.go @@ -4,8 +4,8 @@ import ( "sort" "strings" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) // memoryForest represents multiple replicating trees sharing a single storage. diff --git a/pkg/local_object_storage/pilorama/forest_test.go b/pkg/local_object_storage/pilorama/forest_test.go index cbd7f514..93c468d1 100644 --- a/pkg/local_object_storage/pilorama/forest_test.go +++ b/pkg/local_object_storage/pilorama/forest_test.go @@ -9,9 +9,9 @@ import ( "sync" "testing" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/pilorama/generic_test.go b/pkg/local_object_storage/pilorama/generic_test.go index 204efbb9..cac03c4e 100644 --- a/pkg/local_object_storage/pilorama/generic_test.go +++ b/pkg/local_object_storage/pilorama/generic_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" ) func TestGeneric(t *testing.T) { diff --git a/pkg/local_object_storage/pilorama/interface.go b/pkg/local_object_storage/pilorama/interface.go index 238843dd..7977986e 100644 --- a/pkg/local_object_storage/pilorama/interface.go +++ b/pkg/local_object_storage/pilorama/interface.go @@ -1,9 +1,9 @@ package pilorama import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) // Forest represents CRDT tree. diff --git a/pkg/local_object_storage/pilorama/types.go b/pkg/local_object_storage/pilorama/types.go index 88369db4..99918683 100644 --- a/pkg/local_object_storage/pilorama/types.go +++ b/pkg/local_object_storage/pilorama/types.go @@ -3,7 +3,7 @@ package pilorama import ( "math" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" ) // Timestamp is an alias for integer timestamp type. diff --git a/pkg/local_object_storage/shard/container.go b/pkg/local_object_storage/shard/container.go index 182525d5..24090e8d 100644 --- a/pkg/local_object_storage/shard/container.go +++ b/pkg/local_object_storage/shard/container.go @@ -3,7 +3,7 @@ package shard import ( "fmt" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) type ContainerSizePrm struct { diff --git a/pkg/local_object_storage/shard/control.go b/pkg/local_object_storage/shard/control.go index 2f698c69..6d17114b 100644 --- a/pkg/local_object_storage/shard/control.go +++ b/pkg/local_object_storage/shard/control.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) @@ -172,7 +172,7 @@ func (s *Shard) refillMetabase() error { return nil } - //nolint: exhaustive + // nolint: exhaustive switch obj.Type() { case objectSDK.TypeTombstone: tombstone := objectSDK.NewTombstone() diff --git a/pkg/local_object_storage/shard/control_test.go b/pkg/local_object_storage/shard/control_test.go index ad0de6d6..1c258cb8 100644 --- a/pkg/local_object_storage/shard/control_test.go +++ b/pkg/local_object_storage/shard/control_test.go @@ -5,22 +5,22 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + objecttest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/test" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/shard/delete.go b/pkg/local_object_storage/shard/delete.go index 0c2cfa26..6ae3bf7d 100644 --- a/pkg/local_object_storage/shard/delete.go +++ b/pkg/local_object_storage/shard/delete.go @@ -3,10 +3,10 @@ package shard import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/delete_test.go b/pkg/local_object_storage/shard/delete_test.go index 468e80ad..b1574ab8 100644 --- a/pkg/local_object_storage/shard/delete_test.go +++ b/pkg/local_object_storage/shard/delete_test.go @@ -3,10 +3,10 @@ package shard_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/dump.go b/pkg/local_object_storage/shard/dump.go index 1607af46..8d9fe0f7 100644 --- a/pkg/local_object_storage/shard/dump.go +++ b/pkg/local_object_storage/shard/dump.go @@ -5,9 +5,9 @@ import ( "io" "os" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" ) var dumpMagic = []byte("NEOF") diff --git a/pkg/local_object_storage/shard/dump_test.go b/pkg/local_object_storage/shard/dump_test.go index 2e5b233b..96802d4a 100644 --- a/pkg/local_object_storage/shard/dump_test.go +++ b/pkg/local_object_storage/shard/dump_test.go @@ -9,19 +9,19 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + objecttest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/klauspost/compress/zstd" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/pkg/local_object_storage/shard/errors.go b/pkg/local_object_storage/shard/errors.go index d188bd30..3e5224eb 100644 --- a/pkg/local_object_storage/shard/errors.go +++ b/pkg/local_object_storage/shard/errors.go @@ -3,8 +3,8 @@ package shard import ( "errors" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) // IsErrNotFound checks if error returned by Shard Get/Head/GetRange method diff --git a/pkg/local_object_storage/shard/exists.go b/pkg/local_object_storage/shard/exists.go index 5bb930b6..35b9cba9 100644 --- a/pkg/local_object_storage/shard/exists.go +++ b/pkg/local_object_storage/shard/exists.go @@ -1,9 +1,9 @@ package shard import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // ExistsPrm groups the parameters of Exists operation. diff --git a/pkg/local_object_storage/shard/gc.go b/pkg/local_object_storage/shard/gc.go index 11a190e7..a8910561 100644 --- a/pkg/local_object_storage/shard/gc.go +++ b/pkg/local_object_storage/shard/gc.go @@ -5,12 +5,12 @@ import ( "sync" "time" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/get.go b/pkg/local_object_storage/shard/get.go index 93468465..4231c01d 100644 --- a/pkg/local_object_storage/shard/get.go +++ b/pkg/local_object_storage/shard/get.go @@ -3,14 +3,14 @@ package shard import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/get_test.go b/pkg/local_object_storage/shard/get_test.go index 64aa2915..5e1914a0 100644 --- a/pkg/local_object_storage/shard/get_test.go +++ b/pkg/local_object_storage/shard/get_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/head.go b/pkg/local_object_storage/shard/head.go index 0e51da73..6913d316 100644 --- a/pkg/local_object_storage/shard/head.go +++ b/pkg/local_object_storage/shard/head.go @@ -1,9 +1,9 @@ package shard import ( - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // HeadPrm groups the parameters of Head operation. diff --git a/pkg/local_object_storage/shard/head_test.go b/pkg/local_object_storage/shard/head_test.go index 079f96a7..a0862bd0 100644 --- a/pkg/local_object_storage/shard/head_test.go +++ b/pkg/local_object_storage/shard/head_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/id.go b/pkg/local_object_storage/shard/id.go index 6e6242c4..992a86c0 100644 --- a/pkg/local_object_storage/shard/id.go +++ b/pkg/local_object_storage/shard/id.go @@ -1,7 +1,7 @@ package shard import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/mr-tron/base58" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/info.go b/pkg/local_object_storage/shard/info.go index 98e2b3ea..a5b9c1a7 100644 --- a/pkg/local_object_storage/shard/info.go +++ b/pkg/local_object_storage/shard/info.go @@ -1,11 +1,11 @@ package shard import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" ) // Info groups the information about Shard. diff --git a/pkg/local_object_storage/shard/inhume.go b/pkg/local_object_storage/shard/inhume.go index bdb2c1ec..199bb8b3 100644 --- a/pkg/local_object_storage/shard/inhume.go +++ b/pkg/local_object_storage/shard/inhume.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/inhume_test.go b/pkg/local_object_storage/shard/inhume_test.go index 119d5b2b..8f673c7a 100644 --- a/pkg/local_object_storage/shard/inhume_test.go +++ b/pkg/local_object_storage/shard/inhume_test.go @@ -3,10 +3,10 @@ package shard_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/list.go b/pkg/local_object_storage/shard/list.go index 724a190a..9efca898 100644 --- a/pkg/local_object_storage/shard/list.go +++ b/pkg/local_object_storage/shard/list.go @@ -3,10 +3,10 @@ package shard import ( "fmt" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/list_test.go b/pkg/local_object_storage/shard/list_test.go index 84d8e3da..fd669ee9 100644 --- a/pkg/local_object_storage/shard/list_test.go +++ b/pkg/local_object_storage/shard/list_test.go @@ -3,9 +3,9 @@ package shard_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/lock.go b/pkg/local_object_storage/shard/lock.go index dd1d0565..d8113cf3 100644 --- a/pkg/local_object_storage/shard/lock.go +++ b/pkg/local_object_storage/shard/lock.go @@ -3,9 +3,9 @@ package shard import ( "fmt" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // Lock marks objects as locked with another object. All objects from the diff --git a/pkg/local_object_storage/shard/lock_test.go b/pkg/local_object_storage/shard/lock_test.go index 278b60a7..a16b7f54 100644 --- a/pkg/local_object_storage/shard/lock_test.go +++ b/pkg/local_object_storage/shard/lock_test.go @@ -5,18 +5,18 @@ import ( "path/filepath" "testing" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/metrics_test.go b/pkg/local_object_storage/shard/metrics_test.go index ad76fb80..13d839ee 100644 --- a/pkg/local_object_storage/shard/metrics_test.go +++ b/pkg/local_object_storage/shard/metrics_test.go @@ -4,15 +4,15 @@ import ( "path/filepath" "testing" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/mode.go b/pkg/local_object_storage/shard/mode.go index 0ca2609f..17ed3f3c 100644 --- a/pkg/local_object_storage/shard/mode.go +++ b/pkg/local_object_storage/shard/mode.go @@ -1,8 +1,8 @@ package shard import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/move.go b/pkg/local_object_storage/shard/move.go index fbe4051d..c6bf8409 100644 --- a/pkg/local_object_storage/shard/move.go +++ b/pkg/local_object_storage/shard/move.go @@ -1,8 +1,8 @@ package shard import ( - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/put.go b/pkg/local_object_storage/shard/put.go index 311759da..48dbe1be 100644 --- a/pkg/local_object_storage/shard/put.go +++ b/pkg/local_object_storage/shard/put.go @@ -3,10 +3,10 @@ package shard import ( "fmt" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/range.go b/pkg/local_object_storage/shard/range.go index 0ff10f6e..c9106c23 100644 --- a/pkg/local_object_storage/shard/range.go +++ b/pkg/local_object_storage/shard/range.go @@ -1,13 +1,13 @@ package shard import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // RngPrm groups the parameters of GetRange operation. diff --git a/pkg/local_object_storage/shard/range_test.go b/pkg/local_object_storage/shard/range_test.go index 21f233ab..328a217d 100644 --- a/pkg/local_object_storage/shard/range_test.go +++ b/pkg/local_object_storage/shard/range_test.go @@ -5,15 +5,15 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/nspcc-dev/neo-go/pkg/util/slice" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/pkg/local_object_storage/shard/reload_test.go b/pkg/local_object_storage/shard/reload_test.go index f0816ce8..fbe4d612 100644 --- a/pkg/local_object_storage/shard/reload_test.go +++ b/pkg/local_object_storage/shard/reload_test.go @@ -5,19 +5,19 @@ import ( "path/filepath" "testing" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - sessiontest "github.com/TrueCloudLab/frostfs-sdk-go/session/test" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" - "github.com/TrueCloudLab/frostfs-sdk-go/version" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + checksumtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum/test" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + sessiontest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session/test" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/shard/restore.go b/pkg/local_object_storage/shard/restore.go index 0faeb551..73dc1d17 100644 --- a/pkg/local_object_storage/shard/restore.go +++ b/pkg/local_object_storage/shard/restore.go @@ -7,8 +7,8 @@ import ( "io" "os" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) // ErrInvalidMagic is returned when dump format is invalid. diff --git a/pkg/local_object_storage/shard/select.go b/pkg/local_object_storage/shard/select.go index b0362660..4bb467d4 100644 --- a/pkg/local_object_storage/shard/select.go +++ b/pkg/local_object_storage/shard/select.go @@ -3,10 +3,10 @@ package shard import ( "fmt" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // SelectPrm groups the parameters of Select operation. diff --git a/pkg/local_object_storage/shard/shard.go b/pkg/local_object_storage/shard/shard.go index b1116d8f..a0fd077c 100644 --- a/pkg/local_object_storage/shard/shard.go +++ b/pkg/local_object_storage/shard/shard.go @@ -5,14 +5,14 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/shard_test.go b/pkg/local_object_storage/shard/shard_test.go index 2159bdb5..a6da5391 100644 --- a/pkg/local_object_storage/shard/shard_test.go +++ b/pkg/local_object_storage/shard/shard_test.go @@ -6,22 +6,22 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/checksum" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" - "github.com/TrueCloudLab/frostfs-sdk-go/version" - "github.com/TrueCloudLab/tzhash/tz" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/tzhash/tz" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zaptest" diff --git a/pkg/local_object_storage/shard/shutdown_test.go b/pkg/local_object_storage/shard/shutdown_test.go index 7618a093..f7f7b2ca 100644 --- a/pkg/local_object_storage/shard/shutdown_test.go +++ b/pkg/local_object_storage/shard/shutdown_test.go @@ -4,11 +4,11 @@ import ( "math/rand" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/tree.go b/pkg/local_object_storage/shard/tree.go index 12498847..6e953712 100644 --- a/pkg/local_object_storage/shard/tree.go +++ b/pkg/local_object_storage/shard/tree.go @@ -1,9 +1,9 @@ package shard import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) var _ pilorama.Forest = (*Shard)(nil) diff --git a/pkg/local_object_storage/util/splitinfo.go b/pkg/local_object_storage/util/splitinfo.go index f2a4a24f..4a6d2226 100644 --- a/pkg/local_object_storage/util/splitinfo.go +++ b/pkg/local_object_storage/util/splitinfo.go @@ -1,7 +1,7 @@ package util import ( - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) // MergeSplitInfo ignores conflicts and rewrites `to` with non empty values diff --git a/pkg/local_object_storage/util/splitinfo_test.go b/pkg/local_object_storage/util/splitinfo_test.go index 3b7cf902..a0626db2 100644 --- a/pkg/local_object_storage/util/splitinfo_test.go +++ b/pkg/local_object_storage/util/splitinfo_test.go @@ -4,9 +4,9 @@ import ( "math/rand" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/google/uuid" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/writecache/delete.go b/pkg/local_object_storage/writecache/delete.go index e580317f..dcfea8dd 100644 --- a/pkg/local_object_storage/writecache/delete.go +++ b/pkg/local_object_storage/writecache/delete.go @@ -1,9 +1,9 @@ package writecache import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/writecache/flush.go b/pkg/local_object_storage/writecache/flush.go index f4fce0d0..ececf331 100644 --- a/pkg/local_object_storage/writecache/flush.go +++ b/pkg/local_object_storage/writecache/flush.go @@ -5,12 +5,12 @@ import ( "errors" "time" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/mr-tron/base58" "github.com/nspcc-dev/neo-go/pkg/util/slice" "go.etcd.io/bbolt" diff --git a/pkg/local_object_storage/writecache/flush_test.go b/pkg/local_object_storage/writecache/flush_test.go index 6049b79a..6d0f9910 100644 --- a/pkg/local_object_storage/writecache/flush_test.go +++ b/pkg/local_object_storage/writecache/flush_test.go @@ -5,21 +5,21 @@ import ( "path/filepath" "testing" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" - versionSDK "github.com/TrueCloudLab/frostfs-sdk-go/version" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + checksumtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum/test" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" + versionSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" "go.uber.org/atomic" diff --git a/pkg/local_object_storage/writecache/generic_test.go b/pkg/local_object_storage/writecache/generic_test.go index 82d602ac..53d6624b 100644 --- a/pkg/local_object_storage/writecache/generic_test.go +++ b/pkg/local_object_storage/writecache/generic_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/writecache/get.go b/pkg/local_object_storage/writecache/get.go index ff71dedb..a15f42e1 100644 --- a/pkg/local_object_storage/writecache/get.go +++ b/pkg/local_object_storage/writecache/get.go @@ -1,11 +1,11 @@ package writecache import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/util/slice" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/writecache/init.go b/pkg/local_object_storage/writecache/init.go index 2c8bcf9c..382b9002 100644 --- a/pkg/local_object_storage/writecache/init.go +++ b/pkg/local_object_storage/writecache/init.go @@ -3,11 +3,11 @@ package writecache import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/writecache/iterate.go b/pkg/local_object_storage/writecache/iterate.go index ae3efffd..228dd259 100644 --- a/pkg/local_object_storage/writecache/iterate.go +++ b/pkg/local_object_storage/writecache/iterate.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/writecache/mode.go b/pkg/local_object_storage/writecache/mode.go index b790cc56..f04b0bc4 100644 --- a/pkg/local_object_storage/writecache/mode.go +++ b/pkg/local_object_storage/writecache/mode.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" ) // ErrReadOnly is returned when Put/Write is performed in a read-only mode. diff --git a/pkg/local_object_storage/writecache/options.go b/pkg/local_object_storage/writecache/options.go index 6db4ae0f..63850852 100644 --- a/pkg/local_object_storage/writecache/options.go +++ b/pkg/local_object_storage/writecache/options.go @@ -3,11 +3,11 @@ package writecache import ( "time" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/writecache/put.go b/pkg/local_object_storage/writecache/put.go index 9396f3a6..b5fc0e71 100644 --- a/pkg/local_object_storage/writecache/put.go +++ b/pkg/local_object_storage/writecache/put.go @@ -3,8 +3,8 @@ package writecache import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/writecache/storage.go b/pkg/local_object_storage/writecache/storage.go index da533880..51f58b1f 100644 --- a/pkg/local_object_storage/writecache/storage.go +++ b/pkg/local_object_storage/writecache/storage.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" lru "github.com/hashicorp/golang-lru/v2" "github.com/hashicorp/golang-lru/v2/simplelru" "go.etcd.io/bbolt" diff --git a/pkg/local_object_storage/writecache/writecache.go b/pkg/local_object_storage/writecache/writecache.go index fa52c08a..c3f95c55 100644 --- a/pkg/local_object_storage/writecache/writecache.go +++ b/pkg/local_object_storage/writecache/writecache.go @@ -3,12 +3,12 @@ package writecache import ( "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/morph/client/audit/client.go b/pkg/morph/client/audit/client.go index bd673f17..b922fc79 100644 --- a/pkg/morph/client/audit/client.go +++ b/pkg/morph/client/audit/client.go @@ -3,7 +3,7 @@ package audit import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/audit/get_result.go b/pkg/morph/client/audit/get_result.go index 533f7f6f..9e1b75db 100644 --- a/pkg/morph/client/audit/get_result.go +++ b/pkg/morph/client/audit/get_result.go @@ -3,8 +3,8 @@ package audit import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - auditAPI "github.com/TrueCloudLab/frostfs-sdk-go/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + auditAPI "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/audit" ) // GetAuditResult returns audit result structure stored in audit contract. diff --git a/pkg/morph/client/audit/list_results.go b/pkg/morph/client/audit/list_results.go index 12a3989b..ace01d15 100644 --- a/pkg/morph/client/audit/list_results.go +++ b/pkg/morph/client/audit/list_results.go @@ -4,8 +4,8 @@ import ( "crypto/sha256" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" ) diff --git a/pkg/morph/client/audit/put_result.go b/pkg/morph/client/audit/put_result.go index e75422d1..f8e233b2 100644 --- a/pkg/morph/client/audit/put_result.go +++ b/pkg/morph/client/audit/put_result.go @@ -3,8 +3,8 @@ package audit import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - auditAPI "github.com/TrueCloudLab/frostfs-sdk-go/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + auditAPI "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/audit" ) // ResultID is an identity of audit result inside audit contract. diff --git a/pkg/morph/client/audit/result_test.go b/pkg/morph/client/audit/result_test.go index e6bcdb0a..a0137e3b 100644 --- a/pkg/morph/client/audit/result_test.go +++ b/pkg/morph/client/audit/result_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - auditAPI "github.com/TrueCloudLab/frostfs-sdk-go/audit" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + auditAPI "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/audit" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" diff --git a/pkg/morph/client/balance/balanceOf.go b/pkg/morph/client/balance/balanceOf.go index a81211ab..aae245ac 100644 --- a/pkg/morph/client/balance/balanceOf.go +++ b/pkg/morph/client/balance/balanceOf.go @@ -4,8 +4,8 @@ import ( "fmt" "math/big" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/encoding/address" ) diff --git a/pkg/morph/client/balance/burn.go b/pkg/morph/client/balance/burn.go index d1544301..88a1aa8f 100644 --- a/pkg/morph/client/balance/burn.go +++ b/pkg/morph/client/balance/burn.go @@ -1,7 +1,7 @@ package balance import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/balance/client.go b/pkg/morph/client/balance/client.go index b56684d4..b05c526d 100644 --- a/pkg/morph/client/balance/client.go +++ b/pkg/morph/client/balance/client.go @@ -3,7 +3,7 @@ package balance import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/balance/decimals.go b/pkg/morph/client/balance/decimals.go index 88daa95e..39e4b28e 100644 --- a/pkg/morph/client/balance/decimals.go +++ b/pkg/morph/client/balance/decimals.go @@ -3,7 +3,7 @@ package balance import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // Decimals decimal precision of currency transactions diff --git a/pkg/morph/client/balance/lock.go b/pkg/morph/client/balance/lock.go index f14a2336..7b270808 100644 --- a/pkg/morph/client/balance/lock.go +++ b/pkg/morph/client/balance/lock.go @@ -1,7 +1,7 @@ package balance import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/balance/mint.go b/pkg/morph/client/balance/mint.go index e0d99bdb..cda78c07 100644 --- a/pkg/morph/client/balance/mint.go +++ b/pkg/morph/client/balance/mint.go @@ -1,7 +1,7 @@ package balance import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/balance/transfer.go b/pkg/morph/client/balance/transfer.go index 0b514f33..5206f69f 100644 --- a/pkg/morph/client/balance/transfer.go +++ b/pkg/morph/client/balance/transfer.go @@ -3,8 +3,8 @@ package balance import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/encoding/address" ) diff --git a/pkg/morph/client/client.go b/pkg/morph/client/client.go index fb43c4b2..4aae6dbf 100644 --- a/pkg/morph/client/client.go +++ b/pkg/morph/client/client.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" lru "github.com/hashicorp/golang-lru/v2" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/transaction" diff --git a/pkg/morph/client/constructor.go b/pkg/morph/client/constructor.go index 5adc1c2f..01fd30f7 100644 --- a/pkg/morph/client/constructor.go +++ b/pkg/morph/client/constructor.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" lru "github.com/hashicorp/golang-lru/v2" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" diff --git a/pkg/morph/client/container/client.go b/pkg/morph/client/container/client.go index 46c33fc2..f93fd668 100644 --- a/pkg/morph/client/container/client.go +++ b/pkg/morph/client/container/client.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/container/delete.go b/pkg/morph/client/container/delete.go index d2a8fed8..c9105a3c 100644 --- a/pkg/morph/client/container/delete.go +++ b/pkg/morph/client/container/delete.go @@ -4,8 +4,8 @@ import ( "crypto/sha256" "fmt" - core "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + core "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // Delete marshals container ID, and passes it to Wrapper's Delete method diff --git a/pkg/morph/client/container/eacl.go b/pkg/morph/client/container/eacl.go index f418d634..56c36c17 100644 --- a/pkg/morph/client/container/eacl.go +++ b/pkg/morph/client/container/eacl.go @@ -4,13 +4,13 @@ import ( "crypto/sha256" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) // GetEACL reads the extended ACL table from FrostFS system diff --git a/pkg/morph/client/container/eacl_set.go b/pkg/morph/client/container/eacl_set.go index d62fb018..86eae4c2 100644 --- a/pkg/morph/client/container/eacl_set.go +++ b/pkg/morph/client/container/eacl_set.go @@ -3,9 +3,9 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // PutEACL marshals table, and passes it to Wrapper's PutEACLBinary method diff --git a/pkg/morph/client/container/estimations.go b/pkg/morph/client/container/estimations.go index 6895a665..6adf6747 100644 --- a/pkg/morph/client/container/estimations.go +++ b/pkg/morph/client/container/estimations.go @@ -3,7 +3,7 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // StartEstimationPrm groups parameters of StartEstimation operation. diff --git a/pkg/morph/client/container/get.go b/pkg/morph/client/container/get.go index a5c6ac24..8d68141a 100644 --- a/pkg/morph/client/container/get.go +++ b/pkg/morph/client/container/get.go @@ -5,14 +5,14 @@ import ( "fmt" "strings" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - containerContract "github.com/TrueCloudLab/frostfs-contract/container" - containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - core "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + containerContract "git.frostfs.info/TrueCloudLab/frostfs-contract/container" + containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + core "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) type containerSource Client diff --git a/pkg/morph/client/container/list.go b/pkg/morph/client/container/list.go index d79e2a58..8f165f4b 100644 --- a/pkg/morph/client/container/list.go +++ b/pkg/morph/client/container/list.go @@ -3,9 +3,9 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) // List returns a list of container identifiers belonging diff --git a/pkg/morph/client/container/load.go b/pkg/morph/client/container/load.go index b9876d1b..dcf89f73 100644 --- a/pkg/morph/client/container/load.go +++ b/pkg/morph/client/container/load.go @@ -4,10 +4,10 @@ import ( "crypto/sha256" "fmt" - v2refs "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + v2refs "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) // AnnounceLoadPrm groups parameters of AnnounceLoad operation. diff --git a/pkg/morph/client/container/put.go b/pkg/morph/client/container/put.go index f4f48832..2c97446c 100644 --- a/pkg/morph/client/container/put.go +++ b/pkg/morph/client/container/put.go @@ -3,11 +3,11 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) // Put marshals container, and passes it to Wrapper's Put method diff --git a/pkg/morph/client/frostfs/bind.go b/pkg/morph/client/frostfs/bind.go index 937b1406..5b15d5c7 100644 --- a/pkg/morph/client/frostfs/bind.go +++ b/pkg/morph/client/frostfs/bind.go @@ -3,7 +3,7 @@ package frostfscontract import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) type commonBindArgs struct { diff --git a/pkg/morph/client/frostfs/cheque.go b/pkg/morph/client/frostfs/cheque.go index 072b306d..e8f4f7f1 100644 --- a/pkg/morph/client/frostfs/cheque.go +++ b/pkg/morph/client/frostfs/cheque.go @@ -1,7 +1,7 @@ package frostfscontract import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/frostfs/client.go b/pkg/morph/client/frostfs/client.go index b7f9315a..3e3e70ec 100644 --- a/pkg/morph/client/frostfs/client.go +++ b/pkg/morph/client/frostfs/client.go @@ -3,7 +3,7 @@ package frostfscontract import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/frostfsid/addrm_keys.go b/pkg/morph/client/frostfsid/addrm_keys.go index 7680e65c..cbbd0514 100644 --- a/pkg/morph/client/frostfsid/addrm_keys.go +++ b/pkg/morph/client/frostfsid/addrm_keys.go @@ -3,7 +3,7 @@ package frostfsid import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) type CommonBindPrm struct { diff --git a/pkg/morph/client/frostfsid/client.go b/pkg/morph/client/frostfsid/client.go index c8f56af6..dded61af 100644 --- a/pkg/morph/client/frostfsid/client.go +++ b/pkg/morph/client/frostfsid/client.go @@ -3,7 +3,7 @@ package frostfsid import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/frostfsid/keys.go b/pkg/morph/client/frostfsid/keys.go index 9c1255d4..3bae7adf 100644 --- a/pkg/morph/client/frostfsid/keys.go +++ b/pkg/morph/client/frostfsid/keys.go @@ -4,8 +4,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/pkg/morph/client/netmap/add_peer.go b/pkg/morph/client/netmap/add_peer.go index 9b26bf45..dc6c2554 100644 --- a/pkg/morph/client/netmap/add_peer.go +++ b/pkg/morph/client/netmap/add_peer.go @@ -3,8 +3,8 @@ package netmap import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // AddPeerPrm groups parameters of AddPeer operation. diff --git a/pkg/morph/client/netmap/client.go b/pkg/morph/client/netmap/client.go index 6e24e6b1..eafa097e 100644 --- a/pkg/morph/client/netmap/client.go +++ b/pkg/morph/client/netmap/client.go @@ -3,8 +3,8 @@ package netmap import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/netmap/config.go b/pkg/morph/client/netmap/config.go index 67ab436d..6b721cdf 100644 --- a/pkg/morph/client/netmap/config.go +++ b/pkg/morph/client/netmap/config.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/bigint" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" ) diff --git a/pkg/morph/client/netmap/epoch.go b/pkg/morph/client/netmap/epoch.go index 222ece45..92d569ae 100644 --- a/pkg/morph/client/netmap/epoch.go +++ b/pkg/morph/client/netmap/epoch.go @@ -3,7 +3,7 @@ package netmap import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // Epoch receives number of current FrostFS epoch diff --git a/pkg/morph/client/netmap/innerring.go b/pkg/morph/client/netmap/innerring.go index d28a299c..742165b9 100644 --- a/pkg/morph/client/netmap/innerring.go +++ b/pkg/morph/client/netmap/innerring.go @@ -4,7 +4,7 @@ import ( "crypto/elliptic" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" ) diff --git a/pkg/morph/client/netmap/netmap.go b/pkg/morph/client/netmap/netmap.go index 3943e8bc..61bbf5f1 100644 --- a/pkg/morph/client/netmap/netmap.go +++ b/pkg/morph/client/netmap/netmap.go @@ -3,9 +3,9 @@ package netmap import ( "fmt" - netmapcontract "github.com/TrueCloudLab/frostfs-contract/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + netmapcontract "git.frostfs.info/TrueCloudLab/frostfs-contract/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" ) diff --git a/pkg/morph/client/netmap/netmap_test.go b/pkg/morph/client/netmap/netmap_test.go index da3d3672..d6172a68 100644 --- a/pkg/morph/client/netmap/netmap_test.go +++ b/pkg/morph/client/netmap/netmap_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - netmapcontract "github.com/TrueCloudLab/frostfs-contract/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + netmapcontract "git.frostfs.info/TrueCloudLab/frostfs-contract/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/client/netmap/new_epoch.go b/pkg/morph/client/netmap/new_epoch.go index cd57c462..0b4d31b1 100644 --- a/pkg/morph/client/netmap/new_epoch.go +++ b/pkg/morph/client/netmap/new_epoch.go @@ -3,7 +3,7 @@ package netmap import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // NewEpoch updates FrostFS epoch number through diff --git a/pkg/morph/client/netmap/snapshot.go b/pkg/morph/client/netmap/snapshot.go index fc13a8ef..ba2c26af 100644 --- a/pkg/morph/client/netmap/snapshot.go +++ b/pkg/morph/client/netmap/snapshot.go @@ -1,8 +1,8 @@ package netmap import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // GetNetMap calls "snapshot" method and decodes netmap.NetMap from the response. diff --git a/pkg/morph/client/netmap/update_state.go b/pkg/morph/client/netmap/update_state.go index 383fae8a..02967453 100644 --- a/pkg/morph/client/netmap/update_state.go +++ b/pkg/morph/client/netmap/update_state.go @@ -3,8 +3,8 @@ package netmap import ( "fmt" - "github.com/TrueCloudLab/frostfs-contract/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-contract/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // UpdatePeerPrm groups parameters of UpdatePeerState operation. diff --git a/pkg/morph/client/nns.go b/pkg/morph/client/nns.go index 68696a5c..0a23aa47 100644 --- a/pkg/morph/client/nns.go +++ b/pkg/morph/client/nns.go @@ -6,7 +6,7 @@ import ( "math/big" "strconv" - "github.com/TrueCloudLab/frostfs-contract/nns" + "git.frostfs.info/TrueCloudLab/frostfs-contract/nns" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/encoding/address" diff --git a/pkg/morph/client/notary.go b/pkg/morph/client/notary.go index 30e55171..a1980e2d 100644 --- a/pkg/morph/client/notary.go +++ b/pkg/morph/client/notary.go @@ -8,7 +8,7 @@ import ( "math/big" "strings" - "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" "github.com/nspcc-dev/neo-go/pkg/core/native/nativenames" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/transaction" diff --git a/pkg/morph/client/reputation/client.go b/pkg/morph/client/reputation/client.go index 2cd86ebd..cdaf191a 100644 --- a/pkg/morph/client/reputation/client.go +++ b/pkg/morph/client/reputation/client.go @@ -3,7 +3,7 @@ package reputation import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/reputation/get.go b/pkg/morph/client/reputation/get.go index abd6cc2d..8f1d2417 100644 --- a/pkg/morph/client/reputation/get.go +++ b/pkg/morph/client/reputation/get.go @@ -3,8 +3,8 @@ package reputation import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" ) diff --git a/pkg/morph/client/reputation/list.go b/pkg/morph/client/reputation/list.go index 036a2f1b..0090efb1 100644 --- a/pkg/morph/client/reputation/list.go +++ b/pkg/morph/client/reputation/list.go @@ -3,7 +3,7 @@ package reputation import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) type ( diff --git a/pkg/morph/client/reputation/put.go b/pkg/morph/client/reputation/put.go index 20f563bc..02b47def 100644 --- a/pkg/morph/client/reputation/put.go +++ b/pkg/morph/client/reputation/put.go @@ -3,8 +3,8 @@ package reputation import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) type ( diff --git a/pkg/morph/client/subnet/admin.go b/pkg/morph/client/subnet/admin.go index 28941253..387da656 100644 --- a/pkg/morph/client/subnet/admin.go +++ b/pkg/morph/client/subnet/admin.go @@ -1,6 +1,6 @@ package morphsubnet -import "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" // ManageAdminsPrm groups parameters of administer methods of Subnet contract. // diff --git a/pkg/morph/client/subnet/client.go b/pkg/morph/client/subnet/client.go index bc3c51fa..8cbae8f9 100644 --- a/pkg/morph/client/subnet/client.go +++ b/pkg/morph/client/subnet/client.go @@ -3,7 +3,7 @@ package morphsubnet import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/subnet/clients.go b/pkg/morph/client/subnet/clients.go index 9b6b47da..1c855496 100644 --- a/pkg/morph/client/subnet/clients.go +++ b/pkg/morph/client/subnet/clients.go @@ -3,7 +3,7 @@ package morphsubnet import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // UserAllowedPrm groups parameters of UserAllowed method of Subnet contract. diff --git a/pkg/morph/client/subnet/delete.go b/pkg/morph/client/subnet/delete.go index d531be18..f7f8bb2c 100644 --- a/pkg/morph/client/subnet/delete.go +++ b/pkg/morph/client/subnet/delete.go @@ -1,7 +1,7 @@ package morphsubnet import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/client/subnet/get.go b/pkg/morph/client/subnet/get.go index 314188cf..5cd7c39a 100644 --- a/pkg/morph/client/subnet/get.go +++ b/pkg/morph/client/subnet/get.go @@ -3,7 +3,7 @@ package morphsubnet import ( "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // GetPrm groups parameters of Get method of Subnet contract. diff --git a/pkg/morph/client/subnet/node.go b/pkg/morph/client/subnet/node.go index b878f5ac..134b9294 100644 --- a/pkg/morph/client/subnet/node.go +++ b/pkg/morph/client/subnet/node.go @@ -3,7 +3,7 @@ package morphsubnet import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" ) // NodeAllowedPrm groups parameters of NodeAllowed method of Subnet contract. diff --git a/pkg/morph/client/subnet/nodes.go b/pkg/morph/client/subnet/nodes.go index cdbfab18..68725a01 100644 --- a/pkg/morph/client/subnet/nodes.go +++ b/pkg/morph/client/subnet/nodes.go @@ -1,6 +1,6 @@ package morphsubnet -import "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" // ManageNodesPrm groups parameters of node management in Subnet contract. // diff --git a/pkg/morph/client/subnet/put.go b/pkg/morph/client/subnet/put.go index 3df5d98a..2046e79c 100644 --- a/pkg/morph/client/subnet/put.go +++ b/pkg/morph/client/subnet/put.go @@ -1,7 +1,7 @@ package morphsubnet import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/balance/lock.go b/pkg/morph/event/balance/lock.go index c99c6f2f..062a2a88 100644 --- a/pkg/morph/event/balance/lock.go +++ b/pkg/morph/event/balance/lock.go @@ -3,8 +3,8 @@ package balance import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/balance/lock_test.go b/pkg/morph/event/balance/lock_test.go index ecda69b7..9199bcd5 100644 --- a/pkg/morph/event/balance/lock_test.go +++ b/pkg/morph/event/balance/lock_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" diff --git a/pkg/morph/event/container/delete.go b/pkg/morph/event/container/delete.go index 5f3da4bc..398466f5 100644 --- a/pkg/morph/event/container/delete.go +++ b/pkg/morph/event/container/delete.go @@ -3,9 +3,9 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" ) diff --git a/pkg/morph/event/container/delete_notary.go b/pkg/morph/event/container/delete_notary.go index c17df3dd..371f1873 100644 --- a/pkg/morph/event/container/delete_notary.go +++ b/pkg/morph/event/container/delete_notary.go @@ -1,7 +1,7 @@ package container import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) diff --git a/pkg/morph/event/container/delete_test.go b/pkg/morph/event/container/delete_test.go index 8dc328b3..8bf89479 100644 --- a/pkg/morph/event/container/delete_test.go +++ b/pkg/morph/event/container/delete_test.go @@ -4,8 +4,8 @@ import ( "crypto/sha256" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/container/eacl.go b/pkg/morph/event/container/eacl.go index a852f426..8ef6a71a 100644 --- a/pkg/morph/event/container/eacl.go +++ b/pkg/morph/event/container/eacl.go @@ -3,8 +3,8 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" ) diff --git a/pkg/morph/event/container/eacl_notary.go b/pkg/morph/event/container/eacl_notary.go index dcd99454..112065b4 100644 --- a/pkg/morph/event/container/eacl_notary.go +++ b/pkg/morph/event/container/eacl_notary.go @@ -1,7 +1,7 @@ package container import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) diff --git a/pkg/morph/event/container/eacl_test.go b/pkg/morph/event/container/eacl_test.go index 24b122ae..2f059859 100644 --- a/pkg/morph/event/container/eacl_test.go +++ b/pkg/morph/event/container/eacl_test.go @@ -3,7 +3,7 @@ package container import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/container/estimates.go b/pkg/morph/event/container/estimates.go index 47e4d840..9fd21e2b 100644 --- a/pkg/morph/event/container/estimates.go +++ b/pkg/morph/event/container/estimates.go @@ -3,8 +3,8 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" ) diff --git a/pkg/morph/event/container/estimates_test.go b/pkg/morph/event/container/estimates_test.go index 54933d0a..be46e62c 100644 --- a/pkg/morph/event/container/estimates_test.go +++ b/pkg/morph/event/container/estimates_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/container/put.go b/pkg/morph/event/container/put.go index 596e2b68..d163c683 100644 --- a/pkg/morph/event/container/put.go +++ b/pkg/morph/event/container/put.go @@ -3,9 +3,9 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" ) diff --git a/pkg/morph/event/container/put_notary.go b/pkg/morph/event/container/put_notary.go index 6992e9d3..f5779ced 100644 --- a/pkg/morph/event/container/put_notary.go +++ b/pkg/morph/event/container/put_notary.go @@ -3,7 +3,7 @@ package container import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/network/payload" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) diff --git a/pkg/morph/event/container/put_test.go b/pkg/morph/event/container/put_test.go index 5030ef7b..2ccea296 100644 --- a/pkg/morph/event/container/put_test.go +++ b/pkg/morph/event/container/put_test.go @@ -4,8 +4,8 @@ import ( "crypto/sha256" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/frostfs/bind.go b/pkg/morph/event/frostfs/bind.go index ce5cb282..49d10d3c 100644 --- a/pkg/morph/event/frostfs/bind.go +++ b/pkg/morph/event/frostfs/bind.go @@ -3,8 +3,8 @@ package frostfs import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" diff --git a/pkg/morph/event/frostfs/bind_test.go b/pkg/morph/event/frostfs/bind_test.go index 53421ae9..38a82b8d 100644 --- a/pkg/morph/event/frostfs/bind_test.go +++ b/pkg/morph/event/frostfs/bind_test.go @@ -3,7 +3,7 @@ package frostfs import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/frostfs/cheque.go b/pkg/morph/event/frostfs/cheque.go index 192c0a98..239ddb1a 100644 --- a/pkg/morph/event/frostfs/cheque.go +++ b/pkg/morph/event/frostfs/cheque.go @@ -3,8 +3,8 @@ package frostfs import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/frostfs/cheque_test.go b/pkg/morph/event/frostfs/cheque_test.go index 0c2b14d8..861f05a6 100644 --- a/pkg/morph/event/frostfs/cheque_test.go +++ b/pkg/morph/event/frostfs/cheque_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/frostfs/config.go b/pkg/morph/event/frostfs/config.go index 6db54f7e..1b9824b3 100644 --- a/pkg/morph/event/frostfs/config.go +++ b/pkg/morph/event/frostfs/config.go @@ -3,8 +3,8 @@ package frostfs import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/frostfs/config_test.go b/pkg/morph/event/frostfs/config_test.go index c50b3d05..b56c8ecb 100644 --- a/pkg/morph/event/frostfs/config_test.go +++ b/pkg/morph/event/frostfs/config_test.go @@ -3,7 +3,7 @@ package frostfs import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/frostfs/deposit.go b/pkg/morph/event/frostfs/deposit.go index ac0ee68c..b9467d11 100644 --- a/pkg/morph/event/frostfs/deposit.go +++ b/pkg/morph/event/frostfs/deposit.go @@ -3,8 +3,8 @@ package frostfs import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/frostfs/deposit_test.go b/pkg/morph/event/frostfs/deposit_test.go index 29ad08e5..0f52e211 100644 --- a/pkg/morph/event/frostfs/deposit_test.go +++ b/pkg/morph/event/frostfs/deposit_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/frostfs/ir_update.go b/pkg/morph/event/frostfs/ir_update.go index 687555f0..62203540 100644 --- a/pkg/morph/event/frostfs/ir_update.go +++ b/pkg/morph/event/frostfs/ir_update.go @@ -4,8 +4,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" ) diff --git a/pkg/morph/event/frostfs/ir_update_test.go b/pkg/morph/event/frostfs/ir_update_test.go index c7ee00fa..8ce6fdc3 100644 --- a/pkg/morph/event/frostfs/ir_update_test.go +++ b/pkg/morph/event/frostfs/ir_update_test.go @@ -3,7 +3,7 @@ package frostfs import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/frostfs/unbind.go b/pkg/morph/event/frostfs/unbind.go index 9a0a08ea..f88d6799 100644 --- a/pkg/morph/event/frostfs/unbind.go +++ b/pkg/morph/event/frostfs/unbind.go @@ -3,7 +3,7 @@ package frostfs import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" ) diff --git a/pkg/morph/event/frostfs/unbind_test.go b/pkg/morph/event/frostfs/unbind_test.go index 393534f5..4b79d7c4 100644 --- a/pkg/morph/event/frostfs/unbind_test.go +++ b/pkg/morph/event/frostfs/unbind_test.go @@ -3,7 +3,7 @@ package frostfs import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/frostfs/withdraw.go b/pkg/morph/event/frostfs/withdraw.go index 5718adad..3bbf76c2 100644 --- a/pkg/morph/event/frostfs/withdraw.go +++ b/pkg/morph/event/frostfs/withdraw.go @@ -3,8 +3,8 @@ package frostfs import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/frostfs/withdraw_test.go b/pkg/morph/event/frostfs/withdraw_test.go index 42891364..5544283e 100644 --- a/pkg/morph/event/frostfs/withdraw_test.go +++ b/pkg/morph/event/frostfs/withdraw_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/listener.go b/pkg/morph/event/listener.go index 0506d87b..13ad868e 100644 --- a/pkg/morph/event/listener.go +++ b/pkg/morph/event/listener.go @@ -6,9 +6,9 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/subscriber" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/subscriber" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/neorpc/result" diff --git a/pkg/morph/event/netmap/add_peer.go b/pkg/morph/event/netmap/add_peer.go index 3468aa72..87cf9408 100644 --- a/pkg/morph/event/netmap/add_peer.go +++ b/pkg/morph/event/netmap/add_peer.go @@ -3,8 +3,8 @@ package netmap import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" ) diff --git a/pkg/morph/event/netmap/add_peer_notary.go b/pkg/morph/event/netmap/add_peer_notary.go index 48be8899..a506b052 100644 --- a/pkg/morph/event/netmap/add_peer_notary.go +++ b/pkg/morph/event/netmap/add_peer_notary.go @@ -1,7 +1,7 @@ package netmap import ( - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) diff --git a/pkg/morph/event/netmap/add_peer_test.go b/pkg/morph/event/netmap/add_peer_test.go index 6e1818bc..1b8bcf40 100644 --- a/pkg/morph/event/netmap/add_peer_test.go +++ b/pkg/morph/event/netmap/add_peer_test.go @@ -3,7 +3,7 @@ package netmap import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/netmap/epoch.go b/pkg/morph/event/netmap/epoch.go index 0032098e..0eaa9f28 100644 --- a/pkg/morph/event/netmap/epoch.go +++ b/pkg/morph/event/netmap/epoch.go @@ -3,8 +3,8 @@ package netmap import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/netmap/epoch_test.go b/pkg/morph/event/netmap/epoch_test.go index 603efc16..b175b527 100644 --- a/pkg/morph/event/netmap/epoch_test.go +++ b/pkg/morph/event/netmap/epoch_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/netmap/update_peer.go b/pkg/morph/event/netmap/update_peer.go index a2f4058f..535d57e4 100644 --- a/pkg/morph/event/netmap/update_peer.go +++ b/pkg/morph/event/netmap/update_peer.go @@ -4,9 +4,9 @@ import ( "crypto/elliptic" "fmt" - "github.com/TrueCloudLab/frostfs-contract/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-contract/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/network/payload" diff --git a/pkg/morph/event/netmap/update_peer_notary.go b/pkg/morph/event/netmap/update_peer_notary.go index 4fb0e1bb..b7a251f9 100644 --- a/pkg/morph/event/netmap/update_peer_notary.go +++ b/pkg/morph/event/netmap/update_peer_notary.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) diff --git a/pkg/morph/event/netmap/update_peer_test.go b/pkg/morph/event/netmap/update_peer_test.go index 878783a6..1772c88a 100644 --- a/pkg/morph/event/netmap/update_peer_test.go +++ b/pkg/morph/event/netmap/update_peer_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-contract/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-contract/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/notary_preparator.go b/pkg/morph/event/notary_preparator.go index e354b14a..f661268f 100644 --- a/pkg/morph/event/notary_preparator.go +++ b/pkg/morph/event/notary_preparator.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/interop/interopnames" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/hash" diff --git a/pkg/morph/event/notary_preparator_test.go b/pkg/morph/event/notary_preparator_test.go index 397fcefd..d0463348 100644 --- a/pkg/morph/event/notary_preparator_test.go +++ b/pkg/morph/event/notary_preparator_test.go @@ -5,7 +5,7 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/interop/interopnames" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/hash" diff --git a/pkg/morph/event/reputation/put.go b/pkg/morph/event/reputation/put.go index a85a38f7..a182bf26 100644 --- a/pkg/morph/event/reputation/put.go +++ b/pkg/morph/event/reputation/put.go @@ -3,9 +3,9 @@ package reputation import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" ) diff --git a/pkg/morph/event/reputation/put_notary.go b/pkg/morph/event/reputation/put_notary.go index 16795537..f3cd749f 100644 --- a/pkg/morph/event/reputation/put_notary.go +++ b/pkg/morph/event/reputation/put_notary.go @@ -3,7 +3,7 @@ package reputation import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" ) func (p *Put) setEpoch(v uint64) { diff --git a/pkg/morph/event/reputation/put_test.go b/pkg/morph/event/reputation/put_test.go index 2a016cad..46356b31 100644 --- a/pkg/morph/event/reputation/put_test.go +++ b/pkg/morph/event/reputation/put_test.go @@ -4,9 +4,9 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" - "github.com/TrueCloudLab/frostfs-sdk-go/reputation" - reputationtest "github.com/TrueCloudLab/frostfs-sdk-go/reputation/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" + reputationtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation/test" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" diff --git a/pkg/morph/event/rolemanagement/designate.go b/pkg/morph/event/rolemanagement/designate.go index 460fa1dc..28c96804 100644 --- a/pkg/morph/event/rolemanagement/designate.go +++ b/pkg/morph/event/rolemanagement/designate.go @@ -3,7 +3,7 @@ package rolemanagement import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" diff --git a/pkg/morph/event/subnet/delete.go b/pkg/morph/event/subnet/delete.go index 11f7d80d..f46658b5 100644 --- a/pkg/morph/event/subnet/delete.go +++ b/pkg/morph/event/subnet/delete.go @@ -3,8 +3,8 @@ package subnetevents import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/subnet/delete_test.go b/pkg/morph/event/subnet/delete_test.go index 0b47b024..fc68bb22 100644 --- a/pkg/morph/event/subnet/delete_test.go +++ b/pkg/morph/event/subnet/delete_test.go @@ -3,7 +3,7 @@ package subnetevents_test import ( "testing" - subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + subnetevents "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/subnet/put.go b/pkg/morph/event/subnet/put.go index f3157589..3b1f5297 100644 --- a/pkg/morph/event/subnet/put.go +++ b/pkg/morph/event/subnet/put.go @@ -3,8 +3,8 @@ package subnetevents import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/network/payload" diff --git a/pkg/morph/event/subnet/put_test.go b/pkg/morph/event/subnet/put_test.go index f7a7ac7d..8a75b62c 100644 --- a/pkg/morph/event/subnet/put_test.go +++ b/pkg/morph/event/subnet/put_test.go @@ -3,7 +3,7 @@ package subnetevents_test import ( "testing" - subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + subnetevents "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/subnet/remove_node.go b/pkg/morph/event/subnet/remove_node.go index 0a582918..67bfb891 100644 --- a/pkg/morph/event/subnet/remove_node.go +++ b/pkg/morph/event/subnet/remove_node.go @@ -3,8 +3,8 @@ package subnetevents import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" ) diff --git a/pkg/morph/event/subnet/remove_node_test.go b/pkg/morph/event/subnet/remove_node_test.go index fc400874..70fff4dc 100644 --- a/pkg/morph/event/subnet/remove_node_test.go +++ b/pkg/morph/event/subnet/remove_node_test.go @@ -3,8 +3,8 @@ package subnetevents_test import ( "testing" - . "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" - subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + . "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + subnetid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/subnet/id" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" diff --git a/pkg/morph/event/utils.go b/pkg/morph/event/utils.go index 9ae87852..355fd5b4 100644 --- a/pkg/morph/event/utils.go +++ b/pkg/morph/event/utils.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - util2 "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + util2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" diff --git a/pkg/morph/subscriber/subscriber.go b/pkg/morph/subscriber/subscriber.go index 6be89000..6229e6f3 100644 --- a/pkg/morph/subscriber/subscriber.go +++ b/pkg/morph/subscriber/subscriber.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/neorpc" diff --git a/pkg/morph/timer/block_test.go b/pkg/morph/timer/block_test.go index bf00adc8..93bb04de 100644 --- a/pkg/morph/timer/block_test.go +++ b/pkg/morph/timer/block_test.go @@ -3,7 +3,7 @@ package timer_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/timer" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/timer" "github.com/stretchr/testify/require" ) diff --git a/pkg/network/address.go b/pkg/network/address.go index aaac8c3a..02088298 100644 --- a/pkg/network/address.go +++ b/pkg/network/address.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" ) diff --git a/pkg/network/cache/client.go b/pkg/network/cache/client.go index 56d33859..549e98b6 100644 --- a/pkg/network/cache/client.go +++ b/pkg/network/cache/client.go @@ -5,8 +5,8 @@ import ( "sync" "time" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-sdk-go/client" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" ) type ( diff --git a/pkg/network/cache/multi.go b/pkg/network/cache/multi.go index e459ae42..39c191b7 100644 --- a/pkg/network/cache/multi.go +++ b/pkg/network/cache/multi.go @@ -7,11 +7,11 @@ import ( "sync" "time" - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/network/group.go b/pkg/network/group.go index 0cc52379..c18feac2 100644 --- a/pkg/network/group.go +++ b/pkg/network/group.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // AddressGroup represents list of network addresses of the node. diff --git a/pkg/network/transport/accounting/grpc/service.go b/pkg/network/transport/accounting/grpc/service.go index 98b92f06..2144a300 100644 --- a/pkg/network/transport/accounting/grpc/service.go +++ b/pkg/network/transport/accounting/grpc/service.go @@ -3,9 +3,9 @@ package accounting import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" - accountingGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/accounting/grpc" - accountingsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting" + accountingGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting/grpc" + accountingsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/accounting" ) // Server wraps FrostFS API Accounting service and diff --git a/pkg/network/transport/container/grpc/service.go b/pkg/network/transport/container/grpc/service.go index 4cb86cdf..ed514d6d 100644 --- a/pkg/network/transport/container/grpc/service.go +++ b/pkg/network/transport/container/grpc/service.go @@ -3,9 +3,9 @@ package container import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/container" - containerGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/container/grpc" - containersvc "github.com/TrueCloudLab/frostfs-node/pkg/services/container" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + containerGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container/grpc" + containersvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container" ) // Server wraps FrostFS API Container service and diff --git a/pkg/network/transport/netmap/grpc/service.go b/pkg/network/transport/netmap/grpc/service.go index de99f456..7a3aec86 100644 --- a/pkg/network/transport/netmap/grpc/service.go +++ b/pkg/network/transport/netmap/grpc/service.go @@ -3,9 +3,9 @@ package grpc import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" - netmapGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/netmap/grpc" - netmapsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap" + netmapGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap/grpc" + netmapsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/netmap" ) // Server wraps FrostFS API Netmap service and diff --git a/pkg/network/transport/object/grpc/get.go b/pkg/network/transport/object/grpc/get.go index 93bffb2a..e1655c18 100644 --- a/pkg/network/transport/object/grpc/get.go +++ b/pkg/network/transport/object/grpc/get.go @@ -1,8 +1,8 @@ package object import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object/grpc" ) type getStreamerV2 struct { diff --git a/pkg/network/transport/object/grpc/range.go b/pkg/network/transport/object/grpc/range.go index 65d4808b..391536e8 100644 --- a/pkg/network/transport/object/grpc/range.go +++ b/pkg/network/transport/object/grpc/range.go @@ -1,8 +1,8 @@ package object import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object/grpc" ) type getRangeStreamerV2 struct { diff --git a/pkg/network/transport/object/grpc/search.go b/pkg/network/transport/object/grpc/search.go index cd00000f..a151ced0 100644 --- a/pkg/network/transport/object/grpc/search.go +++ b/pkg/network/transport/object/grpc/search.go @@ -1,8 +1,8 @@ package object import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object/grpc" ) type searchStreamerV2 struct { diff --git a/pkg/network/transport/object/grpc/service.go b/pkg/network/transport/object/grpc/service.go index e8e9812e..82e323a3 100644 --- a/pkg/network/transport/object/grpc/service.go +++ b/pkg/network/transport/object/grpc/service.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" - objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object/grpc" + objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) // Server wraps FrostFS API Object service and diff --git a/pkg/network/transport/reputation/grpc/service.go b/pkg/network/transport/reputation/grpc/service.go index 05e55b41..bb907432 100644 --- a/pkg/network/transport/reputation/grpc/service.go +++ b/pkg/network/transport/reputation/grpc/service.go @@ -3,9 +3,9 @@ package grpcreputation import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/reputation" - reputation2 "github.com/TrueCloudLab/frostfs-api-go/v2/reputation/grpc" - reputationrpc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/rpc" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/reputation" + reputation2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/reputation/grpc" + reputationrpc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/rpc" ) // Server wraps FrostFS API v2 Reputation service server diff --git a/pkg/network/transport/session/grpc/service.go b/pkg/network/transport/session/grpc/service.go index 595dcd2d..e0dc7494 100644 --- a/pkg/network/transport/session/grpc/service.go +++ b/pkg/network/transport/session/grpc/service.go @@ -3,9 +3,9 @@ package session import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - sessionGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/session/grpc" - sessionsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + sessionGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session/grpc" + sessionsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session" ) // Server wraps FrostFS API Session service and diff --git a/pkg/network/validation.go b/pkg/network/validation.go index be022482..92f65011 100644 --- a/pkg/network/validation.go +++ b/pkg/network/validation.go @@ -3,7 +3,7 @@ package network import ( "errors" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) const ( diff --git a/pkg/network/validation_test.go b/pkg/network/validation_test.go index 17e6d914..7d3cb957 100644 --- a/pkg/network/validation_test.go +++ b/pkg/network/validation_test.go @@ -3,7 +3,7 @@ package network import ( "testing" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/accounting/executor.go b/pkg/services/accounting/executor.go index d71980d2..40284595 100644 --- a/pkg/services/accounting/executor.go +++ b/pkg/services/accounting/executor.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting" ) type ServiceExecutor interface { diff --git a/pkg/services/accounting/morph/executor.go b/pkg/services/accounting/morph/executor.go index 0e7a65c8..434c8950 100644 --- a/pkg/services/accounting/morph/executor.go +++ b/pkg/services/accounting/morph/executor.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" - accountingSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + accountingSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) type morphExecutor struct { diff --git a/pkg/services/accounting/response.go b/pkg/services/accounting/response.go index 970c18da..a78ac6fd 100644 --- a/pkg/services/accounting/response.go +++ b/pkg/services/accounting/response.go @@ -3,9 +3,9 @@ package accounting import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response" ) type responseService struct { diff --git a/pkg/services/accounting/server.go b/pkg/services/accounting/server.go index 89b6a3f3..72833c46 100644 --- a/pkg/services/accounting/server.go +++ b/pkg/services/accounting/server.go @@ -3,7 +3,7 @@ package accounting import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting" ) // Server is an interface of the FrostFS API Accounting service server. diff --git a/pkg/services/accounting/sign.go b/pkg/services/accounting/sign.go index 998f6a76..e98d9b3a 100644 --- a/pkg/services/accounting/sign.go +++ b/pkg/services/accounting/sign.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) type signService struct { diff --git a/pkg/services/audit/auditor/context.go b/pkg/services/audit/auditor/context.go index b4ef45a2..528a3bbb 100644 --- a/pkg/services/audit/auditor/context.go +++ b/pkg/services/audit/auditor/context.go @@ -5,14 +5,14 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/pkg/services/audit/auditor/pdp.go b/pkg/services/audit/auditor/pdp.go index 89fbe985..beb2fdcf 100644 --- a/pkg/services/audit/auditor/pdp.go +++ b/pkg/services/audit/auditor/pdp.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/tzhash/tz" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/tzhash/tz" "go.uber.org/zap" ) diff --git a/pkg/services/audit/auditor/pop.go b/pkg/services/audit/auditor/pop.go index 8e6f0b3d..f8a16cb0 100644 --- a/pkg/services/audit/auditor/pop.go +++ b/pkg/services/audit/auditor/pop.go @@ -1,9 +1,9 @@ package auditor import ( - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/tzhash/tz" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/tzhash/tz" "go.uber.org/zap" ) diff --git a/pkg/services/audit/auditor/por.go b/pkg/services/audit/auditor/por.go index 9ab8cec8..432826ac 100644 --- a/pkg/services/audit/auditor/por.go +++ b/pkg/services/audit/auditor/por.go @@ -4,13 +4,13 @@ import ( "bytes" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" - containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - storagegroupSDK "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" - "github.com/TrueCloudLab/tzhash/tz" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" + containerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + storagegroupSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" + "git.frostfs.info/TrueCloudLab/tzhash/tz" "go.uber.org/zap" ) diff --git a/pkg/services/audit/auditor/util.go b/pkg/services/audit/auditor/util.go index e5a7469a..5f868553 100644 --- a/pkg/services/audit/auditor/util.go +++ b/pkg/services/audit/auditor/util.go @@ -1,7 +1,7 @@ package auditor import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" ) // nextRandUint64 returns random uint64 number [0; n) outside exclude map. diff --git a/pkg/services/audit/report.go b/pkg/services/audit/report.go index d3c608a9..f16f9738 100644 --- a/pkg/services/audit/report.go +++ b/pkg/services/audit/report.go @@ -3,9 +3,9 @@ package audit import ( "sync" - "github.com/TrueCloudLab/frostfs-sdk-go/audit" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/audit" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // Report tracks the progress of auditing container data. diff --git a/pkg/services/audit/task.go b/pkg/services/audit/task.go index 5e76bfdb..554aab6c 100644 --- a/pkg/services/audit/task.go +++ b/pkg/services/audit/task.go @@ -3,10 +3,10 @@ package audit import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/storagegroup" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // Task groups groups the container audit parameters. diff --git a/pkg/services/audit/taskmanager/listen.go b/pkg/services/audit/taskmanager/listen.go index ed8bb208..4e8a3df6 100644 --- a/pkg/services/audit/taskmanager/listen.go +++ b/pkg/services/audit/taskmanager/listen.go @@ -3,8 +3,8 @@ package audittask import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" "go.uber.org/zap" ) diff --git a/pkg/services/audit/taskmanager/manager.go b/pkg/services/audit/taskmanager/manager.go index 69e8a344..bf769879 100644 --- a/pkg/services/audit/taskmanager/manager.go +++ b/pkg/services/audit/taskmanager/manager.go @@ -3,10 +3,10 @@ package audittask import ( "time" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/audit/taskmanager/push.go b/pkg/services/audit/taskmanager/push.go index ea8b84b6..13f8fd12 100644 --- a/pkg/services/audit/taskmanager/push.go +++ b/pkg/services/audit/taskmanager/push.go @@ -1,7 +1,7 @@ package audittask import ( - "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/audit" ) // PushTask adds a task to the queue for processing. diff --git a/pkg/services/container/announcement/load/controller/calls.go b/pkg/services/container/announcement/load/controller/calls.go index 205f66b4..54eb7e07 100644 --- a/pkg/services/container/announcement/load/controller/calls.go +++ b/pkg/services/container/announcement/load/controller/calls.go @@ -3,8 +3,8 @@ package loadcontroller import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" "go.uber.org/zap" ) diff --git a/pkg/services/container/announcement/load/controller/calls_test.go b/pkg/services/container/announcement/load/controller/calls_test.go index 19aa075e..1737921a 100644 --- a/pkg/services/container/announcement/load/controller/calls_test.go +++ b/pkg/services/container/announcement/load/controller/calls_test.go @@ -6,9 +6,9 @@ import ( "sync" "testing" - loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + loadcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/container/announcement/load/controller/deps.go b/pkg/services/container/announcement/load/controller/deps.go index 67dba49f..953ea452 100644 --- a/pkg/services/container/announcement/load/controller/deps.go +++ b/pkg/services/container/announcement/load/controller/deps.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" ) // UsedSpaceHandler describes the signature of the container.SizeEstimation diff --git a/pkg/services/container/announcement/load/controller/opts.go b/pkg/services/container/announcement/load/controller/opts.go index 2a6ae8d8..29148def 100644 --- a/pkg/services/container/announcement/load/controller/opts.go +++ b/pkg/services/container/announcement/load/controller/opts.go @@ -1,7 +1,7 @@ package loadcontroller import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/container/announcement/load/controller/util.go b/pkg/services/container/announcement/load/controller/util.go index c954f747..fb356393 100644 --- a/pkg/services/container/announcement/load/controller/util.go +++ b/pkg/services/container/announcement/load/controller/util.go @@ -3,7 +3,7 @@ package loadcontroller import ( "context" - "github.com/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" ) func usedSpaceFilterEpochEQ(epoch uint64) UsedSpaceFilter { diff --git a/pkg/services/container/announcement/load/route/calls.go b/pkg/services/container/announcement/load/route/calls.go index d145dad6..989120b4 100644 --- a/pkg/services/container/announcement/load/route/calls.go +++ b/pkg/services/container/announcement/load/route/calls.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "sync" - loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" - "github.com/TrueCloudLab/frostfs-sdk-go/container" + loadcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" "go.uber.org/zap" ) diff --git a/pkg/services/container/announcement/load/route/deps.go b/pkg/services/container/announcement/load/route/deps.go index 72155542..429cda3e 100644 --- a/pkg/services/container/announcement/load/route/deps.go +++ b/pkg/services/container/announcement/load/route/deps.go @@ -1,8 +1,8 @@ package loadroute import ( - loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" - "github.com/TrueCloudLab/frostfs-sdk-go/container" + loadcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" ) // ServerInfo describes a set of diff --git a/pkg/services/container/announcement/load/route/opts.go b/pkg/services/container/announcement/load/route/opts.go index 0fad6430..ab140ab4 100644 --- a/pkg/services/container/announcement/load/route/opts.go +++ b/pkg/services/container/announcement/load/route/opts.go @@ -1,7 +1,7 @@ package loadroute import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/container/announcement/load/route/placement/calls.go b/pkg/services/container/announcement/load/route/placement/calls.go index 5a952c72..3db0d967 100644 --- a/pkg/services/container/announcement/load/route/placement/calls.go +++ b/pkg/services/container/announcement/load/route/placement/calls.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - loadroute "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route" - "github.com/TrueCloudLab/frostfs-sdk-go/container" + netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + loadroute "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" ) // NextStage composes container nodes for the container and epoch from a, diff --git a/pkg/services/container/announcement/load/route/placement/deps.go b/pkg/services/container/announcement/load/route/placement/deps.go index 3aa2586d..43339eb4 100644 --- a/pkg/services/container/announcement/load/route/placement/deps.go +++ b/pkg/services/container/announcement/load/route/placement/deps.go @@ -1,8 +1,8 @@ package placementrouter import ( - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) // PlacementBuilder describes interface of FrostFS placement calculator. diff --git a/pkg/services/container/announcement/load/route/router.go b/pkg/services/container/announcement/load/route/router.go index 8db3882d..6169a2ae 100644 --- a/pkg/services/container/announcement/load/route/router.go +++ b/pkg/services/container/announcement/load/route/router.go @@ -3,7 +3,7 @@ package loadroute import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" ) // Prm groups the required parameters of the Router's constructor. diff --git a/pkg/services/container/announcement/load/route/util.go b/pkg/services/container/announcement/load/route/util.go index d0b06ae4..fca1e579 100644 --- a/pkg/services/container/announcement/load/route/util.go +++ b/pkg/services/container/announcement/load/route/util.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - "github.com/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" ) var errWrongRoute = errors.New("wrong route") diff --git a/pkg/services/container/announcement/load/storage/storage.go b/pkg/services/container/announcement/load/storage/storage.go index 0478b737..70d82fc4 100644 --- a/pkg/services/container/announcement/load/storage/storage.go +++ b/pkg/services/container/announcement/load/storage/storage.go @@ -4,8 +4,8 @@ import ( "sort" "sync" - loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" - "github.com/TrueCloudLab/frostfs-sdk-go/container" + loadcontroller "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" ) type usedSpaceEstimations struct { diff --git a/pkg/services/container/announcement/load/storage/storage_test.go b/pkg/services/container/announcement/load/storage/storage_test.go index 83407991..20e73627 100644 --- a/pkg/services/container/announcement/load/storage/storage_test.go +++ b/pkg/services/container/announcement/load/storage/storage_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/container/executor.go b/pkg/services/container/executor.go index 78da59d7..b4705d25 100644 --- a/pkg/services/container/executor.go +++ b/pkg/services/container/executor.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/container" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" ) type ServiceExecutor interface { diff --git a/pkg/services/container/morph/executor.go b/pkg/services/container/morph/executor.go index 0702ddad..42035c8d 100644 --- a/pkg/services/container/morph/executor.go +++ b/pkg/services/container/morph/executor.go @@ -5,15 +5,15 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/container" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - sessionV2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - containerSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/session" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + sessionV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + containerSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) type morphExecutor struct { diff --git a/pkg/services/container/morph/executor_test.go b/pkg/services/container/morph/executor_test.go index 3a7dd7cd..a270ee85 100644 --- a/pkg/services/container/morph/executor_test.go +++ b/pkg/services/container/morph/executor_test.go @@ -4,18 +4,18 @@ import ( "context" "testing" - "github.com/TrueCloudLab/frostfs-api-go/v2/container" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - containerCore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - containerSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/container" - containerSvcMorph "github.com/TrueCloudLab/frostfs-node/pkg/services/container/morph" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - containertest "github.com/TrueCloudLab/frostfs-sdk-go/container/test" - frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - sessiontest "github.com/TrueCloudLab/frostfs-sdk-go/session/test" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + containerCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + containerSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container" + containerSvcMorph "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/container/morph" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + containertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/test" + frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + sessiontest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session/test" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/container/response.go b/pkg/services/container/response.go index 37b1eee5..13897453 100644 --- a/pkg/services/container/response.go +++ b/pkg/services/container/response.go @@ -3,9 +3,9 @@ package container import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/container" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response" ) type responseService struct { diff --git a/pkg/services/container/server.go b/pkg/services/container/server.go index 301b0bce..052a8c94 100644 --- a/pkg/services/container/server.go +++ b/pkg/services/container/server.go @@ -3,7 +3,7 @@ package container import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/container" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" ) // Server is an interface of the FrostFS API Container service server. diff --git a/pkg/services/container/sign.go b/pkg/services/container/sign.go index fec2d327..9e77e2e2 100644 --- a/pkg/services/container/sign.go +++ b/pkg/services/container/sign.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-api-go/v2/container" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) type signService struct { diff --git a/pkg/services/control/convert.go b/pkg/services/control/convert.go index 540e43b5..833288bb 100644 --- a/pkg/services/control/convert.go +++ b/pkg/services/control/convert.go @@ -1,8 +1,8 @@ package control import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/grpc" - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/message" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/message" ) type requestWrapper struct { diff --git a/pkg/services/control/ir/convert.go b/pkg/services/control/ir/convert.go index 6b12d78e..01bc4872 100644 --- a/pkg/services/control/ir/convert.go +++ b/pkg/services/control/ir/convert.go @@ -1,8 +1,8 @@ package control import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/grpc" - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/message" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/grpc" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/message" ) type requestWrapper struct { diff --git a/pkg/services/control/ir/rpc.go b/pkg/services/control/ir/rpc.go index 3082ae01..a8b16b60 100644 --- a/pkg/services/control/ir/rpc.go +++ b/pkg/services/control/ir/rpc.go @@ -1,8 +1,8 @@ package control import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/common" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/common" ) const serviceName = "ircontrol.ControlService" diff --git a/pkg/services/control/ir/server/calls.go b/pkg/services/control/ir/server/calls.go index 8be0bd04..986da90f 100644 --- a/pkg/services/control/ir/server/calls.go +++ b/pkg/services/control/ir/server/calls.go @@ -3,7 +3,7 @@ package control import ( "context" - control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" + control "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/ir/server/deps.go b/pkg/services/control/ir/server/deps.go index 6c84852d..0c2de530 100644 --- a/pkg/services/control/ir/server/deps.go +++ b/pkg/services/control/ir/server/deps.go @@ -1,6 +1,6 @@ package control -import control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" +import control "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir" // HealthChecker is component interface for calculating // the current health status of a node. diff --git a/pkg/services/control/ir/server/sign.go b/pkg/services/control/ir/server/sign.go index 5dc909a6..4ada9846 100644 --- a/pkg/services/control/ir/server/sign.go +++ b/pkg/services/control/ir/server/sign.go @@ -6,10 +6,10 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" - frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + control "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir" + frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" ) // SignedMessage is an interface of Control service message. diff --git a/pkg/services/control/ir/service.pb.go b/pkg/services/control/ir/service.pb.go index d3826c61f71d5236c4b2d199a3fd3a34dae1b458..9f28347065ea9434f6d845ecf00c7c033e82de19 100644 GIT binary patch delta 171 zcmca#*itkhm(|En&(LUNA%~i}iHVMaL4|3e4i~3Eg^3Y}V`dH}EkUF?SlTFcvZT7U z9guI7ijXsdu+6|)&C);;MqttutjQc~n7Juf1CX5jRLz=+i*vG~x-z4}WH)s%XMvRR bWG^YP$$Qk*Kyr`Ol_y`5lHRPOu~z^9tWzu% delta 144 zcmZoEx?eaUm&MRX&tzi}hnlx>s*Zv|g=wM=7pFmmaWaTwW)3DTL8Q3}m~8=On}XR! zAkqk|&CD1qk_IMICcjdXXX4_V%%yHUd4-w^h?xy!s!M^HXMjw3X|~A*s{E5>HTZ$D Kn{_p=3jhGng(Ttt diff --git a/pkg/services/control/ir/service.proto b/pkg/services/control/ir/service.proto index 9e45f961..5f99be16 100644 --- a/pkg/services/control/ir/service.proto +++ b/pkg/services/control/ir/service.proto @@ -4,7 +4,7 @@ package ircontrol; import "pkg/services/control/ir/types.proto"; -option go_package = "github.com/TrueCloudLab/frostfs-node/pkg/services/ir/control"; +option go_package = "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/ir/control"; // `ControlService` provides an interface for internal work with the Inner Ring node. service ControlService { diff --git a/pkg/services/control/ir/service_frostfs.pb.go b/pkg/services/control/ir/service_frostfs.pb.go index d4cbffa526acc3ecf2998cb7183ebc07aba84590..f6dd94b3a069f356e35cfe5156dfdc2f8e04aecc 100644 GIT binary patch delta 24 fcmeCs?9-eO#;ccBlwVwuR;-tqmzKXVR$BxBZM6uv delta 18 ZcmeCv?9iML#-34{q?eqZyD?c?1OPqr22}t6 diff --git a/pkg/services/control/ir/service_grpc.pb.go b/pkg/services/control/ir/service_grpc.pb.go index 92751b61498ae709f60a1e525be573833e41cf0e..b6bc6fdbab92a728650c6f0303caf92e56f7887a 100644 GIT binary patch delta 16 XcmeB`>yw*M%W7n(XK1vsv4;-;ELH_7 delta 15 WcmeB^>y?{O%VKDxXR@)WhYtWKIt2Rw diff --git a/pkg/services/control/ir/service_test.go b/pkg/services/control/ir/service_test.go index 89621756..54eef514 100644 --- a/pkg/services/control/ir/service_test.go +++ b/pkg/services/control/ir/service_test.go @@ -3,7 +3,7 @@ package control_test import ( "testing" - control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" + control "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" ) diff --git a/pkg/services/control/ir/types.pb.go b/pkg/services/control/ir/types.pb.go index 79e0f2903dc5c5f824e873fbca020b3fd6ec7104..c89cd5a0d11cde2b9f888f3ce7509f211ca69891 100644 GIT binary patch delta 190 zcmca?^TTFBE~}BDo}tmk!g8T{6B8W;g9_6`5NTorBF)Ufq$P+n2g@3zfWk!X`bA+uyoG8A) Y$#?kpI6y|30qvN)o=E{ma&p2^0da-m@3R2>C_3e!XoX`Boq&CJ21C5SXP0kbW@Y*R4X2t*oz zb(tB1Mbf}z3RpZ%hl_J^g0MBC!sNNa%1l7cK``eZgj3I_JK0}^4=5Wi0+QX_Eb^5T E0DM;_I{*Lx diff --git a/pkg/services/control/ir/types.proto b/pkg/services/control/ir/types.proto index ddf5e827..a6897fad 100644 --- a/pkg/services/control/ir/types.proto +++ b/pkg/services/control/ir/types.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package ircontrol; -option go_package = "github.com/TrueCloudLab/frostfs-node/pkg/services/ir/control"; +option go_package = "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/ir/control"; // Signature of some message. message Signature { diff --git a/pkg/services/control/ir/types_frostfs.pb.go b/pkg/services/control/ir/types_frostfs.pb.go index 293f81cca91b88914540b9cd035009f3a2496428..50679e785cde64c550c052e8846ee563d135f381 100644 GIT binary patch delta 24 fcmZ3+v4&$p7_VMhQGRhrTCrYcURwUf*ptivZkP!_ delta 18 ZcmZ3(v5aFv7<)!(l3sFt?#ASk%m6<62HXGu diff --git a/pkg/services/control/rpc.go b/pkg/services/control/rpc.go index b94285a3..0779e177 100644 --- a/pkg/services/control/rpc.go +++ b/pkg/services/control/rpc.go @@ -1,8 +1,8 @@ package control import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/common" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/common" ) const serviceName = "control.ControlService" diff --git a/pkg/services/control/server/dump.go b/pkg/services/control/server/dump.go index 66dca3e4..28be02aa 100644 --- a/pkg/services/control/server/dump.go +++ b/pkg/services/control/server/dump.go @@ -3,8 +3,8 @@ package control import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/server/evacuate.go b/pkg/services/control/server/evacuate.go index d00e9b3a..6c064efa 100644 --- a/pkg/services/control/server/evacuate.go +++ b/pkg/services/control/server/evacuate.go @@ -7,13 +7,13 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/services/replicator" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/services/control/server/flush_cache.go b/pkg/services/control/server/flush_cache.go index 8f196bc6..fdfd136a 100644 --- a/pkg/services/control/server/flush_cache.go +++ b/pkg/services/control/server/flush_cache.go @@ -3,8 +3,8 @@ package control import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/server/gc.go b/pkg/services/control/server/gc.go index 46f30a54..ea1f626f 100644 --- a/pkg/services/control/server/gc.go +++ b/pkg/services/control/server/gc.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/server/healthcheck.go b/pkg/services/control/server/healthcheck.go index 06127290..9e87caa4 100644 --- a/pkg/services/control/server/healthcheck.go +++ b/pkg/services/control/server/healthcheck.go @@ -3,7 +3,7 @@ package control import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/server/helpers.go b/pkg/services/control/server/helpers.go index 178e61af..25e54cd9 100644 --- a/pkg/services/control/server/helpers.go +++ b/pkg/services/control/server/helpers.go @@ -1,6 +1,6 @@ package control -import "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" func (s *Server) getShardIDList(raw [][]byte) []*shard.ID { if len(raw) != 0 { diff --git a/pkg/services/control/server/list_shards.go b/pkg/services/control/server/list_shards.go index 955d587d..a020547a 100644 --- a/pkg/services/control/server/list_shards.go +++ b/pkg/services/control/server/list_shards.go @@ -3,9 +3,9 @@ package control import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/server/restore.go b/pkg/services/control/server/restore.go index 3a55bf6f..0e636795 100644 --- a/pkg/services/control/server/restore.go +++ b/pkg/services/control/server/restore.go @@ -3,8 +3,8 @@ package control import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/server/server.go b/pkg/services/control/server/server.go index 0b445388..a0ad44e2 100644 --- a/pkg/services/control/server/server.go +++ b/pkg/services/control/server/server.go @@ -3,11 +3,11 @@ package control import ( "crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - "github.com/TrueCloudLab/frostfs-node/pkg/services/replicator" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator" ) // Server is an entity that serves diff --git a/pkg/services/control/server/set_netmap_status.go b/pkg/services/control/server/set_netmap_status.go index 5225b41f..ba7e682c 100644 --- a/pkg/services/control/server/set_netmap_status.go +++ b/pkg/services/control/server/set_netmap_status.go @@ -3,7 +3,7 @@ package control import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/server/set_shard_mode.go b/pkg/services/control/server/set_shard_mode.go index 5bdf6b36..274e2f65 100644 --- a/pkg/services/control/server/set_shard_mode.go +++ b/pkg/services/control/server/set_shard_mode.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/server/sign.go b/pkg/services/control/server/sign.go index ec90cb03..726cdf34 100644 --- a/pkg/services/control/server/sign.go +++ b/pkg/services/control/server/sign.go @@ -6,10 +6,10 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" ) // SignedMessage is an interface of Control service message. diff --git a/pkg/services/control/server/syncronize_tree.go b/pkg/services/control/server/syncronize_tree.go index 9d61624f..dce3e883 100644 --- a/pkg/services/control/server/syncronize_tree.go +++ b/pkg/services/control/server/syncronize_tree.go @@ -3,8 +3,8 @@ package control import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/service.pb.go b/pkg/services/control/service.pb.go index 1e25d95d8c106025f090c70d9072955fb0f39ff0..78e7b0598d93a7a763bfc152815feab18749387b 100644 GIT binary patch delta 167 zcmaF-g015v+k{+JBSSqyqsGFmg^c$j_)H9S6bvd%6G5bL+Vr?cMlmL%)amad8RhMO zLS|+l33Fo*X_N{g%`A1eIDr&|1C};R151NRQxmWTBOQh5>mwPhnYcKozm8;7W>lCi o5C!4-L@_E)-uqE>a?K~jY2l1w(|1QPicWs^Np$jFWT}3@S_$L8P(e^!P|dF+MX35YOBcM4A~* zX8a{CmI7iMrGZFO6R@n24j1S2E0K)Wj0)2QqZpN$fLzlkM(fEgpH!yHx-*JRuKlDq Wy@7>Mbo#?6Mp2;j_U}=Q6C(kMs3$Q1 diff --git a/pkg/services/control/service.proto b/pkg/services/control/service.proto index 18adc8ed..5a09a74a 100644 --- a/pkg/services/control/service.proto +++ b/pkg/services/control/service.proto @@ -4,7 +4,7 @@ package control; import "pkg/services/control/types.proto"; -option go_package = "github.com/TrueCloudLab/frostfs-node/pkg/services/control"; +option go_package = "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control"; // `ControlService` provides an interface for internal work with the storage node. service ControlService { diff --git a/pkg/services/control/service_frostfs.pb.go b/pkg/services/control/service_frostfs.pb.go index 2529d5a80955d70c92cf130a3a0cafe1eb4d8de7..5bb119090d82b4052d96ca47ada2250c22ff8da9 100644 GIT binary patch delta 26 icmdlnhk4%|<_TfEdTB-Z#U*LQdYO4?`5R+zp9KJry$fvs delta 20 ccmdlthk3^w<_Tf!8Kp^j$@#e(lW(5|09iQ+3IG5A diff --git a/pkg/services/control/service_grpc.pb.go b/pkg/services/control/service_grpc.pb.go index 77f43e314e5a8c7f1470823621eb932b37bbf1e6..2cfddd7f57c2371a832755a5ac9f25f7e74d1eaf 100644 GIT binary patch delta 18 ZcmZ3{$GEbOaY8Mtk)fWU(ZL?ggm?nZq<1`RyW)3DTL8Q3}h%`zCiT_jCW1&~OAu*h4kp2Da}zMz0z{gdg4sqO z(kKo%JZ#;ccBlwVwuR;-tqmzKXVc7+rGaAyfm delta 18 ZcmeA+Yc-n?#-34{q?eqZyD@o%6aYXi2J8R; diff --git a/pkg/services/control/types_test.go b/pkg/services/control/types_test.go index 09d7dbbc..1505a985 100644 --- a/pkg/services/control/types_test.go +++ b/pkg/services/control/types_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/google/uuid" ) diff --git a/pkg/services/netmap/executor.go b/pkg/services/netmap/executor.go index 159645db..9fa3d767 100644 --- a/pkg/services/netmap/executor.go +++ b/pkg/services/netmap/executor.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-node/pkg/core/version" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - versionsdk "github.com/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/version" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + versionsdk "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" ) type executorSvc struct { diff --git a/pkg/services/netmap/response.go b/pkg/services/netmap/response.go index 14f6dcd0..8b035e46 100644 --- a/pkg/services/netmap/response.go +++ b/pkg/services/netmap/response.go @@ -3,9 +3,9 @@ package netmap import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response" ) type responseService struct { diff --git a/pkg/services/netmap/server.go b/pkg/services/netmap/server.go index 593c2a3d..0a09c9f4 100644 --- a/pkg/services/netmap/server.go +++ b/pkg/services/netmap/server.go @@ -3,7 +3,7 @@ package netmap import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap" ) // Server is an interface of the FrostFS API Netmap service server. diff --git a/pkg/services/netmap/sign.go b/pkg/services/netmap/sign.go index b2a935e4..85b19d86 100644 --- a/pkg/services/netmap/sign.go +++ b/pkg/services/netmap/sign.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) type signService struct { diff --git a/pkg/services/notificator/deps.go b/pkg/services/notificator/deps.go index aea20e7a..ded4b4b7 100644 --- a/pkg/services/notificator/deps.go +++ b/pkg/services/notificator/deps.go @@ -1,7 +1,7 @@ package notificator import ( - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // NotificationSource is a source of object notifications. diff --git a/pkg/services/notificator/nats/options.go b/pkg/services/notificator/nats/options.go index 97f6552e..c9ba2ed2 100644 --- a/pkg/services/notificator/nats/options.go +++ b/pkg/services/notificator/nats/options.go @@ -3,7 +3,7 @@ package nats import ( "time" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nats-io/nats.go" ) diff --git a/pkg/services/notificator/nats/service.go b/pkg/services/notificator/nats/service.go index b9034b96..54eb373e 100644 --- a/pkg/services/notificator/nats/service.go +++ b/pkg/services/notificator/nats/service.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nats-io/nats.go" "go.uber.org/zap" ) diff --git a/pkg/services/notificator/service.go b/pkg/services/notificator/service.go index c44ce872..09661830 100644 --- a/pkg/services/notificator/service.go +++ b/pkg/services/notificator/service.go @@ -3,8 +3,8 @@ package notificator import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/services/object/acl/acl.go b/pkg/services/object/acl/acl.go index 906708d4..6734f9f7 100644 --- a/pkg/services/object/acl/acl.go +++ b/pkg/services/object/acl/acl.go @@ -6,17 +6,17 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - eaclV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/acl/eacl/v2" - v2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/acl/v2" - bearerSDK "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + eaclV2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/acl/eacl/v2" + v2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/acl/v2" + bearerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/pkg/services/object/acl/acl_test.go b/pkg/services/object/acl/acl_test.go index b0550d29..d3ad1e6f 100644 --- a/pkg/services/object/acl/acl_test.go +++ b/pkg/services/object/acl/acl_test.go @@ -3,14 +3,14 @@ package acl import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - v2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/acl/v2" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/user" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + v2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/acl/v2" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/object/acl/eacl/v2/eacl_test.go b/pkg/services/object/acl/eacl/v2/eacl_test.go index 2019bb2d..4570e271 100644 --- a/pkg/services/object/acl/eacl/v2/eacl_test.go +++ b/pkg/services/object/acl/eacl/v2/eacl_test.go @@ -5,13 +5,13 @@ import ( "errors" "testing" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/object/acl/eacl/v2/headers.go b/pkg/services/object/acl/eacl/v2/headers.go index 856823d2..31188fbf 100644 --- a/pkg/services/object/acl/eacl/v2/headers.go +++ b/pkg/services/object/acl/eacl/v2/headers.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/acl" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - refsV2 "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + refsV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) type Option func(*cfg) diff --git a/pkg/services/object/acl/eacl/v2/localstore.go b/pkg/services/object/acl/eacl/v2/localstore.go index 63020cbc..40271f1c 100644 --- a/pkg/services/object/acl/eacl/v2/localstore.go +++ b/pkg/services/object/acl/eacl/v2/localstore.go @@ -3,9 +3,9 @@ package v2 import ( "io" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type localStorage struct { diff --git a/pkg/services/object/acl/eacl/v2/object.go b/pkg/services/object/acl/eacl/v2/object.go index 5fc549ea..0a63981c 100644 --- a/pkg/services/object/acl/eacl/v2/object.go +++ b/pkg/services/object/acl/eacl/v2/object.go @@ -3,11 +3,11 @@ package v2 import ( "strconv" - "github.com/TrueCloudLab/frostfs-api-go/v2/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type sysObjHdr struct { diff --git a/pkg/services/object/acl/eacl/v2/opts.go b/pkg/services/object/acl/eacl/v2/opts.go index b6f86520..7657e878 100644 --- a/pkg/services/object/acl/eacl/v2/opts.go +++ b/pkg/services/object/acl/eacl/v2/opts.go @@ -1,9 +1,9 @@ package v2 import ( - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) func WithObjectStorage(v ObjectStorage) Option { diff --git a/pkg/services/object/acl/eacl/v2/xheader.go b/pkg/services/object/acl/eacl/v2/xheader.go index a7c3b7c3..246714af 100644 --- a/pkg/services/object/acl/eacl/v2/xheader.go +++ b/pkg/services/object/acl/eacl/v2/xheader.go @@ -1,8 +1,8 @@ package v2 import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" ) type xHeaderSource interface { diff --git a/pkg/services/object/acl/v2/classifier.go b/pkg/services/object/acl/v2/classifier.go index f9fe76f5..2bf5a395 100644 --- a/pkg/services/object/acl/v2/classifier.go +++ b/pkg/services/object/acl/v2/classifier.go @@ -4,12 +4,12 @@ import ( "bytes" "crypto/sha256" - core "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + core "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "go.uber.org/zap" ) diff --git a/pkg/services/object/acl/v2/errors.go b/pkg/services/object/acl/v2/errors.go index db4306e4..70c1ae99 100644 --- a/pkg/services/object/acl/v2/errors.go +++ b/pkg/services/object/acl/v2/errors.go @@ -3,7 +3,7 @@ package v2 import ( "fmt" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) const invalidRequestMessage = "malformed request" diff --git a/pkg/services/object/acl/v2/opts.go b/pkg/services/object/acl/v2/opts.go index 281ce3d3..7e937da0 100644 --- a/pkg/services/object/acl/v2/opts.go +++ b/pkg/services/object/acl/v2/opts.go @@ -1,10 +1,10 @@ package v2 import ( - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" ) // WithLogger returns option to set logger. diff --git a/pkg/services/object/acl/v2/request.go b/pkg/services/object/acl/v2/request.go index f74a0b3b..0cf734d7 100644 --- a/pkg/services/object/acl/v2/request.go +++ b/pkg/services/object/acl/v2/request.go @@ -4,13 +4,13 @@ import ( "crypto/ecdsa" "fmt" - sessionV2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - sessionSDK "github.com/TrueCloudLab/frostfs-sdk-go/session" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + sessionV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + sessionSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/pkg/services/object/acl/v2/service.go b/pkg/services/object/acl/v2/service.go index 62f7917f..6bae0d0c 100644 --- a/pkg/services/object/acl/v2/service.go +++ b/pkg/services/object/acl/v2/service.go @@ -5,17 +5,17 @@ import ( "errors" "fmt" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - sessionSDK "github.com/TrueCloudLab/frostfs-sdk-go/session" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + sessionSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/pkg/services/object/acl/v2/types.go b/pkg/services/object/acl/v2/types.go index 8c40cbe2..061cd26b 100644 --- a/pkg/services/object/acl/v2/types.go +++ b/pkg/services/object/acl/v2/types.go @@ -1,7 +1,7 @@ package v2 import ( - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) // ACLChecker is an interface that must provide diff --git a/pkg/services/object/acl/v2/util.go b/pkg/services/object/acl/v2/util.go index 7afbd144..5e3be6e5 100644 --- a/pkg/services/object/acl/v2/util.go +++ b/pkg/services/object/acl/v2/util.go @@ -6,15 +6,15 @@ import ( "errors" "fmt" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - refsV2 "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - sessionV2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - sessionSDK "github.com/TrueCloudLab/frostfs-sdk-go/session" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + refsV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + sessionV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + sessionSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/pkg/services/object/acl/v2/util_test.go b/pkg/services/object/acl/v2/util_test.go index 49593f67..394feef4 100644 --- a/pkg/services/object/acl/v2/util_test.go +++ b/pkg/services/object/acl/v2/util_test.go @@ -6,14 +6,14 @@ import ( "crypto/rand" "testing" - "github.com/TrueCloudLab/frostfs-api-go/v2/acl" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - bearertest "github.com/TrueCloudLab/frostfs-sdk-go/bearer/test" - aclsdk "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" - sessionSDK "github.com/TrueCloudLab/frostfs-sdk-go/session" - sessiontest "github.com/TrueCloudLab/frostfs-sdk-go/session/test" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + bearertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer/test" + aclsdk "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + sessionSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + sessiontest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/object/common.go b/pkg/services/object/common.go index c627af16..e797f1a6 100644 --- a/pkg/services/object/common.go +++ b/pkg/services/object/common.go @@ -3,8 +3,8 @@ package object import ( "context" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) // NodeState is storage node state processed by Object service. diff --git a/pkg/services/object/delete/delete.go b/pkg/services/object/delete/delete.go index 8dd16d6d..4a9c476d 100644 --- a/pkg/services/object/delete/delete.go +++ b/pkg/services/object/delete/delete.go @@ -3,7 +3,7 @@ package deletesvc import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" "go.uber.org/zap" ) diff --git a/pkg/services/object/delete/exec.go b/pkg/services/object/delete/exec.go index d3fc3db9..112796f2 100644 --- a/pkg/services/object/delete/exec.go +++ b/pkg/services/object/delete/exec.go @@ -4,12 +4,12 @@ import ( "context" "strconv" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/services/object/delete/local.go b/pkg/services/object/delete/local.go index 225ef2d7..36af9644 100644 --- a/pkg/services/object/delete/local.go +++ b/pkg/services/object/delete/local.go @@ -1,8 +1,8 @@ package deletesvc import ( - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/services/object/delete/prm.go b/pkg/services/object/delete/prm.go index b054095a..92eb5dcb 100644 --- a/pkg/services/object/delete/prm.go +++ b/pkg/services/object/delete/prm.go @@ -1,8 +1,8 @@ package deletesvc import ( - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // TombstoneAddressWriter is an interface of tombstone address setter. diff --git a/pkg/services/object/delete/service.go b/pkg/services/object/delete/service.go index 76024a17..f2ea384d 100644 --- a/pkg/services/object/delete/service.go +++ b/pkg/services/object/delete/service.go @@ -1,15 +1,15 @@ package deletesvc import ( - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - searchsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/search" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + getsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + searchsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/search" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/pkg/services/object/delete/util.go b/pkg/services/object/delete/util.go index 765c5a2f..a8ebb306 100644 --- a/pkg/services/object/delete/util.go +++ b/pkg/services/object/delete/util.go @@ -3,11 +3,11 @@ package deletesvc import ( "errors" - getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - searchsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/search" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + getsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + searchsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/search" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type headSvcWrapper getsvc.Service diff --git a/pkg/services/object/delete/v2/service.go b/pkg/services/object/delete/v2/service.go index 8f7b715c..51759c5d 100644 --- a/pkg/services/object/delete/v2/service.go +++ b/pkg/services/object/delete/v2/service.go @@ -3,8 +3,8 @@ package deletesvc import ( "context" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - deletesvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/delete" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + deletesvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/delete" ) // Service implements Delete operation of Object service v2. diff --git a/pkg/services/object/delete/v2/util.go b/pkg/services/object/delete/v2/util.go index a21b25a4..d0db1f54 100644 --- a/pkg/services/object/delete/v2/util.go +++ b/pkg/services/object/delete/v2/util.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - deletesvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/delete" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + deletesvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/delete" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type tombstoneBodyWriter struct { diff --git a/pkg/services/object/get/assemble.go b/pkg/services/object/get/assemble.go index 89d40008..99195290 100644 --- a/pkg/services/object/get/assemble.go +++ b/pkg/services/object/get/assemble.go @@ -1,9 +1,9 @@ package getsvc import ( - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/services/object/get/container.go b/pkg/services/object/get/container.go index f892ab1b..88286112 100644 --- a/pkg/services/object/get/container.go +++ b/pkg/services/object/get/container.go @@ -3,7 +3,7 @@ package getsvc import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" "go.uber.org/zap" ) diff --git a/pkg/services/object/get/exec.go b/pkg/services/object/get/exec.go index 5755973f..26f607a1 100644 --- a/pkg/services/object/get/exec.go +++ b/pkg/services/object/get/exec.go @@ -5,14 +5,14 @@ import ( "crypto/ecdsa" "errors" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/services/object/get/get.go b/pkg/services/object/get/get.go index 829deaff..f3d5f8a5 100644 --- a/pkg/services/object/get/get.go +++ b/pkg/services/object/get/get.go @@ -3,8 +3,8 @@ package getsvc import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/services/object/get/get_test.go b/pkg/services/object/get/get_test.go index 6167ad18..a15f2cb1 100644 --- a/pkg/services/object/get/get_test.go +++ b/pkg/services/object/get/get_test.go @@ -8,21 +8,21 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger/test" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - netmaptest "github.com/TrueCloudLab/frostfs-sdk-go/netmap/test" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger/test" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + netmaptest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/object/get/local.go b/pkg/services/object/get/local.go index c0ad1b2a..f526af4e 100644 --- a/pkg/services/object/get/local.go +++ b/pkg/services/object/get/local.go @@ -3,8 +3,8 @@ package getsvc import ( "errors" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/services/object/get/prm.go b/pkg/services/object/get/prm.go index 1050a895..f548aecf 100644 --- a/pkg/services/object/get/prm.go +++ b/pkg/services/object/get/prm.go @@ -5,10 +5,10 @@ import ( "errors" "hash" - coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // Prm groups parameters of Get service call. diff --git a/pkg/services/object/get/remote.go b/pkg/services/object/get/remote.go index ea7bf239..da310d24 100644 --- a/pkg/services/object/get/remote.go +++ b/pkg/services/object/get/remote.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/services/object/get/service.go b/pkg/services/object/get/service.go index 70ceadf9..123c67b3 100644 --- a/pkg/services/object/get/service.go +++ b/pkg/services/object/get/service.go @@ -1,15 +1,15 @@ package getsvc import ( - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/services/object/get/util.go b/pkg/services/object/get/util.go index abda3d0b..bfd79bde 100644 --- a/pkg/services/object/get/util.go +++ b/pkg/services/object/get/util.go @@ -5,13 +5,13 @@ import ( "errors" "io" - coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - internal "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" - internalclient "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + internal "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) type SimpleObjectWriter struct { diff --git a/pkg/services/object/get/v2/service.go b/pkg/services/object/get/v2/service.go index 02967181..3fd8cd04 100644 --- a/pkg/services/object/get/v2/service.go +++ b/pkg/services/object/get/v2/service.go @@ -4,11 +4,11 @@ import ( "context" "errors" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" - objutil "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + getsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get" + objutil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) // Service implements Get operation of Object service v2. diff --git a/pkg/services/object/get/v2/streamer.go b/pkg/services/object/get/v2/streamer.go index 26f26041..bccc409c 100644 --- a/pkg/services/object/get/v2/streamer.go +++ b/pkg/services/object/get/v2/streamer.go @@ -1,9 +1,9 @@ package getsvc import ( - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) type streamObjectWriter struct { diff --git a/pkg/services/object/get/v2/util.go b/pkg/services/object/get/v2/util.go index 1907ae80..d3190d6d 100644 --- a/pkg/services/object/get/v2/util.go +++ b/pkg/services/object/get/v2/util.go @@ -9,26 +9,26 @@ import ( "io" "sync" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc" - rpcclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-api-go/v2/signature" - "github.com/TrueCloudLab/frostfs-api-go/v2/status" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal" - internalclient "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - versionSDK "github.com/TrueCloudLab/frostfs-sdk-go/version" - "github.com/TrueCloudLab/tzhash/tz" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc" + rpcclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + objectSvc "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/internal" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + versionSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/tzhash/tz" ) var errWrongMessageSeq = errors.New("incorrect message sequence") diff --git a/pkg/services/object/head/prm.go b/pkg/services/object/head/prm.go index 604eeb3c..5566e48f 100644 --- a/pkg/services/object/head/prm.go +++ b/pkg/services/object/head/prm.go @@ -1,7 +1,7 @@ package headsvc import ( - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type Prm struct { diff --git a/pkg/services/object/head/remote.go b/pkg/services/object/head/remote.go index 3db2a7e6..f50c3422 100644 --- a/pkg/services/object/head/remote.go +++ b/pkg/services/object/head/remote.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - netmapCore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - internalclient "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + netmapCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type ClientConstructor interface { diff --git a/pkg/services/object/internal/client/client.go b/pkg/services/object/internal/client/client.go index 0ed9a835..8f2483bc 100644 --- a/pkg/services/object/internal/client/client.go +++ b/pkg/services/object/internal/client/client.go @@ -8,14 +8,14 @@ import ( "fmt" "io" - coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) type commonPrm struct { diff --git a/pkg/services/object/internal/client/error.go b/pkg/services/object/internal/client/error.go index c0efe591..98cdfcf9 100644 --- a/pkg/services/object/internal/client/error.go +++ b/pkg/services/object/internal/client/error.go @@ -1,6 +1,6 @@ package internal -import clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" +import clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" type errorReporter interface { ReportError(error) diff --git a/pkg/services/object/internal/key.go b/pkg/services/object/internal/key.go index 0f1a6423..7ab5f082 100644 --- a/pkg/services/object/internal/key.go +++ b/pkg/services/object/internal/key.go @@ -3,8 +3,8 @@ package internal import ( "bytes" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" ) // VerifyResponseKeyV2 checks if response is signed with expected key. Returns client.ErrWrongPublicKey if not. diff --git a/pkg/services/object/metrics.go b/pkg/services/object/metrics.go index 43c636e2..9f15e834 100644 --- a/pkg/services/object/metrics.go +++ b/pkg/services/object/metrics.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) type ( diff --git a/pkg/services/object/put/distributed.go b/pkg/services/object/put/distributed.go index 40a42a33..8d47e63b 100644 --- a/pkg/services/object/put/distributed.go +++ b/pkg/services/object/put/distributed.go @@ -5,13 +5,13 @@ import ( "sync" "sync/atomic" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - svcutil "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + svcutil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/services/object/put/local.go b/pkg/services/object/put/local.go index 592d40cd..009df95c 100644 --- a/pkg/services/object/put/local.go +++ b/pkg/services/object/put/local.go @@ -3,10 +3,10 @@ package putsvc import ( "fmt" - objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // ObjectStorage is an object storage interface. diff --git a/pkg/services/object/put/prm.go b/pkg/services/object/put/prm.go index 2583410b..aea5926f 100644 --- a/pkg/services/object/put/prm.go +++ b/pkg/services/object/put/prm.go @@ -1,11 +1,11 @@ package putsvc import ( - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + containerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) type PutInitPrm struct { diff --git a/pkg/services/object/put/remote.go b/pkg/services/object/put/remote.go index 181c3229..04fc0d7d 100644 --- a/pkg/services/object/put/remote.go +++ b/pkg/services/object/put/remote.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - netmapCore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - internalclient "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + netmapCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) type remoteTarget struct { diff --git a/pkg/services/object/put/res.go b/pkg/services/object/put/res.go index c350eed5..c77e535f 100644 --- a/pkg/services/object/put/res.go +++ b/pkg/services/object/put/res.go @@ -1,7 +1,7 @@ package putsvc import ( - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type PutResponse struct { diff --git a/pkg/services/object/put/service.go b/pkg/services/object/put/service.go index 7e72df18..338e5485 100644 --- a/pkg/services/object/put/service.go +++ b/pkg/services/object/put/service.go @@ -3,13 +3,13 @@ package putsvc import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - objutil "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + objutil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/object/put/streamer.go b/pkg/services/object/put/streamer.go index e5942d09..1e27ef34 100644 --- a/pkg/services/object/put/streamer.go +++ b/pkg/services/object/put/streamer.go @@ -5,14 +5,14 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" - containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" + containerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) type Streamer struct { diff --git a/pkg/services/object/put/v2/service.go b/pkg/services/object/put/v2/service.go index 5bcb9a68..7d0dfc61 100644 --- a/pkg/services/object/put/v2/service.go +++ b/pkg/services/object/put/v2/service.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" ) // Service implements Put operation of Object service v2. diff --git a/pkg/services/object/put/v2/streamer.go b/pkg/services/object/put/v2/streamer.go index 348bdf84..85827cd4 100644 --- a/pkg/services/object/put/v2/streamer.go +++ b/pkg/services/object/put/v2/streamer.go @@ -3,17 +3,17 @@ package putsvc import ( "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc" - rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - sessionV2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-api-go/v2/signature" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal" - internalclient "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc" + rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + sessionV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" ) type streamer struct { diff --git a/pkg/services/object/put/v2/util.go b/pkg/services/object/put/v2/util.go index c1eef437..790f061f 100644 --- a/pkg/services/object/put/v2/util.go +++ b/pkg/services/object/put/v2/util.go @@ -1,11 +1,11 @@ package putsvc import ( - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - refsV2 "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + refsV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) func (s *streamer) toInitPrm(part *objectV2.PutObjectPartInit, req *objectV2.PutRequest) (*putsvc.PutInitPrm, error) { diff --git a/pkg/services/object/put/validation.go b/pkg/services/object/put/validation.go index 75a3a7a7..2d6ada5a 100644 --- a/pkg/services/object/put/validation.go +++ b/pkg/services/object/put/validation.go @@ -7,11 +7,11 @@ import ( "fmt" "hash" - "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" - "github.com/TrueCloudLab/frostfs-sdk-go/checksum" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - "github.com/TrueCloudLab/tzhash/tz" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/transformer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/tzhash/tz" ) // validatingTarget validates object format and content. diff --git a/pkg/services/object/response.go b/pkg/services/object/response.go index 697ac778..4da2b23a 100644 --- a/pkg/services/object/response.go +++ b/pkg/services/object/response.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response" ) type ResponseService struct { diff --git a/pkg/services/object/search/container.go b/pkg/services/object/search/container.go index b9db0282..fffcba42 100644 --- a/pkg/services/object/search/container.go +++ b/pkg/services/object/search/container.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" "go.uber.org/zap" ) diff --git a/pkg/services/object/search/exec.go b/pkg/services/object/search/exec.go index 92f1edd1..18700b25 100644 --- a/pkg/services/object/search/exec.go +++ b/pkg/services/object/search/exec.go @@ -3,11 +3,11 @@ package searchsvc import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/services/object/search/prm.go b/pkg/services/object/search/prm.go index 8f3fb45b..c80257bd 100644 --- a/pkg/services/object/search/prm.go +++ b/pkg/services/object/search/prm.go @@ -1,11 +1,11 @@ package searchsvc import ( - coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + coreclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // Prm groups parameters of Get service call. diff --git a/pkg/services/object/search/search_test.go b/pkg/services/object/search/search_test.go index c4eb49fe..bb3d422b 100644 --- a/pkg/services/object/search/search_test.go +++ b/pkg/services/object/search/search_test.go @@ -9,17 +9,17 @@ import ( "strconv" "testing" - clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger/test" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/object/search/service.go b/pkg/services/object/search/service.go index 1a1cb4c1..aebcfca0 100644 --- a/pkg/services/object/search/service.go +++ b/pkg/services/object/search/service.go @@ -1,14 +1,14 @@ package searchsvc import ( - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/services/object/search/util.go b/pkg/services/object/search/util.go index f1e89021..741a224a 100644 --- a/pkg/services/object/search/util.go +++ b/pkg/services/object/search/util.go @@ -3,14 +3,14 @@ package searchsvc import ( "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - internalclient "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + internalclient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type uniqueIDWriter struct { diff --git a/pkg/services/object/search/v2/service.go b/pkg/services/object/search/v2/service.go index f73233d3..17e1bc7e 100644 --- a/pkg/services/object/search/v2/service.go +++ b/pkg/services/object/search/v2/service.go @@ -1,10 +1,10 @@ package searchsvc import ( - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - searchsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/search" - objutil "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + searchsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/search" + objutil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" ) // Service implements Search operation of Object service v2. diff --git a/pkg/services/object/search/v2/streamer.go b/pkg/services/object/search/v2/streamer.go index d89d9c98..15e2d53d 100644 --- a/pkg/services/object/search/v2/streamer.go +++ b/pkg/services/object/search/v2/streamer.go @@ -1,10 +1,10 @@ package searchsvc import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type streamWriter struct { diff --git a/pkg/services/object/search/v2/util.go b/pkg/services/object/search/v2/util.go index f2f73a8f..a2acb48f 100644 --- a/pkg/services/object/search/v2/util.go +++ b/pkg/services/object/search/v2/util.go @@ -6,20 +6,20 @@ import ( "io" "sync" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-api-go/v2/rpc" - rpcclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-api-go/v2/signature" - "github.com/TrueCloudLab/frostfs-node/pkg/core/client" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/internal" - searchsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/search" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc" + rpcclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/internal" + searchsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/search" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) func (s *Service) toPrm(req *objectV2.SearchRequest, stream objectSvc.SearchStream) (*searchsvc.Prm, error) { diff --git a/pkg/services/object/server.go b/pkg/services/object/server.go index cd5e81ec..d95c6c90 100644 --- a/pkg/services/object/server.go +++ b/pkg/services/object/server.go @@ -3,8 +3,8 @@ package object import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) // GetObjectStream is an interface of FrostFS API v2 compatible object streamer. diff --git a/pkg/services/object/sign.go b/pkg/services/object/sign.go index dbb116dd..585fc659 100644 --- a/pkg/services/object/sign.go +++ b/pkg/services/object/sign.go @@ -5,8 +5,8 @@ import ( "crypto/ecdsa" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) type SignService struct { diff --git a/pkg/services/object/transport_splitter.go b/pkg/services/object/transport_splitter.go index 24b50888..3836103d 100644 --- a/pkg/services/object/transport_splitter.go +++ b/pkg/services/object/transport_splitter.go @@ -4,8 +4,8 @@ import ( "bytes" "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) type ( diff --git a/pkg/services/object/util/chain.go b/pkg/services/object/util/chain.go index b35d8445..33bcd6c1 100644 --- a/pkg/services/object/util/chain.go +++ b/pkg/services/object/util/chain.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // HeadReceiver is an interface of entity that can receive diff --git a/pkg/services/object/util/key.go b/pkg/services/object/util/key.go index dfac5e55..e2ece584 100644 --- a/pkg/services/object/util/key.go +++ b/pkg/services/object/util/key.go @@ -4,10 +4,10 @@ import ( "crypto/ecdsa" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/google/uuid" ) diff --git a/pkg/services/object/util/key_test.go b/pkg/services/object/util/key_test.go index ad20b3e7..76e320e0 100644 --- a/pkg/services/object/util/key_test.go +++ b/pkg/services/object/util/key_test.go @@ -5,14 +5,14 @@ import ( "crypto/elliptic" "testing" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - sessionV2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - tokenStorage "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage/temporary" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/session" - "github.com/TrueCloudLab/frostfs-sdk-go/user" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + sessionV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + tokenStorage "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage/temporary" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" "github.com/google/uuid" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" diff --git a/pkg/services/object/util/log.go b/pkg/services/object/util/log.go index 72b6b545..beda45c0 100644 --- a/pkg/services/object/util/log.go +++ b/pkg/services/object/util/log.go @@ -1,8 +1,8 @@ package util import ( - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/object/util/placement.go b/pkg/services/object/util/placement.go index 04526505..6cd3856f 100644 --- a/pkg/services/object/util/placement.go +++ b/pkg/services/object/util/placement.go @@ -3,13 +3,13 @@ package util import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type localPlacement struct { diff --git a/pkg/services/object/util/prm.go b/pkg/services/object/util/prm.go index 9619ab7e..c09c07cc 100644 --- a/pkg/services/object/util/prm.go +++ b/pkg/services/object/util/prm.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - sessionsdk "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + sessionsdk "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) // maxLocalTTL is maximum TTL for an operation to be considered local. diff --git a/pkg/services/object_manager/placement/netmap.go b/pkg/services/object_manager/placement/netmap.go index eb2a0f2f..01d60702 100644 --- a/pkg/services/object_manager/placement/netmap.go +++ b/pkg/services/object_manager/placement/netmap.go @@ -5,10 +5,10 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/hashicorp/golang-lru/v2/simplelru" ) diff --git a/pkg/services/object_manager/placement/traverser.go b/pkg/services/object_manager/placement/traverser.go index c1b1b1fe..75d5fbfd 100644 --- a/pkg/services/object_manager/placement/traverser.go +++ b/pkg/services/object_manager/placement/traverser.go @@ -5,11 +5,11 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // Builder is an interface of the diff --git a/pkg/services/object_manager/placement/traverser_test.go b/pkg/services/object_manager/placement/traverser_test.go index 4bb21990..66fd8afe 100644 --- a/pkg/services/object_manager/placement/traverser_test.go +++ b/pkg/services/object_manager/placement/traverser_test.go @@ -4,12 +4,12 @@ import ( "strconv" "testing" - netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/object_manager/storagegroup/collect.go b/pkg/services/object_manager/storagegroup/collect.go index aa3dc513..d9578dea 100644 --- a/pkg/services/object_manager/storagegroup/collect.go +++ b/pkg/services/object_manager/storagegroup/collect.go @@ -1,13 +1,13 @@ package storagegroup import ( - objutil "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - "github.com/TrueCloudLab/frostfs-sdk-go/checksum" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" - "github.com/TrueCloudLab/tzhash/tz" + objutil "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/storagegroup" + "git.frostfs.info/TrueCloudLab/tzhash/tz" ) // CollectMembers creates new storage group structure and fills it diff --git a/pkg/services/object_manager/storagegroup/search.go b/pkg/services/object_manager/storagegroup/search.go index ec3fe646..39019aa6 100644 --- a/pkg/services/object_manager/storagegroup/search.go +++ b/pkg/services/object_manager/storagegroup/search.go @@ -1,7 +1,7 @@ package storagegroup import ( - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) // SearchQuery returns search query to filter diff --git a/pkg/services/object_manager/tombstone/checker.go b/pkg/services/object_manager/tombstone/checker.go index d03f5ae4..379dad0f 100644 --- a/pkg/services/object_manager/tombstone/checker.go +++ b/pkg/services/object_manager/tombstone/checker.go @@ -4,10 +4,10 @@ import ( "context" "strconv" - objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" lru "github.com/hashicorp/golang-lru/v2" "go.uber.org/zap" ) diff --git a/pkg/services/object_manager/tombstone/constructor.go b/pkg/services/object_manager/tombstone/constructor.go index 829ed9a1..9d33e817 100644 --- a/pkg/services/object_manager/tombstone/constructor.go +++ b/pkg/services/object_manager/tombstone/constructor.go @@ -3,7 +3,7 @@ package tombstone import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" lru "github.com/hashicorp/golang-lru/v2" "go.uber.org/zap" ) diff --git a/pkg/services/object_manager/tombstone/source/source.go b/pkg/services/object_manager/tombstone/source/source.go index 2b6796c3..1cb40839 100644 --- a/pkg/services/object_manager/tombstone/source/source.go +++ b/pkg/services/object_manager/tombstone/source/source.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + getsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // Source represents wrapper over the object service that diff --git a/pkg/services/object_manager/transformer/fmt.go b/pkg/services/object_manager/transformer/fmt.go index a4706ebd..c9b5dc96 100644 --- a/pkg/services/object_manager/transformer/fmt.go +++ b/pkg/services/object_manager/transformer/fmt.go @@ -4,11 +4,11 @@ import ( "crypto/ecdsa" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/session" - "github.com/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" ) type formatter struct { diff --git a/pkg/services/object_manager/transformer/transformer.go b/pkg/services/object_manager/transformer/transformer.go index cfd70980..7b717d3d 100644 --- a/pkg/services/object_manager/transformer/transformer.go +++ b/pkg/services/object_manager/transformer/transformer.go @@ -6,10 +6,10 @@ import ( "hash" "io" - "github.com/TrueCloudLab/frostfs-sdk-go/checksum" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/tzhash/tz" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/tzhash/tz" ) type payloadSizeLimiter struct { diff --git a/pkg/services/object_manager/transformer/types.go b/pkg/services/object_manager/transformer/types.go index 72e6a742..0fa3b643 100644 --- a/pkg/services/object_manager/transformer/types.go +++ b/pkg/services/object_manager/transformer/types.go @@ -3,8 +3,8 @@ package transformer import ( "io" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // AccessIdentifiers represents group of the object identifiers diff --git a/pkg/services/policer/check.go b/pkg/services/policer/check.go index e683f777..312dc59b 100644 --- a/pkg/services/policer/check.go +++ b/pkg/services/policer/check.go @@ -4,15 +4,15 @@ import ( "context" "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - headsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/head" - "github.com/TrueCloudLab/frostfs-node/pkg/services/replicator" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + headsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/head" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/services/policer/check_test.go b/pkg/services/policer/check_test.go index 0974b3b6..b40ee90d 100644 --- a/pkg/services/policer/check_test.go +++ b/pkg/services/policer/check_test.go @@ -3,7 +3,7 @@ package policer import ( "testing" - netmaptest "github.com/TrueCloudLab/frostfs-sdk-go/netmap/test" + netmaptest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/policer/policer.go b/pkg/services/policer/policer.go index 20c3d00f..dba0c1cb 100644 --- a/pkg/services/policer/policer.go +++ b/pkg/services/policer/policer.go @@ -4,14 +4,14 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - headsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/head" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - "github.com/TrueCloudLab/frostfs-node/pkg/services/replicator" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + headsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/head" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/replicator" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" lru "github.com/hashicorp/golang-lru/v2" "github.com/panjf2000/ants/v2" "go.uber.org/zap" diff --git a/pkg/services/policer/process.go b/pkg/services/policer/process.go index eeb9fe49..68721640 100644 --- a/pkg/services/policer/process.go +++ b/pkg/services/policer/process.go @@ -5,8 +5,8 @@ import ( "errors" "time" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" "go.uber.org/zap" ) diff --git a/pkg/services/policer/queue.go b/pkg/services/policer/queue.go index e2f69403..b8af4404 100644 --- a/pkg/services/policer/queue.go +++ b/pkg/services/policer/queue.go @@ -3,8 +3,8 @@ package policer import ( "fmt" - objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" ) type jobQueue struct { diff --git a/pkg/services/replicator/process.go b/pkg/services/replicator/process.go index 38a65067..476a5bc0 100644 --- a/pkg/services/replicator/process.go +++ b/pkg/services/replicator/process.go @@ -3,9 +3,9 @@ package replicator import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "go.uber.org/zap" ) diff --git a/pkg/services/replicator/replicator.go b/pkg/services/replicator/replicator.go index 995be7c7..49398210 100644 --- a/pkg/services/replicator/replicator.go +++ b/pkg/services/replicator/replicator.go @@ -3,9 +3,9 @@ package replicator import ( "time" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" - putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/replicator/task.go b/pkg/services/replicator/task.go index a103c854..ec1b5578 100644 --- a/pkg/services/replicator/task.go +++ b/pkg/services/replicator/task.go @@ -1,9 +1,9 @@ package replicator import ( - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) // Task represents group of Replicator task parameters. diff --git a/pkg/services/reputation/common/deps.go b/pkg/services/reputation/common/deps.go index e420eda2..ebb227b5 100644 --- a/pkg/services/reputation/common/deps.go +++ b/pkg/services/reputation/common/deps.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) // Context wraps stdlib context diff --git a/pkg/services/reputation/common/managers.go b/pkg/services/reputation/common/managers.go index ce43994c..ef11b812 100644 --- a/pkg/services/reputation/common/managers.go +++ b/pkg/services/reputation/common/managers.go @@ -3,11 +3,11 @@ package common import ( "fmt" - netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - apiNetmap "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" - "github.com/TrueCloudLab/hrw" + netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + apiNetmap "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/hrw" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/common/router/calls.go b/pkg/services/reputation/common/router/calls.go index bae0ea4a..75cdf56e 100644 --- a/pkg/services/reputation/common/router/calls.go +++ b/pkg/services/reputation/common/router/calls.go @@ -4,8 +4,8 @@ import ( "encoding/hex" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/common/router/deps.go b/pkg/services/reputation/common/router/deps.go index 9922a49f..36aecb59 100644 --- a/pkg/services/reputation/common/router/deps.go +++ b/pkg/services/reputation/common/router/deps.go @@ -1,8 +1,8 @@ package router import ( - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" ) // Builder groups methods to route values in the network. diff --git a/pkg/services/reputation/common/router/opts.go b/pkg/services/reputation/common/router/opts.go index f7a7a898..1b345441 100644 --- a/pkg/services/reputation/common/router/opts.go +++ b/pkg/services/reputation/common/router/opts.go @@ -1,7 +1,7 @@ package router import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/common/router/router.go b/pkg/services/reputation/common/router/router.go index 2b3c0f26..b80f6ce5 100644 --- a/pkg/services/reputation/common/router/router.go +++ b/pkg/services/reputation/common/router/router.go @@ -3,8 +3,8 @@ package router import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" ) // Prm groups the required parameters of the Router's constructor. diff --git a/pkg/services/reputation/common/router/util.go b/pkg/services/reputation/common/router/util.go index fa88c93a..aa3190d2 100644 --- a/pkg/services/reputation/common/router/util.go +++ b/pkg/services/reputation/common/router/util.go @@ -4,8 +4,8 @@ import ( "bytes" "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" ) var errWrongRoute = errors.New("wrong route") diff --git a/pkg/services/reputation/eigentrust/calculator/calculator.go b/pkg/services/reputation/eigentrust/calculator/calculator.go index 782cbed9..bfa274fe 100644 --- a/pkg/services/reputation/eigentrust/calculator/calculator.go +++ b/pkg/services/reputation/eigentrust/calculator/calculator.go @@ -3,9 +3,9 @@ package eigentrustcalc import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" ) // Prm groups the required parameters of the Calculator's constructor. diff --git a/pkg/services/reputation/eigentrust/calculator/calls.go b/pkg/services/reputation/eigentrust/calculator/calls.go index 47bfd732..09286d79 100644 --- a/pkg/services/reputation/eigentrust/calculator/calls.go +++ b/pkg/services/reputation/eigentrust/calculator/calls.go @@ -3,9 +3,9 @@ package eigentrustcalc import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/eigentrust/calculator/deps.go b/pkg/services/reputation/eigentrust/calculator/deps.go index 2dd878fd..66d3fd30 100644 --- a/pkg/services/reputation/eigentrust/calculator/deps.go +++ b/pkg/services/reputation/eigentrust/calculator/deps.go @@ -3,9 +3,9 @@ package eigentrustcalc import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) type Context interface { diff --git a/pkg/services/reputation/eigentrust/calculator/opts.go b/pkg/services/reputation/eigentrust/calculator/opts.go index 1d06886f..e1e57236 100644 --- a/pkg/services/reputation/eigentrust/calculator/opts.go +++ b/pkg/services/reputation/eigentrust/calculator/opts.go @@ -1,7 +1,7 @@ package eigentrustcalc import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/eigentrust/controller/calls.go b/pkg/services/reputation/eigentrust/controller/calls.go index 83f4632b..87d23c7f 100644 --- a/pkg/services/reputation/eigentrust/controller/calls.go +++ b/pkg/services/reputation/eigentrust/controller/calls.go @@ -3,7 +3,7 @@ package eigentrustctrl import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/eigentrust/controller/controller.go b/pkg/services/reputation/eigentrust/controller/controller.go index 17d58941..fe9150bc 100644 --- a/pkg/services/reputation/eigentrust/controller/controller.go +++ b/pkg/services/reputation/eigentrust/controller/controller.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" ) // Prm groups the required parameters of the Controller's constructor. diff --git a/pkg/services/reputation/eigentrust/controller/opts.go b/pkg/services/reputation/eigentrust/controller/opts.go index 3b81824d..16bc61c2 100644 --- a/pkg/services/reputation/eigentrust/controller/opts.go +++ b/pkg/services/reputation/eigentrust/controller/opts.go @@ -1,7 +1,7 @@ package eigentrustctrl import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/eigentrust/iteration.go b/pkg/services/reputation/eigentrust/iteration.go index 3408eafe..90a214eb 100644 --- a/pkg/services/reputation/eigentrust/iteration.go +++ b/pkg/services/reputation/eigentrust/iteration.go @@ -3,7 +3,7 @@ package eigentrust import ( "context" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" ) type EpochIteration struct { diff --git a/pkg/services/reputation/eigentrust/routes/builder.go b/pkg/services/reputation/eigentrust/routes/builder.go index 3410d173..ddd5a2ae 100644 --- a/pkg/services/reputation/eigentrust/routes/builder.go +++ b/pkg/services/reputation/eigentrust/routes/builder.go @@ -3,8 +3,8 @@ package routes import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" ) // Prm groups the required parameters of the Builder's constructor. diff --git a/pkg/services/reputation/eigentrust/routes/calls.go b/pkg/services/reputation/eigentrust/routes/calls.go index 1a9b2379..c4d9688a 100644 --- a/pkg/services/reputation/eigentrust/routes/calls.go +++ b/pkg/services/reputation/eigentrust/routes/calls.go @@ -3,8 +3,8 @@ package routes import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/eigentrust/storage/consumers/calls.go b/pkg/services/reputation/eigentrust/storage/consumers/calls.go index 5b928a4a..55a4d6f3 100644 --- a/pkg/services/reputation/eigentrust/storage/consumers/calls.go +++ b/pkg/services/reputation/eigentrust/storage/consumers/calls.go @@ -4,10 +4,10 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" - eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigentrustcalc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) // Put saves intermediate trust of the consumer to daughter peer. diff --git a/pkg/services/reputation/eigentrust/storage/daughters/calls.go b/pkg/services/reputation/eigentrust/storage/daughters/calls.go index 806f74af..eb229365 100644 --- a/pkg/services/reputation/eigentrust/storage/daughters/calls.go +++ b/pkg/services/reputation/eigentrust/storage/daughters/calls.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + eigentrustcalc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) // Put saves daughter peer's trust to its provider for the epoch. diff --git a/pkg/services/reputation/local/controller/calls.go b/pkg/services/reputation/local/controller/calls.go index a46cc4c8..d4e122b0 100644 --- a/pkg/services/reputation/local/controller/calls.go +++ b/pkg/services/reputation/local/controller/calls.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/local/controller/controller.go b/pkg/services/reputation/local/controller/controller.go index c4c2ff4d..7bf56be8 100644 --- a/pkg/services/reputation/local/controller/controller.go +++ b/pkg/services/reputation/local/controller/controller.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + reputationcommon "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" ) // Prm groups the required parameters of the Controller's constructor. diff --git a/pkg/services/reputation/local/controller/deps.go b/pkg/services/reputation/local/controller/deps.go index 522f9482..3ab72eb5 100644 --- a/pkg/services/reputation/local/controller/deps.go +++ b/pkg/services/reputation/local/controller/deps.go @@ -1,8 +1,8 @@ package trustcontroller import ( - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" ) // Iterator is a group of methods provided by entity diff --git a/pkg/services/reputation/local/controller/opts.go b/pkg/services/reputation/local/controller/opts.go index 0b65135a..385a4243 100644 --- a/pkg/services/reputation/local/controller/opts.go +++ b/pkg/services/reputation/local/controller/opts.go @@ -1,7 +1,7 @@ package trustcontroller import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/local/controller/util.go b/pkg/services/reputation/local/controller/util.go index 2c4d19b0..97b9e3a6 100644 --- a/pkg/services/reputation/local/controller/util.go +++ b/pkg/services/reputation/local/controller/util.go @@ -1,6 +1,6 @@ package trustcontroller -import "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" type storageWrapper struct { w common.Writer diff --git a/pkg/services/reputation/local/routes/builder.go b/pkg/services/reputation/local/routes/builder.go index 3410d173..ddd5a2ae 100644 --- a/pkg/services/reputation/local/routes/builder.go +++ b/pkg/services/reputation/local/routes/builder.go @@ -3,8 +3,8 @@ package routes import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" ) // Prm groups the required parameters of the Builder's constructor. diff --git a/pkg/services/reputation/local/routes/calls.go b/pkg/services/reputation/local/routes/calls.go index 2c9be7ca..f0eae16f 100644 --- a/pkg/services/reputation/local/routes/calls.go +++ b/pkg/services/reputation/local/routes/calls.go @@ -3,8 +3,8 @@ package routes import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation/common" "go.uber.org/zap" ) diff --git a/pkg/services/reputation/local/storage/calls.go b/pkg/services/reputation/local/storage/calls.go index a2b3d078..14acbb64 100644 --- a/pkg/services/reputation/local/storage/calls.go +++ b/pkg/services/reputation/local/storage/calls.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" - apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/reputation" + apireputation "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) // UpdatePrm groups the parameters of Storage's Update operation. diff --git a/pkg/services/reputation/rpc/response.go b/pkg/services/reputation/rpc/response.go index dc1dba35..808a0a47 100644 --- a/pkg/services/reputation/rpc/response.go +++ b/pkg/services/reputation/rpc/response.go @@ -3,9 +3,9 @@ package reputationrpc import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response" ) type responseService struct { diff --git a/pkg/services/reputation/rpc/server.go b/pkg/services/reputation/rpc/server.go index 5f81ad62..78af30ea 100644 --- a/pkg/services/reputation/rpc/server.go +++ b/pkg/services/reputation/rpc/server.go @@ -3,7 +3,7 @@ package reputationrpc import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/reputation" ) // Server is an interface of the FrostFS API v2 Reputation service server. diff --git a/pkg/services/reputation/rpc/sign.go b/pkg/services/reputation/rpc/sign.go index 054069a2..9db06ff1 100644 --- a/pkg/services/reputation/rpc/sign.go +++ b/pkg/services/reputation/rpc/sign.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-api-go/v2/reputation" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) type signService struct { diff --git a/pkg/services/reputation/trust.go b/pkg/services/reputation/trust.go index 78255e45..8c5d9091 100644 --- a/pkg/services/reputation/trust.go +++ b/pkg/services/reputation/trust.go @@ -3,7 +3,7 @@ package reputation import ( "strconv" - "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) // TrustValue represents the numeric value of the node's trust. diff --git a/pkg/services/session/executor.go b/pkg/services/session/executor.go index a9ca74da..237a1396 100644 --- a/pkg/services/session/executor.go +++ b/pkg/services/session/executor.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/session/response.go b/pkg/services/session/response.go index 0678c2de..cbf93fb1 100644 --- a/pkg/services/session/response.go +++ b/pkg/services/session/response.go @@ -3,9 +3,9 @@ package session import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util/response" ) type responseService struct { diff --git a/pkg/services/session/server.go b/pkg/services/session/server.go index 5f623b59..9e44ae66 100644 --- a/pkg/services/session/server.go +++ b/pkg/services/session/server.go @@ -3,7 +3,7 @@ package session import ( "context" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" ) // Server is an interface of the FrostFS API Session service server. diff --git a/pkg/services/session/sign.go b/pkg/services/session/sign.go index 086b0c3c..1156dc53 100644 --- a/pkg/services/session/sign.go +++ b/pkg/services/session/sign.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) type signService struct { diff --git a/pkg/services/session/storage/persistent/executor.go b/pkg/services/session/storage/persistent/executor.go index 9a678a37..f59e312c 100644 --- a/pkg/services/session/storage/persistent/executor.go +++ b/pkg/services/session/storage/persistent/executor.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.etcd.io/bbolt" ) diff --git a/pkg/services/session/storage/persistent/executor_test.go b/pkg/services/session/storage/persistent/executor_test.go index ed549a48..860b9589 100644 --- a/pkg/services/session/storage/persistent/executor_test.go +++ b/pkg/services/session/storage/persistent/executor_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" diff --git a/pkg/services/session/storage/persistent/options.go b/pkg/services/session/storage/persistent/options.go index e1606695..411734ea 100644 --- a/pkg/services/session/storage/persistent/options.go +++ b/pkg/services/session/storage/persistent/options.go @@ -4,7 +4,7 @@ import ( "crypto/ecdsa" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/session/storage/persistent/storage.go b/pkg/services/session/storage/persistent/storage.go index 316ef5b0..ded33d1e 100644 --- a/pkg/services/session/storage/persistent/storage.go +++ b/pkg/services/session/storage/persistent/storage.go @@ -6,9 +6,9 @@ import ( "encoding/hex" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/services/session/storage/persistent/util.go b/pkg/services/session/storage/persistent/util.go index e9454635..dff09007 100644 --- a/pkg/services/session/storage/persistent/util.go +++ b/pkg/services/session/storage/persistent/util.go @@ -6,7 +6,7 @@ import ( "encoding/binary" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage" "go.etcd.io/bbolt" ) diff --git a/pkg/services/session/storage/temporary/executor.go b/pkg/services/session/storage/temporary/executor.go index dad3d011..aa64d796 100644 --- a/pkg/services/session/storage/temporary/executor.go +++ b/pkg/services/session/storage/temporary/executor.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/mr-tron/base58" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/pkg/services/session/storage/temporary/storage.go b/pkg/services/session/storage/temporary/storage.go index c4b5836b..370499e0 100644 --- a/pkg/services/session/storage/temporary/storage.go +++ b/pkg/services/session/storage/temporary/storage.go @@ -3,8 +3,8 @@ package temporary import ( "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/session/storage" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/mr-tron/base58" ) diff --git a/pkg/services/tree/cache.go b/pkg/services/tree/cache.go index 52f3c647..73745e1b 100644 --- a/pkg/services/tree/cache.go +++ b/pkg/services/tree/cache.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/network" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" "github.com/hashicorp/golang-lru/v2/simplelru" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" diff --git a/pkg/services/tree/container.go b/pkg/services/tree/container.go index 98ec2903..43525755 100644 --- a/pkg/services/tree/container.go +++ b/pkg/services/tree/container.go @@ -6,10 +6,10 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/hashicorp/golang-lru/v2/simplelru" ) diff --git a/pkg/services/tree/drop.go b/pkg/services/tree/drop.go index b564d034..c0750cbd 100644 --- a/pkg/services/tree/drop.go +++ b/pkg/services/tree/drop.go @@ -3,7 +3,7 @@ package tree import ( "context" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) // DropTree drops a tree from the database. If treeID is empty, all the trees are dropped. diff --git a/pkg/services/tree/getsubtree_test.go b/pkg/services/tree/getsubtree_test.go index 9833455a..5feeace9 100644 --- a/pkg/services/tree/getsubtree_test.go +++ b/pkg/services/tree/getsubtree_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" "google.golang.org/grpc" ) diff --git a/pkg/services/tree/options.go b/pkg/services/tree/options.go index 8a3fd6fd..d60bc14c 100644 --- a/pkg/services/tree/options.go +++ b/pkg/services/tree/options.go @@ -4,11 +4,11 @@ import ( "crypto/ecdsa" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/pkg/services/tree/redirect.go b/pkg/services/tree/redirect.go index ee424088..1671d251 100644 --- a/pkg/services/tree/redirect.go +++ b/pkg/services/tree/redirect.go @@ -5,7 +5,7 @@ import ( "context" "errors" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "go.uber.org/zap" ) diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go index 2b558089..0c3c35f7 100644 --- a/pkg/services/tree/replicator.go +++ b/pkg/services/tree/replicator.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "go.uber.org/zap" ) diff --git a/pkg/services/tree/service.go b/pkg/services/tree/service.go index acec01f6..a01072cb 100644 --- a/pkg/services/tree/service.go +++ b/pkg/services/tree/service.go @@ -7,11 +7,11 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/pkg/services/tree/service.pb.go b/pkg/services/tree/service.pb.go index a0aeed7e4e5c2d7ca49887d3690dd0e359dfafb2..6b5571c3a8a0a88fa2fd7349cba975eaa7745ab4 100644 GIT binary patch delta 151 zcmeC4&%S;>d&3q+`AYRv9R-65(?k$yoD3q(%)z83h%`3=kw!o@(+^ZKipz3w!o|Bk`aVxa{^|NvjG`cs2ds=n)AzChMRu|= XicX(X#mET~{?5jzu>DvSI}{jZ$^EI4571 z(v<`&HUmqULD*(s#c7ipq$HVuie^bEGb&8pFJ%ql{04Irq`{nzBC6Fj+}jnGIx~QQG9)BB7HP ONV5UuHZPYJlenEUfFt1)(QGRhrTCrYcURwUfr~+;PcDM;n delta 18 Zcmca0eoA~oFndO6l3sFt?#6@yZU98c2I~L- diff --git a/pkg/services/util/response/client_stream.go b/pkg/services/util/response/client_stream.go index 8f0a8e03..f167f005 100644 --- a/pkg/services/util/response/client_stream.go +++ b/pkg/services/util/response/client_stream.go @@ -3,7 +3,7 @@ package response import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) // ClientMessageStreamer represents client-side message streamer diff --git a/pkg/services/util/response/server_stream.go b/pkg/services/util/response/server_stream.go index b3b14afc..8a19fc4e 100644 --- a/pkg/services/util/response/server_stream.go +++ b/pkg/services/util/response/server_stream.go @@ -3,7 +3,7 @@ package response import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) // ServerMessageStreamer represents server-side message streamer diff --git a/pkg/services/util/response/service.go b/pkg/services/util/response/service.go index 8a81d66b..87cc8383 100644 --- a/pkg/services/util/response/service.go +++ b/pkg/services/util/response/service.go @@ -1,11 +1,11 @@ package response import ( - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" - "github.com/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" ) // Service represents universal v2 service diff --git a/pkg/services/util/response/unary.go b/pkg/services/util/response/unary.go index 8dbe0a8a..29cb9531 100644 --- a/pkg/services/util/response/unary.go +++ b/pkg/services/util/response/unary.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/util" ) // HandleUnaryRequest call passes request to handler, sets response meta header values and returns it. diff --git a/pkg/services/util/sign.go b/pkg/services/util/sign.go index 761eaee2..2478e625 100644 --- a/pkg/services/util/sign.go +++ b/pkg/services/util/sign.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-api-go/v2/signature" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" ) type RequestMessage interface { diff --git a/pkg/util/attributes/parser.go b/pkg/util/attributes/parser.go index 9b3b8ae8..8016c016 100644 --- a/pkg/util/attributes/parser.go +++ b/pkg/util/attributes/parser.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" ) const keyValueSeparator = ":" diff --git a/pkg/util/attributes/parser_test.go b/pkg/util/attributes/parser_test.go index d56d36ac..547c8d50 100644 --- a/pkg/util/attributes/parser_test.go +++ b/pkg/util/attributes/parser_test.go @@ -3,8 +3,8 @@ package attributes_test import ( "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/util/attributes" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/attributes" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/util/locode/column/coordinates.go b/pkg/util/locode/column/coordinates.go index 462c58e3..5e32c016 100644 --- a/pkg/util/locode/column/coordinates.go +++ b/pkg/util/locode/column/coordinates.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" ) const ( diff --git a/pkg/util/locode/column/country.go b/pkg/util/locode/column/country.go index 6535c968..7b29a97c 100644 --- a/pkg/util/locode/column/country.go +++ b/pkg/util/locode/column/country.go @@ -3,7 +3,7 @@ package locodecolumn import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" ) const countryCodeLen = 2 diff --git a/pkg/util/locode/column/location.go b/pkg/util/locode/column/location.go index 90acd3ef..4303228f 100644 --- a/pkg/util/locode/column/location.go +++ b/pkg/util/locode/column/location.go @@ -3,7 +3,7 @@ package locodecolumn import ( "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" ) const locationCodeLen = 3 diff --git a/pkg/util/locode/db/airports/calls.go b/pkg/util/locode/db/airports/calls.go index fa8d4ead..dac8cce8 100644 --- a/pkg/util/locode/db/airports/calls.go +++ b/pkg/util/locode/db/airports/calls.go @@ -8,8 +8,8 @@ import ( "os" "strconv" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" ) const ( diff --git a/pkg/util/locode/db/boltdb/calls.go b/pkg/util/locode/db/boltdb/calls.go index 4aabb277..171808af 100644 --- a/pkg/util/locode/db/boltdb/calls.go +++ b/pkg/util/locode/db/boltdb/calls.go @@ -6,8 +6,8 @@ import ( "fmt" "path/filepath" - "github.com/TrueCloudLab/frostfs-node/pkg/util" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" "go.etcd.io/bbolt" ) diff --git a/pkg/util/locode/db/continents/geojson/calls.go b/pkg/util/locode/db/continents/geojson/calls.go index 0429f99b..34467d5a 100644 --- a/pkg/util/locode/db/continents/geojson/calls.go +++ b/pkg/util/locode/db/continents/geojson/calls.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" "github.com/paulmach/orb" "github.com/paulmach/orb/geojson" "github.com/paulmach/orb/planar" diff --git a/pkg/util/locode/db/country.go b/pkg/util/locode/db/country.go index ccc108c1..2d13c6ef 100644 --- a/pkg/util/locode/db/country.go +++ b/pkg/util/locode/db/country.go @@ -3,7 +3,7 @@ package locodedb import ( "fmt" - locodecolumn "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/column" + locodecolumn "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/column" ) // CountryCode represents a country code for diff --git a/pkg/util/locode/db/db.go b/pkg/util/locode/db/db.go index 27bf5fc2..2a0f2668 100644 --- a/pkg/util/locode/db/db.go +++ b/pkg/util/locode/db/db.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" ) // SourceTable is an interface of the UN/LOCODE table. diff --git a/pkg/util/locode/db/location.go b/pkg/util/locode/db/location.go index 9b6d6252..d2297917 100644 --- a/pkg/util/locode/db/location.go +++ b/pkg/util/locode/db/location.go @@ -3,7 +3,7 @@ package locodedb import ( "fmt" - locodecolumn "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/column" + locodecolumn "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/column" ) // LocationCode represents a location code for diff --git a/pkg/util/locode/db/point.go b/pkg/util/locode/db/point.go index c9d7b667..72daebb2 100644 --- a/pkg/util/locode/db/point.go +++ b/pkg/util/locode/db/point.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - locodecolumn "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/column" + locodecolumn "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/column" ) // Point represents a 2D geographic point. diff --git a/pkg/util/locode/db/point_test.go b/pkg/util/locode/db/point_test.go index 9673692a..f91c0cf8 100644 --- a/pkg/util/locode/db/point_test.go +++ b/pkg/util/locode/db/point_test.go @@ -3,7 +3,7 @@ package locodedb import ( "testing" - locodecolumn "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/column" + locodecolumn "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/column" "github.com/stretchr/testify/require" ) diff --git a/pkg/util/locode/db/record.go b/pkg/util/locode/db/record.go index 37c0812d..4c414079 100644 --- a/pkg/util/locode/db/record.go +++ b/pkg/util/locode/db/record.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" - locodecolumn "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/column" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" + locodecolumn "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/column" ) // Key represents the key in FrostFS location database. diff --git a/pkg/util/locode/table/csv/calls.go b/pkg/util/locode/table/csv/calls.go index 7602b2e2..5f40865b 100644 --- a/pkg/util/locode/table/csv/calls.go +++ b/pkg/util/locode/table/csv/calls.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" - locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode" + locodedb "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/locode/db" ) var errInvalidRecord = errors.New("invalid table record") diff --git a/pkg/util/logger/test/logger.go b/pkg/util/logger/test/logger.go index aa3d458f..b2f0f3eb 100644 --- a/pkg/util/logger/test/logger.go +++ b/pkg/util/logger/test/logger.go @@ -1,7 +1,7 @@ package test import ( - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/pkg/util/precision/converter_test.go b/pkg/util/precision/converter_test.go index 76ac6c89..264e90b3 100644 --- a/pkg/util/precision/converter_test.go +++ b/pkg/util/precision/converter_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/util/precision" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/precision" "github.com/stretchr/testify/require" ) diff --git a/pkg/util/salt_test.go b/pkg/util/salt_test.go index f2ccf32f..c17a2ec8 100644 --- a/pkg/util/salt_test.go +++ b/pkg/util/salt_test.go @@ -5,7 +5,7 @@ import ( "crypto/rand" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/util/state/storage_test.go b/pkg/util/state/storage_test.go index abac3dbb..031fa883 100644 --- a/pkg/util/state/storage_test.go +++ b/pkg/util/state/storage_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/util/state" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/state" "github.com/stretchr/testify/require" ) -- 2.45.2 From 381e363a8bf382918fa1f44d908df13472c1328c Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Fri, 17 Feb 2023 16:55:41 +0300 Subject: [PATCH 02/70] [#32] node: Always close general components after testing It will prevent test fails with `-race` flag on components that have background processes and make some actions on test framework. Signed-off-by: Pavel Karpy --- pkg/local_object_storage/internal/storagetest/storage.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/local_object_storage/internal/storagetest/storage.go b/pkg/local_object_storage/internal/storagetest/storage.go index 9fbf689a..74400a98 100644 --- a/pkg/local_object_storage/internal/storagetest/storage.go +++ b/pkg/local_object_storage/internal/storagetest/storage.go @@ -106,6 +106,7 @@ func TestSetMode(t *testing.T, cons Constructor, m mode.Mode) { require.NoError(t, s.Open(false)) require.NoError(t, s.Init()) require.NoError(t, s.SetMode(m)) + require.NoError(t, s.Close()) }) } -- 2.45.2 From f1f3c80dbff8dfd7315f1693894f3410e35daab6 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Wed, 15 Feb 2023 17:53:42 +0300 Subject: [PATCH 03/70] [#32] node: Init write-cache asynchronously Signed-off-by: Pavel Karpy --- CHANGELOG.md | 1 + pkg/local_object_storage/writecache/flush.go | 5 +- .../writecache/flush_test.go | 16 ++++- pkg/local_object_storage/writecache/init.go | 59 +++++++++++++++++++ pkg/local_object_storage/writecache/mode.go | 34 +++++++++-- pkg/local_object_storage/writecache/put.go | 7 +++ .../writecache/storage.go | 3 + .../writecache/writecache.go | 22 +++++-- 8 files changed, 132 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a632475..6023e5c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ Changelog for FrostFS Node - Storage engine now can start even when some shard components are unavailable (#2238) - `neofs-cli` buffer for object put increased from 4 KiB to 3 MiB (#2243) - Expired locked object is available for reading (#56) +- Initialize write-cache asynchronously (#32) ### Fixed - Increase payload size metric on shards' `put` operation (#1794) diff --git a/pkg/local_object_storage/writecache/flush.go b/pkg/local_object_storage/writecache/flush.go index ececf331..0437367e 100644 --- a/pkg/local_object_storage/writecache/flush.go +++ b/pkg/local_object_storage/writecache/flush.go @@ -70,7 +70,7 @@ func (c *cache) flushDB() { m = m[:0] c.modeMtx.RLock() - if c.readOnly() { + if c.readOnly() || !c.initialized.Load() { c.modeMtx.RUnlock() time.Sleep(time.Second) continue @@ -151,6 +151,9 @@ func (c *cache) flushBigObjects() { if c.readOnly() { c.modeMtx.RUnlock() break + } else if !c.initialized.Load() { + c.modeMtx.RUnlock() + continue } _ = c.flushFSTree(true) diff --git a/pkg/local_object_storage/writecache/flush_test.go b/pkg/local_object_storage/writecache/flush_test.go index 6d0f9910..e6de8a02 100644 --- a/pkg/local_object_storage/writecache/flush_test.go +++ b/pkg/local_object_storage/writecache/flush_test.go @@ -4,6 +4,7 @@ import ( "os" "path/filepath" "testing" + "time" objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" @@ -64,7 +65,7 @@ func TestFlush(t *testing.T) { WithBlobstor(bs), }, opts...)...) require.NoError(t, wc.Open(false)) - require.NoError(t, wc.Init()) + initWC(t, wc) // First set mode for metabase and blobstor to prevent background flushes. require.NoError(t, mb.SetMode(mode.ReadOnly)) @@ -262,7 +263,7 @@ func TestFlush(t *testing.T) { // Open in read-only: no error, nothing is removed. require.NoError(t, wc.Open(true)) - require.NoError(t, wc.Init()) + initWC(t, wc) for i := range objects { _, err := wc.Get(objects[i].addr) require.NoError(t, err, i) @@ -271,7 +272,7 @@ func TestFlush(t *testing.T) { // Open in read-write: no error, something is removed. require.NoError(t, wc.Open(false)) - require.NoError(t, wc.Init()) + initWC(t, wc) for i := range objects { _, err := wc.Get(objects[i].addr) if i < 2 { @@ -316,6 +317,15 @@ func newObject(t *testing.T, size int) (*object.Object, []byte) { return obj, data } +func initWC(t *testing.T, wc Cache) { + require.NoError(t, wc.Init()) + + require.Eventually(t, func() bool { + rawWc := wc.(*cache) + return rawWc.initialized.Load() + }, 100*time.Second, 1*time.Millisecond) +} + type dummyEpoch struct{} func (dummyEpoch) CurrentEpoch() uint64 { diff --git a/pkg/local_object_storage/writecache/init.go b/pkg/local_object_storage/writecache/init.go index 382b9002..56b27ec4 100644 --- a/pkg/local_object_storage/writecache/init.go +++ b/pkg/local_object_storage/writecache/init.go @@ -2,6 +2,7 @@ package writecache import ( "errors" + "sync" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" storagelog "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" @@ -13,10 +14,57 @@ import ( ) func (c *cache) initFlushMarks() { + var localWG sync.WaitGroup + + localWG.Add(1) + go func() { + defer localWG.Done() + + c.fsTreeFlushMarkUpdate() + }() + + localWG.Add(1) + go func() { + defer localWG.Done() + + c.dbFlushMarkUpdate() + }() + + c.initWG.Add(1) + c.wg.Add(1) + go func() { + defer c.wg.Done() + defer c.initWG.Done() + + localWG.Wait() + + select { + case <-c.stopInitCh: + return + case <-c.closeCh: + return + default: + } + + c.initialized.Store(true) + }() +} + +var errStopIter = errors.New("stop iteration") + +func (c *cache) fsTreeFlushMarkUpdate() { c.log.Info("filling flush marks for objects in FSTree") var prm common.IteratePrm prm.LazyHandler = func(addr oid.Address, _ func() ([]byte, error)) error { + select { + case <-c.closeCh: + return errStopIter + case <-c.stopInitCh: + return errStopIter + default: + } + flushed, needRemove := c.flushStatus(addr) if flushed { c.store.flushed.Add(addr.EncodeToString(), true) @@ -37,7 +85,10 @@ func (c *cache) initFlushMarks() { return nil } _, _ = c.fsTree.Iterate(prm) + c.log.Info("finished updating FSTree flush marks") +} +func (c *cache) dbFlushMarkUpdate() { c.log.Info("filling flush marks for objects in database") var m []string @@ -45,6 +96,14 @@ func (c *cache) initFlushMarks() { var lastKey []byte var batchSize = flushBatchSize for { + select { + case <-c.closeCh: + return + case <-c.stopInitCh: + return + default: + } + m = m[:0] indices = indices[:0] diff --git a/pkg/local_object_storage/writecache/mode.go b/pkg/local_object_storage/writecache/mode.go index f04b0bc4..997310d9 100644 --- a/pkg/local_object_storage/writecache/mode.go +++ b/pkg/local_object_storage/writecache/mode.go @@ -11,6 +11,9 @@ import ( // ErrReadOnly is returned when Put/Write is performed in a read-only mode. var ErrReadOnly = logicerr.New("write-cache is in read-only mode") +// ErrNotInitialized is returned when write-cache is initializing. +var ErrNotInitialized = logicerr.New("write-cache is not initialized yet") + // SetMode sets write-cache mode of operation. // When shard is put in read-only mode all objects in memory are flushed to disk // and all background jobs are suspended. @@ -18,15 +21,36 @@ func (c *cache) SetMode(m mode.Mode) error { c.modeMtx.Lock() defer c.modeMtx.Unlock() - if m.NoMetabase() && !c.mode.NoMetabase() { - err := c.flush(true) + return c.setMode(m) +} + +// setMode applies new mode. Must be called with cache.modeMtx lock taken. +func (c *cache) setMode(m mode.Mode) error { + var err error + turnOffMeta := m.NoMetabase() + + if turnOffMeta && !c.mode.NoMetabase() { + err = c.flush(true) if err != nil { return err } } + if !c.initialized.Load() { + close(c.stopInitCh) + + c.initWG.Wait() + c.stopInitCh = make(chan struct{}) + + defer func() { + if err == nil && !turnOffMeta { + c.initFlushMarks() + } + }() + } + if c.db != nil { - if err := c.db.Close(); err != nil { + if err = c.db.Close(); err != nil { return fmt.Errorf("can't close write-cache database: %w", err) } } @@ -39,12 +63,12 @@ func (c *cache) SetMode(m mode.Mode) error { time.Sleep(time.Second) } - if m.NoMetabase() { + if turnOffMeta { c.mode = m return nil } - if err := c.openStore(m.ReadOnly()); err != nil { + if err = c.openStore(m.ReadOnly()); err != nil { return err } diff --git a/pkg/local_object_storage/writecache/put.go b/pkg/local_object_storage/writecache/put.go index b5fc0e71..7791e93d 100644 --- a/pkg/local_object_storage/writecache/put.go +++ b/pkg/local_object_storage/writecache/put.go @@ -16,11 +16,18 @@ var ( ) // Put puts object to write-cache. +// +// Returns ErrReadOnly if write-cache is in R/O mode. +// Returns ErrNotInitialized if write-cache has not been initialized yet. +// Returns ErrOutOfSpace if saving an object leads to WC's size overflow. +// Returns ErrBigObject if an objects exceeds maximum object size. func (c *cache) Put(prm common.PutPrm) (common.PutRes, error) { c.modeMtx.RLock() defer c.modeMtx.RUnlock() if c.readOnly() { return common.PutRes{}, ErrReadOnly + } else if !c.initialized.Load() { + return common.PutRes{}, ErrNotInitialized } sz := uint64(len(prm.RawData)) diff --git a/pkg/local_object_storage/writecache/storage.go b/pkg/local_object_storage/writecache/storage.go index 51f58b1f..02c79d38 100644 --- a/pkg/local_object_storage/writecache/storage.go +++ b/pkg/local_object_storage/writecache/storage.go @@ -76,6 +76,9 @@ func (c *cache) openStore(readOnly bool) error { if c.flushed == nil { c.flushed, _ = lru.NewWithEvict[string, bool](c.maxFlushedMarksCount, c.removeFlushed) } + + c.initialized.Store(false) + return nil } diff --git a/pkg/local_object_storage/writecache/writecache.go b/pkg/local_object_storage/writecache/writecache.go index c3f95c55..2fe7d44b 100644 --- a/pkg/local_object_storage/writecache/writecache.go +++ b/pkg/local_object_storage/writecache/writecache.go @@ -10,6 +10,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" + "go.uber.org/atomic" "go.uber.org/zap" ) @@ -48,8 +49,11 @@ type cache struct { // mtx protects statistics, counters and compressFlags. mtx sync.RWMutex - mode mode.Mode - modeMtx sync.RWMutex + mode mode.Mode + initialized atomic.Bool + stopInitCh chan struct{} // used to sync initWG initialisation routines and _only_ them + initWG sync.WaitGroup // for initialisation routines only + modeMtx sync.RWMutex // compressFlags maps address of a big object to boolean value indicating // whether object should be compressed. @@ -57,7 +61,7 @@ type cache struct { // flushCh is a channel with objects to flush. flushCh chan *object.Object - // closeCh is close channel. + // closeCh is close channel, protected by modeMtx. closeCh chan struct{} // wg is a wait group for flush workers. wg sync.WaitGroup @@ -89,8 +93,9 @@ var ( // New creates new writecache instance. func New(opts ...Option) Cache { c := &cache{ - flushCh: make(chan *object.Object), - mode: mode.ReadWrite, + flushCh: make(chan *object.Object), + mode: mode.ReadWrite, + stopInitCh: make(chan struct{}), compressFlags: make(map[string]struct{}), options: options{ @@ -151,8 +156,11 @@ func (c *cache) Init() error { // Close closes db connection and stops services. Executes ObjectCounters.FlushAndClose op. func (c *cache) Close() error { + c.modeMtx.Lock() + defer c.modeMtx.Unlock() + // Finish all in-progress operations. - if err := c.SetMode(mode.ReadOnly); err != nil { + if err := c.setMode(mode.ReadOnly); err != nil { return err } @@ -164,6 +172,8 @@ func (c *cache) Close() error { c.closeCh = nil } + c.initialized.Store(false) + var err error if c.db != nil { err = c.db.Close() -- 2.45.2 From 7486c02bbce049df6731aadf3b828a6e297b44a9 Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Thu, 9 Mar 2023 15:33:16 +0300 Subject: [PATCH 04/70] [#88] adm: Fix method `nnsResolveKey` Signed-off-by: Anton Nikiforov --- .../internal/modules/morph/initialize_nns.go | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go b/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go index 7473d9e4..91727202 100644 --- a/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go @@ -228,20 +228,27 @@ func nnsResolve(inv *invoker.Invoker, nnsHash util.Uint160, domain string) (stac } func nnsResolveKey(inv *invoker.Invoker, nnsHash util.Uint160, domain string) (*keys.PublicKey, error) { - item, err := nnsResolve(inv, nnsHash, domain) + res, err := nnsResolve(inv, nnsHash, domain) if err != nil { return nil, err } - v, ok := item.Value().(stackitem.Null) - if ok { + if _, ok := res.Value().(stackitem.Null); ok { return nil, errors.New("NNS record is missing") } - bs, err := v.TryBytes() - if err != nil { - return nil, errors.New("malformed response") + arr, ok := res.Value().([]stackitem.Item) + if !ok { + return nil, errors.New("API of the NNS contract method `resolve` has changed") } + for i := range arr { + var bs []byte + bs, err = arr[i].TryBytes() + if err != nil { + continue + } - return keys.NewPublicKeyFromString(string(bs)) + return keys.NewPublicKeyFromString(string(bs)) + } + return nil, errors.New("no valid keys are found") } // parseNNSResolveResult parses the result of resolving NNS record. -- 2.45.2 From 9929dcf50b9e641bf3b411b939e24577e9ad7c45 Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Thu, 9 Mar 2023 15:53:59 +0300 Subject: [PATCH 05/70] [#126] adm: Exclude `group.frostfs` key from output of the `dump-hashes` Signed-off-by: Anton Nikiforov --- cmd/frostfs-adm/internal/modules/morph/dump_hashes.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go b/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go index 32f85bce..69db5c7b 100644 --- a/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go +++ b/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go @@ -8,6 +8,7 @@ import ( "text/tabwriter" "git.frostfs.info/TrueCloudLab/frostfs-contract/nns" + morphClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/rpcclient/invoker" "github.com/nspcc-dev/neo-go/pkg/rpcclient/unwrap" @@ -123,7 +124,7 @@ func dumpCustomZoneHashes(cmd *cobra.Command, nnsHash util.Uint160, zone string, return } - if !bytes.HasSuffix(bs, []byte(zone)) { + if !bytes.HasSuffix(bs, []byte(zone)) || bytes.HasPrefix(bs, []byte(morphClient.NNSGroupKeyName)) { // Related https://github.com/nspcc-dev/neofs-contract/issues/316. return } -- 2.45.2 From f2250a316f8cf97abf56b8668029ee622d09821e Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 6 Mar 2023 16:18:25 +0300 Subject: [PATCH 06/70] [#129] tree: Do not remove tree if the netmap is empty Signed-off-by: Evgenii Stratonikov --- pkg/services/tree/sync.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index 96c8f88e..d6646ab9 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -288,7 +288,6 @@ func (s *Service) syncLoop(ctx context.Context) { s.log.Error("could not calculate container nodes", zap.Stringer("cid", cnr), zap.Error(err)) - removed = append(removed, cnr) continue } -- 2.45.2 From 6226c3ba86509d23213005b8e87dd88da6aaa623 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 6 Mar 2023 16:47:35 +0300 Subject: [PATCH 07/70] [#129] policer: Use safer defaults If `processNodes` exits earlier for some reason, `needLocalCopy` could be false. See https://github.com/nspcc-dev/neofs-node/issues/2267 Signed-off-by: Evgenii Stratonikov --- pkg/services/policer/check.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/services/policer/check.go b/pkg/services/policer/check.go index 312dc59b..1da07f45 100644 --- a/pkg/services/policer/check.go +++ b/pkg/services/policer/check.go @@ -127,7 +127,7 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add p.processNodes(c, addrWithType, nn[i], policy.ReplicaNumberByIndex(i), checkedNodes) } - if !c.needLocalCopy { + if !c.needLocalCopy && c.removeLocalCopy { p.log.Info("redundant local object copy detected", zap.Stringer("object", addr), ) @@ -139,7 +139,11 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add type processPlacementContext struct { context.Context + // needLocalCopy is true if the current node must store an object according to the storage policy. needLocalCopy bool + // removeLocalCopy is true if all copies are stored according to the storage policy + // and the current node doesn't need to store an object. + removeLocalCopy bool } func (p *Policer) processNodes(ctx *processPlacementContext, addrWithType objectcore.AddressWithType, @@ -242,9 +246,11 @@ func (p *Policer) processNodes(ctx *processPlacementContext, addrWithType object } else if uncheckedCopies > 0 { // If we have more copies than needed, but some of them are from the maintenance nodes, // save the local copy. - ctx.needLocalCopy = true p.log.Debug("some of the copies are stored on nodes under maintenance, save local copy", zap.Int("count", uncheckedCopies)) + } else if uncheckedCopies == 0 { + // Safe to remove: checked all copies, shortage == 0. + ctx.removeLocalCopy = true } } -- 2.45.2 From 24a540caa8369d7edecee97be14f85fa3e4303fd Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Wed, 15 Feb 2023 21:11:48 +0400 Subject: [PATCH 08/70] [#132] cli/util: Fix basic ACL rendering In previous implementation pretty-printer of basic ACL in NeoFS CLI had mistakes: * F-bit was set to `Extendable()` property instead of its inversion * B-bits were set to `acl.RoleInnerRing` rights Make `PrettyPrintTableBACL` to correctly render mentioned bits. Signed-off-by: Leonard Lyubich --- CHANGELOG.md | 1 + cmd/frostfs-cli/modules/util/acl.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6023e5c1..ae018a33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ Changelog for FrostFS Node - Do not fetch an object if `meta` is missing it (#61) - Create contract wallet only by `init` and `update-config` command (#63) - Actually use `object.put.pool_size_local` and independent pool for local puts (#64). +- Pretty printer of basic ACL in the NeoFS CLI (#2259) ### Removed ### Updated diff --git a/cmd/frostfs-cli/modules/util/acl.go b/cmd/frostfs-cli/modules/util/acl.go index 6620ca70..c8366e5b 100644 --- a/cmd/frostfs-cli/modules/util/acl.go +++ b/cmd/frostfs-cli/modules/util/acl.go @@ -24,7 +24,7 @@ func PrettyPrintTableBACL(cmd *cobra.Command, bacl *acl.Basic) { fmt.Fprintln(w, "\tRangeHASH\tRange\tSearch\tDelete\tPut\tHead\tGet") // Bits bits := []string{ - boolToString(bacl.Sticky()) + " " + boolToString(bacl.Extendable()), + boolToString(bacl.Sticky()) + " " + boolToString(!bacl.Extendable()), getRoleBitsForOperation(bacl, acl.OpObjectHash), getRoleBitsForOperation(bacl, acl.OpObjectRange), getRoleBitsForOperation(bacl, acl.OpObjectSearch), getRoleBitsForOperation(bacl, acl.OpObjectDelete), getRoleBitsForOperation(bacl, acl.OpObjectPut), getRoleBitsForOperation(bacl, acl.OpObjectHead), @@ -47,7 +47,7 @@ func getRoleBitsForOperation(bacl *acl.Basic, op acl.Op) string { return boolToString(bacl.IsOpAllowed(op, acl.RoleOwner)) + " " + boolToString(bacl.IsOpAllowed(op, acl.RoleContainer)) + " " + boolToString(bacl.IsOpAllowed(op, acl.RoleOthers)) + " " + - boolToString(bacl.IsOpAllowed(op, acl.RoleInnerRing)) + boolToString(bacl.AllowedBearerRules(op)) } func boolToString(b bool) string { -- 2.45.2 From 861e9ab59ab060bafc90fb5c91faf6b6aa8cf48c Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 2 Mar 2023 13:56:11 +0300 Subject: [PATCH 09/70] [#83] pre-commit: Add initial configuration Signed-off-by: Evgenii Stratonikov --- .dockerignore | 2 +- .golangci.yml | 1 - .pre-commit-config.yaml | 19 +++ CHANGELOG.md | 120 +++++++++--------- CREDITS.md | 2 +- Makefile | 0 cmd/frostfs-adm/README.md | 27 ++-- cmd/frostfs-adm/docs/deploy.md | 44 +++---- cmd/frostfs-adm/docs/subnetwork-creation.md | 4 +- cmd/frostfs-adm/docs/subnetwork-usage.md | 10 +- .../modules/acl/extended/create.go | 10 +- cmd/frostfs-cli/modules/container/create.go | 2 +- cmd/frostfs-cli/modules/container/delete.go | 2 +- config/example/README.md | 6 +- config/mainnet/README.md | 4 +- config/testnet/README.md | 24 ++-- debian/clean | 2 +- debian/copyright | 4 +- debian/frostfs-ir.postinst | 0 debian/frostfs-ir.postrm | 0 debian/frostfs-ir.preinst | 0 debian/frostfs-ir.prerm | 0 debian/frostfs-storage.postinst | 0 debian/frostfs-storage.postrm | 0 debian/frostfs-storage.preinst | 0 debian/frostfs-storage.prerm | 0 docs/shard-modes.md | 4 +- docs/storage-node-configuration.md | 8 +- docs/update-go-instruction.md | 2 +- pkg/local_object_storage/metabase/VERSION.md | 6 +- pkg/util/autocomplete/autocomplete.go | 6 +- 31 files changed, 163 insertions(+), 146 deletions(-) create mode 100644 .pre-commit-config.yaml mode change 100644 => 100755 Makefile mode change 100644 => 100755 debian/frostfs-ir.postinst mode change 100644 => 100755 debian/frostfs-ir.postrm mode change 100644 => 100755 debian/frostfs-ir.preinst mode change 100644 => 100755 debian/frostfs-ir.prerm mode change 100644 => 100755 debian/frostfs-storage.postinst mode change 100644 => 100755 debian/frostfs-storage.postrm mode change 100644 => 100755 debian/frostfs-storage.preinst mode change 100644 => 100755 debian/frostfs-storage.prerm diff --git a/.dockerignore b/.dockerignore index ea5f3293..4a4248d9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,4 +5,4 @@ docker-compose.yml Dockerfile temp .dockerignore -docker \ No newline at end of file +docker diff --git a/.golangci.yml b/.golangci.yml index 54a2261c..3adfd0f1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -53,4 +53,3 @@ linters: - whitespace disable-all: true fast: false - diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 00000000..9c6f6048 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,19 @@ +ci: + autofix_prs: false + +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: check-added-large-files + - id: check-case-conflict + - id: check-executables-have-shebangs + - id: check-shebang-scripts-are-executable + - id: check-merge-conflict + - id: check-json + - id: check-xml + - id: check-yaml + - id: trailing-whitespace + args: [--markdown-linebreak-ext=md] + - id: end-of-file-fixer + exclude: ".key$" diff --git a/CHANGELOG.md b/CHANGELOG.md index ae018a33..74a7a33b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -199,7 +199,7 @@ Tree service network replication can now be fine-tuned with `tree.replication_ti - `neo-go` to `v0.99.4` - `protoc` to `v3.21.7` - `neofs-sdk` to `v1.0.0-rc.7` - + ### Updating from v0.33.0 Now storage node serves Control API `SetNemapStatus` request with `MAINTENANCE` status only if the mode is allowed in the network settings. To force starting the local @@ -237,7 +237,7 @@ command. - Policer marks nodes under maintenance as OK without requests (#1680) - Unify help messages in CLI (#1854) - `evacuate`, `set-mode` and `flush-cache` control subcommands now accept a list of shard ids (#1867) -- Reading `object` commands of NeoFS CLI don't open remote sessions (#1865) +- Reading `object` commands of NeoFS CLI don't open remote sessions (#1865) - Use hex format to print storage node ID (#1765) ### Fixed @@ -265,7 +265,7 @@ command. - `neofs-contract` to `v0.16.0` - `neofs-api-go` to `v2.14.0` -### Updating from v0.32.0 +### Updating from v0.32.0 Replace using the `control netmap-snapshot` command with `netmap snapshot` one in NeoFS CLI. Node can now specify additional addresses in `ExternalAddr` attribute. To allow a node to dial other nodes external address, use `apiclient.allow_external` config setting. @@ -275,7 +275,7 @@ Pass `maintenance` state to `neofs-cli control set-status` to enter maintenance If network allows maintenance state (*), it will be reflected in the network map. Storage nodes under maintenance are not excluded from the network map, but don't serve object operations. (*) can be fetched from network configuration via -`neofs-cli netmap netinfo` command. +`neofs-cli netmap netinfo` command. To allow maintenance mode during neofs-adm deployments, set `network.maintenance_mode_allowed` parameter in config. @@ -570,15 +570,15 @@ Clean up all metabases and re-sync them using `resync_metabase` config flag. - Reduced amount of slices with pointers (#1239) ### Updating from v0.28.0-rc.2 -Remove `NEOFS_IR_MAINNET_ENDPOINT_NOTIFICATION`, +Remove `NEOFS_IR_MAINNET_ENDPOINT_NOTIFICATION`, `NEOFS_IR_MORPH_ENDPOINT_NOTIFICATION`, and `NEOFS_MORPH_NOTIFICATION_ENDPOINT` -from Inner Ring and Storage configurations. +from Inner Ring and Storage configurations. Specify _WebSocket_ endpoints in `NEOFS_IR_MAINNET_ENDPOINT_CLIENT`, `NEOFS_IR_MORPH_ENDPOINT_CLIENT`, and `NEOFS_MORPH_RPC_ENDPOINT` at Inner Ring and Storage configurations. -Specify path to persistent session token db in Storage configuration with +Specify path to persistent session token db in Storage configuration with `NEOFS_NODE_PERSISTENT_SESSIONS_PATH`. ## [0.28.0-rc.2] - 2022-03-24 @@ -594,7 +594,7 @@ Specify path to persistent session token db in Storage configuration with ## [0.28.0-rc.1] - 2022-03-18 -Native RFC-6979 signatures of messages and tokens, LOCK object types, +Native RFC-6979 signatures of messages and tokens, LOCK object types, experimental notifications over NATS with NeoFS API v2.12 support ### Fixed @@ -630,8 +630,8 @@ experimental notifications over NATS with NeoFS API v2.12 support - Deprecated structures from SDK v1.0.0 rc (#1181) ### Updating from neofs-node v0.27.5 -Set shard error threshold for read-only mode switch with -`NEOFS_STORAGE_SHARD_RO_ERROR_THRESHOLD` (default: 0, deactivated). +Set shard error threshold for read-only mode switch with +`NEOFS_STORAGE_SHARD_RO_ERROR_THRESHOLD` (default: 0, deactivated). Set NATS configuration for notifications in `NEOFS_NODE_NOTIFICATION` section. See example config for more details. @@ -697,7 +697,7 @@ See example config for more details. Use `--wallet` key in CLI to provide WIF or binary key file instead of `--wif` and `--binary-key`. -Replace `NEOFS_STORAGE_SHARD_N_USE_WRITE_CACHE` with +Replace `NEOFS_STORAGE_SHARD_N_USE_WRITE_CACHE` with `NEOFS_STORAGE_SHARD_N_WRITECACHE_ENABLED` in Storage node config. Specify `password: xxx` in config file for NeoFS CLI to avoid password input. @@ -774,7 +774,7 @@ NeoFS API v2.11.0 support with response status codes and storage subnetworks. - CLI now opens LOCODE database in read-only mode for listing command (#958) - Tombstone owner now is always set (#842) - Node in relay mode does not require shard config anymore (#969) -- Alphabet nodes now ignore notary notifications with non-HALT main tx (#976) +- Alphabet nodes now ignore notary notifications with non-HALT main tx (#976) - neofs-adm now prints version of NNS contract (#1014) - Possible NPE in blobovnicza (#1007) - More precise calculation of blobovnicza size (#915) @@ -791,13 +791,13 @@ NeoFS API v2.11.0 support with response status codes and storage subnetworks. - Alphabet nodes resign `AddPeer` request if it updates Storage node info (#938) - All applications now use client from neofs-sdk-go library (#966) - Some shard configuration records were renamed, see upgrading section (#859) -- `Nonce` and `VUB` values of notary transactions generated from notification +- `Nonce` and `VUB` values of notary transactions generated from notification hash (#844) - Non alphabet notary invocations now have 4 witnesses (#975) - Object replication is now async and continuous (#965) - NeoFS ADM updated for the neofs-contract v0.13.0 deploy (#984) - Minimal TLS version is set to v1.2 (#878) -- Alphabet nodes now invoke `netmap.Register` to add node to the network map +- Alphabet nodes now invoke `netmap.Register` to add node to the network map candidates in notary enabled environment (#1008) ### Upgrading from v0.26.1 @@ -827,7 +827,7 @@ with `NEOFS_IR_FEE_NAMED_CONTAINER_REGISTER`. ### Fixed - Storage Node handles requests before its initialization is finished (#934) - Release worker pools gracefully (#901) -- Metabase ignored containers of storage group and tombstone objects +- Metabase ignored containers of storage group and tombstone objects in listing (#945) - CLI missed endpoint flag in `control netmap-snapshot` command (#942) - Write cache object persisting (#866) @@ -841,16 +841,16 @@ with `NEOFS_IR_FEE_NAMED_CONTAINER_REGISTER`. ### Changed - Use FSTree counter in write cache (#821) -- Calculate notary deposit `till` parameter depending on available +- Calculate notary deposit `till` parameter depending on available deposit (#910) -- Storage node returns session token error if attached token's private key +- Storage node returns session token error if attached token's private key is not available (#943) - Refactor of NeoFS API client in inner ring (#946) -- LOCODE generator tries to find the closest continent if there are +- LOCODE generator tries to find the closest continent if there are no exact match (#955) ### Upgrading from v0.26.0 -You can specify default section in storage engine configuration. +You can specify default section in storage engine configuration. See [example](./config/example/node.yaml) for more details. ## [0.26.0] - 2021-10-19 - Udo (우도, 牛島) @@ -860,7 +860,7 @@ NeoFS API v2.10 support ### Fixed - Check remote node public key in every response message (#645) - Do not lose local container size estimations (#872) -- Compressed and uncompressed objects are always available for reading +- Compressed and uncompressed objects are always available for reading regardless of compression configuration (#868) - Use request session token in ACL check of object.Put (#881) - Parse URI in neofs-cli properly (#883) @@ -914,7 +914,7 @@ instead. ### Added - Support of multiple Neo RPC endpoints in Inner Ring node (#792) -`mainchain` section of storage node config is left unused by the application. +`mainchain` section of storage node config is left unused by the application. ## [0.25.0] - 2021-09-27 - Mungapdo (문갑도, 文甲島) @@ -922,7 +922,7 @@ instead. - Work of a storage node with one Neo RPC endpoint instead of a list (#746) - Lack of support for HEAD operation on the object write cache (#762) - Storage node attribute parsing is stable now (#787) -- Inner Ring node now logs transaction hashes of Deposit and Withdraw events +- Inner Ring node now logs transaction hashes of Deposit and Withdraw events in LittleEndian encoding (#794) - Storage node uses public keys of the remote nodes in placement traverser checks (#645) @@ -930,7 +930,7 @@ instead. (#816) - neofs-adm supports update and deploy of neofs-contract v0.11.0 (#834, #836) - Possible NPE in public key conversion (#848) -- Object assembly routine do not forward existing request instead of creating +- Object assembly routine do not forward existing request instead of creating new one (#839) - Shard now returns only physical stored objects for replication (#840) @@ -939,7 +939,7 @@ instead. - Smart contract address auto negotiation with NNS contract (#736) - Detailed logs for all data writing operations in storage engine (#790) - Docker build and release targets in Makefile (#785) -- Metabase restore option in the shard config (#789) +- Metabase restore option in the shard config (#789) - Write cache used size limit in bytes (#776) ### Changed @@ -974,7 +974,7 @@ Added `NEOFS_STORAGE_SHARD__WRITECACHE_SIZE_LIMIT` where `` is shard ID. This is the size limit for the all write cache storages combined in bytes. Default size limit is 1 GiB. -Added `NEOFS_STORAGE_SHARD__REFILL_METABASE` bool flag where `` is shard +Added `NEOFS_STORAGE_SHARD__REFILL_METABASE` bool flag where `` is shard ID. This flag purges metabase instance at the application start and reinitialize it with available objects from the blobstor. @@ -983,12 +983,12 @@ Object service pool size now split into `NEOFS_OBJECT_PUT_POOL_SIZE_REMOTE` and ## [0.24.1] - 2021-09-07 -### Fixed +### Fixed - Storage and Inner Ring will not start until Neo RPC node will have the height of the latest processed block by the nodes (#795) ### Upgrading from v0.24.0 -Specify path to the local state DB in Inner Ring node config with +Specify path to the local state DB in Inner Ring node config with `NEOFS_IR_NODE_PERSISTENT_STATE_PATH`. Specify path to the local state DB in Storage node config with `NEOFS_NODE_PERSISTENT_STATE_PATH`. @@ -1007,7 +1007,7 @@ Storage node config with `NEOFS_NODE_PERSISTENT_STATE_PATH`. - Contract update support in `neofs-adm` utility (#748) - Container transferring support in `neofs-adm` utility (#755) - Storage Node's balance refilling support in `neofs-adm` utility (#758) -- Support `COMMON_PREFIX` filter for object attributes in storage engine and `neofs-cli` (#760) +- Support `COMMON_PREFIX` filter for object attributes in storage engine and `neofs-cli` (#760) - Node's and IR's notary status debug message on startup (#758) - Go `1.17` unit tests in CI (#766) - Supporting all eACL filter fields from the specification (#768) @@ -1069,7 +1069,7 @@ Improved stability for notary disabled environment. - Storage Node configuration example contains usable parameters (#699) ### Fixed -- Do not use side chain RoleManagement contract as source of Inner Ring list +- Do not use side chain RoleManagement contract as source of Inner Ring list when notary disabled in side chain (#672) - Alphabet list transition is even more effective (#697) - Inner Ring node does not require proxy and processing contracts if notary @@ -1136,9 +1136,9 @@ Storage nodes with a group of network endpoints. - Control service with healthcheck RPC in IR and CLI support ([#414](https://github.com/nspcc-dev/neofs-node/issues/414)). ### Fixed -- Approval of objects with with duplicate attribute keys or empty values ([#633](https://github.com/nspcc-dev/neofs-node/issues/633)). +- Approval of objects with with duplicate attribute keys or empty values ([#633](https://github.com/nspcc-dev/neofs-node/issues/633)). - Approval of containers with with duplicate attribute keys or empty values ([#634](https://github.com/nspcc-dev/neofs-node/issues/634)). -- Default path for CLI config ([#626](https://github.com/nspcc-dev/neofs-node/issues/626)). +- Default path for CLI config ([#626](https://github.com/nspcc-dev/neofs-node/issues/626)). ### Changed - `version` command replaced with `--version` flag in CLI ([#571](https://github.com/nspcc-dev/neofs-node/issues/571)). @@ -1166,7 +1166,7 @@ Storage nodes with a group of network endpoints. - grpc: [v1.38.0](https://github.com/grpc/grpc-go/releases/tag/v1.38.0). - cast: [v1.3.1](https://github.com/spf13/cast/releases/tag/v1.3.1). - cobra: [1.1.3](https://github.com/spf13/cobra/releases/tag/v1.1.3). -- viper: [v1.8.1](https://github.com/spf13/viper/releases/tag/v1.8.1). +- viper: [v1.8.1](https://github.com/spf13/viper/releases/tag/v1.8.1). ## [0.21.1] - 2021-06-10 @@ -1186,7 +1186,7 @@ Session token support in container service, refactored config in storage node, TLS support on gRPC servers. ### Fixed -- ACL service traverses over all RequestMetaHeader chain to find +- ACL service traverses over all RequestMetaHeader chain to find bearer and session tokens (#548). - Object service correctly resends complete objects without attached session token (#501). @@ -1194,7 +1194,7 @@ TLS support on gRPC servers. - Client cache now gracefully closes all available connections (#567). ### Added -- Session token support in container service for `container.Put`, +- Session token support in container service for `container.Put`, `container.Delete` and `container.SetEACL` operations. - Session token support in container and sign command of NeoFS CLI. - TLS encryption support of gRPC service in storage node. @@ -1204,8 +1204,8 @@ TLS support on gRPC servers. update earlier. - Inner ring processes extended ACL changes. - Inner ring makes signature checks of containers and extended ACLs. -- Refactored config of storage node. -- Static clients from `morph/client` do not process notary invocations +- Refactored config of storage node. +- Static clients from `morph/client` do not process notary invocations explicitly anymore. Now notary support specified at static client creation. - Updated neo-go to v0.95.1 release. - Updated neofs-api-go to v1.27.0 release. @@ -1216,7 +1216,7 @@ TLS support on gRPC servers. ## [0.20.0] - 2021-05-21 - Dolsando (돌산도, 突山島) -NeoFS is N3 RC2 compatible. +NeoFS is N3 RC2 compatible. ### Fixed - Calculations in EigenTrust algorithm (#527). @@ -1229,7 +1229,7 @@ NeoFS is N3 RC2 compatible. - Client for NeoFSID contract. ### Changed -- Reorganized and removed plenty of application configuration records +- Reorganized and removed plenty of application configuration records (#510, #511, #512, #514). - Nodes do not resolve remote addresses manually. - Presets for basic ACL in CLI are `private` ,`public-read` and @@ -1247,11 +1247,11 @@ NeoFS is N3 RC2 compatible. Storage nodes exchange, calculate, aggregate and store reputation information in reputation contract. Inner ring nodes support workflows with and without -notary subsystem in chains. +notary subsystem in chains. ### Fixed - Build with go1.16. -- Notary deposits last more blocks. +- Notary deposits last more blocks. - TX hashes now prints in little endian in logs. - Metabase deletes graves regardless of the presence of objects. - SplitInfo error created from all shards instead of first matched shard. @@ -1259,7 +1259,7 @@ notary subsystem in chains. - Storage node does not send rebootstrap messages after it went offline. ### Added -- Reputation subsystem that includes reputation collection, exchange, +- Reputation subsystem that includes reputation collection, exchange, calculation and storage components. - Notary and non notary workflows in inner ring. - Audit fee transfer for inner ring nodes that performed audit. @@ -1269,7 +1269,7 @@ calculation and storage components. ### Changed - Metabase puts data in batches. -- Network related new epoch handlers in storage node executed asynchronously. +- Network related new epoch handlers in storage node executed asynchronously. - Storage node gets epoch duration from global config. - Storage node resign and resend Search, Range, Head, Get requests of object service without modification. @@ -1286,7 +1286,7 @@ alphabet keys are synchronized with main chain. ### Fixed - Metabase does not store object payloads anymore. - TTLNetCache now always evict data after a timeout. -- NeoFS CLI keyer could misinterpret hex value as base58. +- NeoFS CLI keyer could misinterpret hex value as base58. ### Added - Local trust controller in storage node. @@ -1298,7 +1298,7 @@ alphabet keys are synchronized with main chain. ## [0.17.0] - 2021-03-22 - Jebudo (제부도, 濟扶島) -Notary contract support, updated neofs-api-go with raw client, some performance +Notary contract support, updated neofs-api-go with raw client, some performance tweaks with extra caches and enhanced metrics. ### Added @@ -1317,7 +1317,7 @@ tweaks with extra caches and enhanced metrics. Garbage collector is now running inside storage engine. It is accessed via Control API, from `policer` component and through object expiration -scrubbers. +scrubbers. Inner ring configuration now supports single chain mode with any number of alphabet contracts. @@ -1348,39 +1348,39 @@ Storage node now supports NetworkInfo method in netmap service. ## [0.15.0] - 2021-02-12 - Seonyudo (선유도, 仙遊島) -NeoFS nodes are now preview5-compatible. +NeoFS nodes are now preview5-compatible. IR nodes are now engaged in the distribution of funds to the storage nodes: -for the passed audit and for the amount of stored information. All timers -of the IR nodes related to the generation and processing of global system -events are decoupled from astronomical time, and are measured in the number +for the passed audit and for the amount of stored information. All timers +of the IR nodes related to the generation and processing of global system +events are decoupled from astronomical time, and are measured in the number of blockchain blocks. For the geographic positioning of storage nodes, a global NeoFS location -database is now used, the key in which is a UN/LOCODE, and the base itself +database is now used, the key in which is a UN/LOCODE, and the base itself is generated on the basis of the UN/LOCODE and OpenFlights databases. ### Added - Timers with time in blocks of the chain. - Subscriptions to new blocks in blockchain event `Listener`. -- Tracking the volume of stored information by containers in the +- Tracking the volume of stored information by containers in the storage engine and an external interface for obtaining this data. - `TransferX` operation in sidechain client. - Calculators of audit and basic settlements. -- Distribution of funds to storage nodes for audit and for the amount +- Distribution of funds to storage nodes for audit and for the amount of stored information (settlement processors of IR). - NeoFS API `Container.AnnounceUsedSpace` RPC service. -- Exchange of information about container volumes between storage nodes +- Exchange of information about container volumes between storage nodes controlled by IR through sidechain notifications. - Support of new search matchers (`STRING_NOT_EQUAL`, `NOT_PRESENT`). - Functional for the formation of NeoFS location database. - CLI commands for generating and reading the location database. -- Checking the locode attribute and generating geographic attributes +- Checking the locode attribute and generating geographic attributes for candidates for a network map on IR side. - Verification of the eACL signature when checking Object ACL rules. ### Fixed -- Overwriting the local configuration of node attributes when updating +- Overwriting the local configuration of node attributes when updating the network map. - Ignoring the X-headers CLI `storagegroup` commands. - Inability to attach bearer token in CLI `storagegroup` commands. @@ -1398,7 +1398,7 @@ is generated on the basis of the UN/LOCODE and OpenFlights databases. ### Fixed - Upload of objects bigger than single gRPC message. - Inconsistent placement issues (#347, #349). -- Bug when ACL request classifier failed to classify `RoleOthers` in +- Bug when ACL request classifier failed to classify `RoleOthers` in first epoch. ### Added @@ -1412,13 +1412,13 @@ is generated on the basis of the UN/LOCODE and OpenFlights databases. Testnet4 related bugfixes. -### Fixed -- Default values for blobovnicza object size limit and blobstor small object +### Fixed +- Default values for blobovnicza object size limit and blobstor small object size are not zero. - Various storage engine log messages. - Bug when inner ring node ignored bootstrap messages from restarted storage - nodes. - + nodes. + ### Added - Timeout for reading boltDB files at storage node initialization. diff --git a/CREDITS.md b/CREDITS.md index 14b9648b..ce4050b7 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -10,7 +10,7 @@ In alphabetical order: - Alexey Vanin - Anastasia Prasolova - Anatoly Bogatyrev -- Evgeny Kulikov +- Evgeny Kulikov - Evgeny Stratonikov - Leonard Liubich - Sergei Liubich diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 diff --git a/cmd/frostfs-adm/README.md b/cmd/frostfs-adm/README.md index d9df256e..dac26423 100644 --- a/cmd/frostfs-adm/README.md +++ b/cmd/frostfs-adm/README.md @@ -3,31 +3,30 @@ ## Overview Admin tool provides an easier way to deploy and maintain private installation -of FrostFS. Private installation provides a set of N3 consensus nodes, FrostFS -Alphabet, and Storage nodes. Admin tool generates consensus keys, initializes +of FrostFS. Private installation provides a set of N3 consensus nodes, FrostFS +Alphabet, and Storage nodes. Admin tool generates consensus keys, initializes the sidechain, and provides functions to update the network and register new Storage nodes. ## Build -To build binary locally, use `make bin/frostfs-adm` command. +To build binary locally, use `make bin/frostfs-adm` command. -For clean build inside a docker container, use `make docker/bin/frostfs-adm`. +For clean build inside a docker container, use `make docker/bin/frostfs-adm`. Build docker image with `make image-adm`. -At FrostFS private install deployment, frostfs-adm requires compiled FrostFS -contracts. Find them in the latest release of +At FrostFS private install deployment, frostfs-adm requires compiled FrostFS +contracts. Find them in the latest release of [frostfs-contract repository](https://git.frostfs.info/TrueCloudLab/frostfs-contract/releases). - ## Commands ### Config Config section provides `init` command that creates a configuration file for private installation deployment and updates. Config file is optional, all -parameters can be passed by arguments or read from standard input (wallet +parameters can be passed by arguments or read from standard input (wallet passwords). Config example: @@ -58,14 +57,14 @@ credentials: # passwords for consensus node / alphabet wallets #### Network deployment -- `generate-alphabet` generates a set of wallets for consensus and - Alphabet nodes. +- `generate-alphabet` generates a set of wallets for consensus and + Alphabet nodes. - `init` initializes the sidechain by deploying smart contracts and setting provided FrostFS network configuration. -- `generate-storage-wallet` generates a wallet for the Storage node that - is ready for deployment. It also transfers a bit of sidechain GAS, so this +- `generate-storage-wallet` generates a wallet for the Storage node that + is ready for deployment. It also transfers a bit of sidechain GAS, so this wallet can be used for FrostFS bootstrap. #### Network maintenance @@ -75,7 +74,7 @@ credentials: # passwords for consensus node / alphabet wallets - `force-new-epoch` increments FrostFS epoch number and executes new epoch handlers in FrostFS nodes. -- `refill-gas` transfers sidechain GAS to the specified wallet. +- `refill-gas` transfers sidechain GAS to the specified wallet. - `update-contracts` updates contracts to a new version. @@ -87,7 +86,7 @@ info. These commands **do not migrate actual objects**. - `dump-containers` saves all containers and metadata registered in the container contract to a file. -- `restore-containers` restores previously saved containers by their repeated registration in +- `restore-containers` restores previously saved containers by their repeated registration in the container contract. - `list-containers` output all containers ids. diff --git a/cmd/frostfs-adm/docs/deploy.md b/cmd/frostfs-adm/docs/deploy.md index da3aa707..a1923bb2 100644 --- a/cmd/frostfs-adm/docs/deploy.md +++ b/cmd/frostfs-adm/docs/deploy.md @@ -2,7 +2,7 @@ This is a short guide on how to deploy a private FrostFS storage network on bare metal without docker images. This guide does not cover details on how to start -consensus, Alphabet, or Storage nodes. This guide covers only `frostfs-adm` +consensus, Alphabet, or Storage nodes. This guide covers only `frostfs-adm` related configuration details. ## Prerequisites @@ -12,11 +12,11 @@ To follow this guide you need: - latest released version of [frostfs-adm](https://github.com/TrueCloudLab/frostfs-node/releases) utility (v0.25.1 at the moment), - latest released version of compiled [frostfs-contract](https://github.com/TrueCloudLab/frostfs-contract/releases) (v0.11.0 at the moment). -## Step 1: Prepare network configuration +## Step 1: Prepare network configuration -To start a network, you need a set of consensus nodes, the same number of -Alphabet nodes and any number of Storage nodes. While the number of Storage -nodes can be scaled almost infinitely, the number of consensus and Alphabet +To start a network, you need a set of consensus nodes, the same number of +Alphabet nodes and any number of Storage nodes. While the number of Storage +nodes can be scaled almost infinitely, the number of consensus and Alphabet nodes can't be changed so easily right now. Consider this before going any further. It is easier to use`frostfs-adm` with a predefined configuration. First, create @@ -27,7 +27,7 @@ consensus / Alphabet node in the network. $ frostfs-adm config init --path foo.network.yml Initial config file saved to foo.network.yml -$ cat foo.network.yml +$ cat foo.network.yml rpc-endpoint: https://neo.rpc.node:30333 alphabet-wallets: /home/user/deploy/alphabet-wallets network: @@ -43,17 +43,17 @@ credentials: az: hunter2 ``` -For private installation, it is recommended to set all **fees** and **basic -income rate** to 0. +For private installation, it is recommended to set all **fees** and **basic +income rate** to 0. -As for **epoch duration**, consider consensus node block generation frequency. -With default 15 seconds per block, 240 blocks are going to be a 1-hour epoch. +As for **epoch duration**, consider consensus node block generation frequency. +With default 15 seconds per block, 240 blocks are going to be a 1-hour epoch. -For **max object size**, 67108864 (64 MiB) or 134217728 (128 MiB) should provide +For **max object size**, 67108864 (64 MiB) or 134217728 (128 MiB) should provide good chunk distribution in most cases. With this config, generate wallets (private keys) of consensus nodes. The same -wallets will be used for Alphabet nodes. Make sure, that dir for alphabet +wallets will be used for Alphabet nodes. Make sure, that dir for alphabet wallets already exists. ``` @@ -69,14 +69,14 @@ storage. ## Step 2: Launch consensus nodes Configure blockchain nodes with the generated wallets from the previous step. -Config examples can be found in +Config examples can be found in [neo-go repository](https://github.com/nspcc-dev/neo-go/tree/master/config). Gather public keys from **all** generated wallets. We are interested in the first `simple signature contract` public key. ``` -$ neo-go wallet dump-keys -w alphabet-wallets/az.json +$ neo-go wallet dump-keys -w alphabet-wallets/az.json NitdS4k4f1Hh5mbLJhAswBK3WC2gQgPN1o (simple signature contract): 02c1cc85f9c856dbe2d02017349bcb7b4e5defa78b8056a09b3240ba2a8c078869 @@ -87,10 +87,10 @@ NiMKabp3ddi3xShmLAXhTfbnuWb4cSJT6E (1 out of 1 multisig contract): 02c1cc85f9c856dbe2d02017349bcb7b4e5defa78b8056a09b3240ba2a8c078869 ``` -Put the list of public keys into `ProtocolConfiguration.StandbyCommittee` +Put the list of public keys into `ProtocolConfiguration.StandbyCommittee` section. Specify the wallet path and the password in `ApplicationConfiguration.P2PNotary` and `ApplicationConfiguration.UnlockWallet` sections. If config includes -`ProtocolConfiguration.NativeActivations` section, add notary +`ProtocolConfiguration.NativeActivations` section, add notary contract `Notary: [0]`. ```yaml @@ -121,7 +121,7 @@ and possible overload issues. Use archive with compiled FrostFS contracts to initialize the sidechain. ``` -$ tar -xzvf frostfs-contract-v0.11.0.tar.gz +$ tar -xzvf frostfs-contract-v0.11.0.tar.gz $ ./frostfs-adm -c foo.network.yml morph init --contracts ./frostfs-contract-v0.11.0 Stage 1: transfer GAS to alphabet nodes. @@ -153,8 +153,8 @@ Waiting for transactions to persist... ## Step 4: Launch Alphabet nodes -Configure Alphabet nodes with the wallets generated in step 1. For -`morph.validators` use a list of public keys from +Configure Alphabet nodes with the wallets generated in step 1. For +`morph.validators` use a list of public keys from `ProtocolConfiguration.StandbyCommittee`. ```yaml @@ -178,10 +178,10 @@ Generate a new wallet for a Storage node. ``` $ frostfs-adm -c foo.network.yml morph generate-storage-wallet --storage-wallet ./sn01.json --initial-gas 10.0 -New password > +New password > Waiting for transactions to persist... -$ neo-go wallet dump-keys -w sn01.json +$ neo-go wallet dump-keys -w sn01.json Ngr7p8Z9S22XDH6VkUG9oXobv8zZRAWwwv (simple signature contract): 0355eccb72cd46f09a3e5237eaa0f4949cceb5ecfa5a225bd3bb9fd021c4d75b85 ``` @@ -205,7 +205,7 @@ Current epoch: 8, increase to 9. Waiting for transactions to persist... ``` ---- +--- After that, FrostFS Storage is ready to work. You can access it directly or with protocol gates. diff --git a/cmd/frostfs-adm/docs/subnetwork-creation.md b/cmd/frostfs-adm/docs/subnetwork-creation.md index 0c969028..5ada9438 100644 --- a/cmd/frostfs-adm/docs/subnetwork-creation.md +++ b/cmd/frostfs-adm/docs/subnetwork-creation.md @@ -1,7 +1,7 @@ # FrostFS subnetwork creation -This is a short guide on how to create FrostFS subnetworks. This guide -considers that the sidechain and the inner ring (alphabet nodes) have already been +This is a short guide on how to create FrostFS subnetworks. This guide +considers that the sidechain and the inner ring (alphabet nodes) have already been deployed and the sidechain contains a deployed `subnet` contract. ## Prerequisites diff --git a/cmd/frostfs-adm/docs/subnetwork-usage.md b/cmd/frostfs-adm/docs/subnetwork-usage.md index 6bfa4d18..0d505b3a 100644 --- a/cmd/frostfs-adm/docs/subnetwork-usage.md +++ b/cmd/frostfs-adm/docs/subnetwork-usage.md @@ -88,11 +88,11 @@ has been added by the subnet owner). # Bootstrapping Storage Node -After a subnetwork [is created](subnetwork-creation.md) and a node is included into it, the +After a subnetwork [is created](subnetwork-creation.md) and a node is included into it, the node could be bootstrapped and service subnetwork containers. -For bootstrapping, you need to specify the ID of the subnetwork in the node's -configuration: +For bootstrapping, you need to specify the ID of the subnetwork in the node's +configuration: ```yaml ... @@ -106,7 +106,7 @@ node: ``` **NOTE:** specifying subnetwork that is denied for the node is not an error: -that configuration value would be ignored. You do not need to specify zero +that configuration value would be ignored. You do not need to specify zero (with 0 ID) subnetwork: its inclusion is implicit. On the contrary, to exclude a node from the default zero subnetwork, you need to specify it explicitly: @@ -122,7 +122,7 @@ node: # Creating container in non-zero subnetwork -Creating containers without using `--subnet` flag is equivalent to +Creating containers without using `--subnet` flag is equivalent to creating container in the zero subnetwork. To create a container in a private network, your wallet must be added to diff --git a/cmd/frostfs-cli/modules/acl/extended/create.go b/cmd/frostfs-cli/modules/acl/extended/create.go index f089345e..7da26f8e 100644 --- a/cmd/frostfs-cli/modules/acl/extended/create.go +++ b/cmd/frostfs-cli/modules/acl/extended/create.go @@ -26,18 +26,18 @@ Action is 'allow' or 'deny'. Operation is an object service verb: 'get', 'head', 'put', 'search', 'delete', 'getrange', or 'getrangehash'. Filter consists of : - Typ is 'obj' for object applied filter or 'req' for request applied filter. - Key is a valid unicode string corresponding to object or request header key. + Typ is 'obj' for object applied filter or 'req' for request applied filter. + Key is a valid unicode string corresponding to object or request header key. Well-known system object headers start with '$Object:' prefix. User defined headers start without prefix. Read more about filter keys at git.frostfs.info.com/TrueCloudLab/frostfs-api/src/branch/master/proto-docs/acl.md#message-eaclrecordfilter Match is '=' for matching and '!=' for non-matching filter. Value is a valid unicode string corresponding to object or request header value. -Target is - 'user' for container owner, +Target is + 'user' for container owner, 'system' for Storage nodes in container and Inner Ring nodes, - 'others' for all other request senders, + 'others' for all other request senders, 'pubkey:,,...' for exact request sender, where is a hex-encoded 33-byte public key. When both '--rule' and '--file' arguments are used, '--rule' records will be placed higher in resulting extended ACL table. diff --git a/cmd/frostfs-cli/modules/container/create.go b/cmd/frostfs-cli/modules/container/create.go index 78de4082..410663e8 100644 --- a/cmd/frostfs-cli/modules/container/create.go +++ b/cmd/frostfs-cli/modules/container/create.go @@ -37,7 +37,7 @@ var ( var createContainerCmd = &cobra.Command{ Use: "create", Short: "Create new container", - Long: `Create new container and register it in the FrostFS. + Long: `Create new container and register it in the FrostFS. It will be stored in sidechain when inner ring will accepts it.`, Run: func(cmd *cobra.Command, args []string) { placementPolicy, err := parseContainerPolicy(cmd, containerPolicy) diff --git a/cmd/frostfs-cli/modules/container/delete.go b/cmd/frostfs-cli/modules/container/delete.go index 09e76d59..52ee5d4f 100644 --- a/cmd/frostfs-cli/modules/container/delete.go +++ b/cmd/frostfs-cli/modules/container/delete.go @@ -17,7 +17,7 @@ import ( var deleteContainerCmd = &cobra.Command{ Use: "delete", Short: "Delete existing container", - Long: `Delete existing container. + Long: `Delete existing container. Only owner of the container has a permission to remove container.`, Run: func(cmd *cobra.Command, args []string) { id := parseContainerID(cmd) diff --git a/config/example/README.md b/config/example/README.md index afb594b1..8dd0fe44 100644 --- a/config/example/README.md +++ b/config/example/README.md @@ -1,9 +1,9 @@ -# Examples of correct configuration file structures +# Examples of correct configuration file structures Here are files in all supported formats and with all possible configuration values of FrostFS applications. See [node.yaml](node.yaml) for configuration notes. -All parameters are correct, however, they are for informational purposes only. +All parameters are correct, however, they are for informational purposes only. It is not recommended transferring these configs for real application launches. ## Config files @@ -15,7 +15,7 @@ It is not recommended transferring these configs for real application launches. - YAML: `ir.yaml` - CLI - YAML: `cli.yaml` - + ### Multiple configs You can split your configuration to several files. diff --git a/config/mainnet/README.md b/config/mainnet/README.md index 5b2ac7ac..717a9b0f 100644 --- a/config/mainnet/README.md +++ b/config/mainnet/README.md @@ -1,12 +1,12 @@ # N3 Mainnet Storage node configuration Here is a template for simple storage node configuration in N3 Mainnet. -Make sure to specify correct values instead of `<...>` placeholders. +Make sure to specify correct values instead of `<...>` placeholders. Do not change `contracts` section. Run the latest frostfs-node release with the fixed config `frostfs-node -c config.yml` To use NeoFS in the Mainnet, you need to deposit assets to NeoFS contract. -The contract sript hash is `2cafa46838e8b564468ebd868dcafdd99dce6221` +The contract sript hash is `2cafa46838e8b564468ebd868dcafdd99dce6221` (N3 address `NNxVrKjLsRkWsmGgmuNXLcMswtxTGaNQLk`) ## Tips diff --git a/config/testnet/README.md b/config/testnet/README.md index 82cbe3d2..b5faf2b2 100644 --- a/config/testnet/README.md +++ b/config/testnet/README.md @@ -6,8 +6,8 @@ docker image and run it with docker-compose. ## Build image -Prepared **frostfs-storage-testnet** image is available at Docker Hub. -However, if you need to rebuild it for some reason, run +Prepared **frostfs-storage-testnet** image is available at Docker Hub. +However, if you need to rebuild it for some reason, run `make image-storage-testnet` command. ``` @@ -19,13 +19,13 @@ Successfully tagged nspccdev/neofs-storage-testnet:0.25.1 ## Deploy node -To run a storage node in N3 Testnet environment, you should deposit GAS assets, +To run a storage node in N3 Testnet environment, you should deposit GAS assets, update docker-compose file and start the node. ### Deposit -The Storage Node owner should deposit GAS to NeoFS smart contract. It generates a -bit of sidechain GAS in the node's wallet. Sidechain GAS is used to send bootstrap tx. +The Storage Node owner should deposit GAS to NeoFS smart contract. It generates a +bit of sidechain GAS in the node's wallet. Sidechain GAS is used to send bootstrap tx. First, obtain GAS in N3 Testnet chain. You can do that with [faucet](https://neowish.ngd.network) service. @@ -34,7 +34,7 @@ Then, make a deposit by transferring GAS to NeoFS contract in N3 Testnet. You can provide scripthash in the `data` argument of transfer tx to make a deposit to a specified account. Otherwise, deposit is made to the tx sender. -NeoFS contract scripthash in N3 Testnet is `b65d8243ac63983206d17e5221af0653a7266fa1`, +NeoFS contract scripthash in N3 Testnet is `b65d8243ac63983206d17e5221af0653a7266fa1`, so the address is `NadZ8YfvkddivcFFkztZgfwxZyKf1acpRF`. See a deposit example with `neo-go`. @@ -57,7 +57,7 @@ NEOFS_GRPC_0_ENDPOINT=65.52.183.157:36512 NEOFS_NODE_ADDRESSES=65.52.183.157:36512 ``` -Set up your [UN/LOCODE](https://unece.org/trade/cefact/unlocode-code-list-country-and-territory) +Set up your [UN/LOCODE](https://unece.org/trade/cefact/unlocode-code-list-country-and-territory) attribute. ``` @@ -66,7 +66,7 @@ NEOFS_NODE_ADDRESSES=65.52.183.157:36512 NEOFS_NODE_ATTRIBUTE_2=UN-LOCODE:RU LED ``` -You can validate UN/LOCODE attribute in +You can validate UN/LOCODE attribute in [NeoFS LOCODE database](https://github.com/TrueCloudLab/frostfs-locode-db/releases/tag/v0.1.0) with frostfs-cli. @@ -79,7 +79,7 @@ Subdivision: [SPE] Sankt-Peterburg Coordinates: 59.53, 30.15 ``` -It is recommended to pass the node's key as a file. To do so, convert your wallet +It is recommended to pass the node's key as a file. To do so, convert your wallet WIF to 32-byte hex (via `frostfs-cli` for example) and save it to a file. ``` @@ -104,8 +104,8 @@ Then, specify the path to this file in `docker-compose.yml` ``` -NeoFS objects will be stored on your machine. By default, docker-compose -is configured to store objects in named docker volume `frostfs_storage`. You can +NeoFS objects will be stored on your machine. By default, docker-compose +is configured to store objects in named docker volume `frostfs_storage`. You can specify a directory on the filesystem to store objects there. ```yaml @@ -120,7 +120,7 @@ Run the node with `docker-compose up` command and stop it with `docker-compose d ### Debug -To print node logs, use `docker logs frostfs-testnet`. To print debug messages in +To print node logs, use `docker logs frostfs-testnet`. To print debug messages in log, set up log level to debug with this env: ```yaml diff --git a/debian/clean b/debian/clean index f3824914..44dc05e0 100644 --- a/debian/clean +++ b/debian/clean @@ -1,2 +1,2 @@ -man/ +man/ debian/*.bash-completion diff --git a/debian/copyright b/debian/copyright index 61286340..61dab665 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,5 +19,5 @@ License: GPL-3 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 . + along with this program or at /usr/share/common-licenses/GPL-3 + If not, see . diff --git a/debian/frostfs-ir.postinst b/debian/frostfs-ir.postinst old mode 100644 new mode 100755 diff --git a/debian/frostfs-ir.postrm b/debian/frostfs-ir.postrm old mode 100644 new mode 100755 diff --git a/debian/frostfs-ir.preinst b/debian/frostfs-ir.preinst old mode 100644 new mode 100755 diff --git a/debian/frostfs-ir.prerm b/debian/frostfs-ir.prerm old mode 100644 new mode 100755 diff --git a/debian/frostfs-storage.postinst b/debian/frostfs-storage.postinst old mode 100644 new mode 100755 diff --git a/debian/frostfs-storage.postrm b/debian/frostfs-storage.postrm old mode 100644 new mode 100755 diff --git a/debian/frostfs-storage.preinst b/debian/frostfs-storage.preinst old mode 100644 new mode 100755 diff --git a/debian/frostfs-storage.prerm b/debian/frostfs-storage.prerm old mode 100644 new mode 100755 diff --git a/docs/shard-modes.md b/docs/shard-modes.md index 8f5a7d5f..7fca33d0 100644 --- a/docs/shard-modes.md +++ b/docs/shard-modes.md @@ -4,7 +4,7 @@ Each mode is characterized by two important properties: 1. Whether modifying operations are allowed. -2. Whether metabase and write-cache is available. +2. Whether metabase and write-cache is available. The expected deployment scenario is to place both metabase and write-cache on an SSD drive thus these modes can be approximately described as no-SSD modes. @@ -45,4 +45,4 @@ However, all mode changing operations are idempotent. Shard can automatically switch to a `degraded-read-only` mode in 3 cases: 1. If the metabase was not available or couldn't be opened/initialized during shard startup. 2. If shard error counter exceeds threshold. -3. If the metabase couldn't be reopened during SIGHUP handling. \ No newline at end of file +3. If the metabase couldn't be reopened during SIGHUP handling. diff --git a/docs/storage-node-configuration.md b/docs/storage-node-configuration.md index b7725356..16737ab9 100644 --- a/docs/storage-node-configuration.md +++ b/docs/storage-node-configuration.md @@ -45,8 +45,8 @@ control: grpc: - endpoint: localhost:8080 tls: - enabled: true - certificate: /path/to/cert.pem + enabled: true + certificate: /path/to/cert.pem key: /path/to/key.pem - endpoint: internal.ip:8080 - endpoint: external.ip:8080 @@ -237,7 +237,7 @@ gc: | Parameter | Type | Default value | Description | |--------------------------|------------|---------------|----------------------------------------------| | `remover_batch_size` | `int` | `100` | Amount of objects to grab in a single batch. | -| `remover_sleep_interval` | `duration` | `1m` | Time to sleep between iterations. | +| `remover_sleep_interval` | `duration` | `1m` | Time to sleep between iterations. | ### `metabase` subsection @@ -271,7 +271,7 @@ writecache: | Parameter | Type | Default value | Description | |----------------------|------------|---------------|----------------------------------------------------------------------------------------------------------------------| | `path` | `string` | | Path to the metabase file. | -| `capacity` | `size` | unrestricted | Approximate maximum size of the writecache. If the writecache is full, objects are written to the blobstor directly. | +| `capacity` | `size` | unrestricted | Approximate maximum size of the writecache. If the writecache is full, objects are written to the blobstor directly. | | `small_object_size` | `size` | `32K` | Maximum object size for "small" objects. This objects are stored in a key-value database instead of a file-system. | | `max_object_size` | `size` | `64M` | Maximum object size allowed to be stored in the writecache. | | `workers_number` | `int` | `20` | Amount of background workers that move data from the writecache to the blobstor. | diff --git a/docs/update-go-instruction.md b/docs/update-go-instruction.md index f69643d3..f9922504 100644 --- a/docs/update-go-instruction.md +++ b/docs/update-go-instruction.md @@ -30,5 +30,5 @@ Update `GO_VERSION` variable in `./Makefile`. ## Apply language changes -Open PR that fixes/updates repository's code according to +Open PR that fixes/updates repository's code according to language improvements. diff --git a/pkg/local_object_storage/metabase/VERSION.md b/pkg/local_object_storage/metabase/VERSION.md index c9707c00..97e514db 100644 --- a/pkg/local_object_storage/metabase/VERSION.md +++ b/pkg/local_object_storage/metabase/VERSION.md @@ -7,7 +7,7 @@ This file describes changes between the metabase versions. ### Primary buckets - Graveyard bucket - Name: `_Graveyard` - - Key: object address + - Key: object address - Value: tombstone address - Garbage bucket - Name: `_Garbage` @@ -23,7 +23,7 @@ This file describes changes between the metabase versions. - Key: container ID - Value: container size in bytes as little-endian uint64 - Bucket for storing locked objects information - - Name: `_Locked` + - Name: `_Locked` - Key: container ID - Value: bucket mapping objects locked to the list of corresponding LOCK objects - Bucket containing auxilliary information. All keys are custom and are not connected to the container @@ -102,4 +102,4 @@ This file describes changes between the metabase versions. - Container ID is encoded as base58 string - Object ID is encoded as base58 string -- Address is encoded as container ID + "/" + object ID \ No newline at end of file +- Address is encoded as container ID + "/" + object ID diff --git a/pkg/util/autocomplete/autocomplete.go b/pkg/util/autocomplete/autocomplete.go index 1343c30a..89624471 100644 --- a/pkg/util/autocomplete/autocomplete.go +++ b/pkg/util/autocomplete/autocomplete.go @@ -21,15 +21,15 @@ Zsh: If shell completion is not already enabled in your environment you will need to enable it. You can execute the following once: $ echo "autoload -U compinit; compinit" >> ~/.zshrc - + To load completions for each session, execute once: $ %s completion zsh > "${fpath[1]}/_%s" - + You will need to start a new shell for this setup to take effect. Fish: $ %s completion fish | source - + To load completions for each session, execute once: $ %s completion fish > ~/.config/fish/completions/%s.fish ` -- 2.45.2 From a4931ea4c749b9b89ea07690cedf532f3cd8aea2 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 2 Mar 2023 14:02:15 +0300 Subject: [PATCH 10/70] [#83] .github: Remove CODEOWNERS and actions Issue templates are still supported by Gitea: https://docs.gitea.io/en-us/issue-pull-request-templates/ . Signed-off-by: Evgenii Stratonikov --- .github/CODEOWNERS | 1 - .github/logo.svg | 70 ----------------------------- .github/workflows/changelog.yml | 29 ------------ .github/workflows/config-update.yml | 37 --------------- .github/workflows/dco.yml | 22 --------- .github/workflows/go.yml | 60 ------------------------- 6 files changed, 219 deletions(-) delete mode 100644 .github/CODEOWNERS delete mode 100644 .github/logo.svg delete mode 100644 .github/workflows/changelog.yml delete mode 100644 .github/workflows/config-update.yml delete mode 100644 .github/workflows/dco.yml delete mode 100644 .github/workflows/go.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index f007b327..00000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @TrueCloudLab/storage-core @TrueCloudLab/committers diff --git a/.github/logo.svg b/.github/logo.svg deleted file mode 100644 index 148c359d..00000000 --- a/.github/logo.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml deleted file mode 100644 index 5dab3d91..00000000 --- a/.github/workflows/changelog.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: CHANGELOG check - -on: - pull_request: - branches: - - master - - support/** - -jobs: - build: - runs-on: ubuntu-latest - name: Check for updates - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Get changed CHANGELOG - id: changelog-diff - uses: tj-actions/changed-files@v29 - with: - files: CHANGELOG.md - - - name: Fail if changelog not updated - if: steps.changelog-diff.outputs.any_changed == 'false' - uses: actions/github-script@v3 - with: - script: | - core.setFailed('CHANGELOG.md has not been updated') diff --git a/.github/workflows/config-update.yml b/.github/workflows/config-update.yml deleted file mode 100644 index a24c6981..00000000 --- a/.github/workflows/config-update.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Configuration check - -on: - pull_request: - branches: - - master - - support/** - -jobs: - build: - runs-on: ubuntu-latest - name: config-check - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Get changed config-related files - id: config-diff - uses: tj-actions/changed-files@v29 - with: - files: | - config/** - cmd/neofs-node/config/** - - - name: Get changed doc files - id: docs-diff - uses: tj-actions/changed-files@v29 - with: - files: docs/** - - - name: Fail if config files are changed but the documentation is not updated - if: steps.config-diff.outputs.any_changed == 'true' && steps.docs-diff.outputs.any_changed == 'false' - uses: actions/github-script@v3 - with: - script: | - core.setFailed('Documentation has not been updated') diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml deleted file mode 100644 index 0e5c3efb..00000000 --- a/.github/workflows/dco.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: DCO check - -on: - pull_request: - branches: - - master - - support/** - -jobs: - commits_check_job: - runs-on: ubuntu-latest - name: Commits Check - steps: - - name: Get PR Commits - id: 'get-pr-commits' - uses: tim-actions/get-pr-commits@master - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: DCO Check - uses: tim-actions/dco@master - with: - commits: ${{ steps.get-pr-commits.outputs.commits }} diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml deleted file mode 100644 index c9819933..00000000 --- a/.github/workflows/go.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: frostfs-node tests - -on: - push: - branches: - - master - - support/** - paths-ignore: - - '*.md' - pull_request: - branches: - - master - - support/** - paths-ignore: - - '*.md' - -jobs: - test: - runs-on: ubuntu-20.04 - strategy: - matrix: - go: [ '1.18.x', '1.19.x' ] - steps: - - name: Setup go - uses: actions/setup-go@v3 - with: - go-version: ${{ matrix.go }} - - - name: Check out code - uses: actions/checkout@v3 - - - name: Cache go mod - uses: actions/cache@v3 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ matrix.go }}-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go-${{ matrix.go }}- - - - name: Run go test - run: go test -coverprofile=coverage.txt -covermode=atomic ./... - - - name: Codecov - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - run: bash <(curl -s https://codecov.io/bash) - - lint: - runs-on: ubuntu-20.04 - steps: - - uses: actions/setup-go@v3 - with: - go-version: 1.19 - - uses: actions/checkout@v3 - - name: golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - version: v1.50.0 - args: --timeout=5m - only-new-issues: true -- 2.45.2 From 0893689c6a4ef196466c408a2a59c34948a66403 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 2 Mar 2023 14:06:56 +0300 Subject: [PATCH 11/70] [#83] pre-commit: Add golangci-lint hook Skip deprecated warning for now, adopting new neo-go API will be done in another task. Signed-off-by: Evgenii Stratonikov --- .golangci.yml | 2 ++ .pre-commit-config.yaml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.golangci.yml b/.golangci.yml index 3adfd0f1..4c4fccc9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -24,6 +24,8 @@ linters-settings: govet: # report about shadowed variables check-shadowing: false + staticcheck: + checks: ["all", "-SA1019"] # TODO Enable SA1019 after deprecated warning are fixed. linters: enable: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c6f6048..e7edc6cb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,3 +17,8 @@ repos: args: [--markdown-linebreak-ext=md] - id: end-of-file-fixer exclude: ".key$" + + - repo: https://github.com/golangci/golangci-lint + rev: v1.51.2 + hooks: + - id: golangci-lint -- 2.45.2 From 8226d49376e771a992162340e468b57ef92031a1 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 2 Mar 2023 14:08:31 +0300 Subject: [PATCH 12/70] [#83] pre-commit: Add gitlint hook Signed-off-by: Evgenii Stratonikov --- .gitlint | 10 ++++++++++ .pre-commit-config.yaml | 6 ++++++ 2 files changed, 16 insertions(+) create mode 100644 .gitlint diff --git a/.gitlint b/.gitlint new file mode 100644 index 00000000..9ce883f4 --- /dev/null +++ b/.gitlint @@ -0,0 +1,10 @@ +[general] +fail-without-commits=true +contrib=CC1 + +[title-match-regex] +regex=^\[\#[0-9]+\]\s + +[ignore-by-title] +regex=^Release(.*) +ignore=title-match-regex diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e7edc6cb..ce470928 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,3 +22,9 @@ repos: rev: v1.51.2 hooks: - id: golangci-lint + + - repo: https://github.com/jorisroovers/gitlint + rev: v0.18.0 + hooks: + - id: gitlint + stages: [commit-msg] -- 2.45.2 From 05471d382748968e53eb7ab5c8eefffe840e5d31 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 2 Mar 2023 14:25:02 +0300 Subject: [PATCH 13/70] [#83] util/autocomplete: Fix deprecated warning Signed-off-by: Evgenii Stratonikov --- pkg/util/autocomplete/autocomplete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/autocomplete/autocomplete.go b/pkg/util/autocomplete/autocomplete.go index 89624471..4da8ecbf 100644 --- a/pkg/util/autocomplete/autocomplete.go +++ b/pkg/util/autocomplete/autocomplete.go @@ -43,7 +43,7 @@ func Command(name string) *cobra.Command { name, name, name, name, name, name, name, name, name, name), DisableFlagsInUseLine: true, ValidArgs: []string{"bash", "zsh", "fish", "powershell"}, - Args: cobra.ExactValidArgs(1), + Args: cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs), Run: func(cmd *cobra.Command, args []string) { switch args[0] { case "bash": -- 2.45.2 From bce5827f64e98d9ee0925930573de2643cce7283 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 2 Mar 2023 14:38:00 +0300 Subject: [PATCH 14/70] [#83] pre-commit: Add shellcheck hook Signed-off-by: Evgenii Stratonikov --- .pre-commit-config.yaml | 6 ++++++ debian/frostfs-ir.postinst | 6 +++--- debian/frostfs-storage.postinst | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ce470928..a58352f8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,3 +28,9 @@ repos: hooks: - id: gitlint stages: [commit-msg] + + - repo: https://github.com/koalaman/shellcheck-precommit + rev: v0.9.0 + hooks: + - id: shellcheck +# args: ["--severity=warning"] # Optionally only show errors and warnings diff --git a/debian/frostfs-ir.postinst b/debian/frostfs-ir.postinst index cb4a1031..eb9d381c 100755 --- a/debian/frostfs-ir.postinst +++ b/debian/frostfs-ir.postinst @@ -28,9 +28,9 @@ case "$1" in 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 + USERDIR="$(getent passwd frostfs-$USERNAME | cut -d: -f6)" + if ! dpkg-statoverride --list frostfs-"$USERDIR" >/dev/null; then + chown -f frostfs-$USERNAME: "$USERDIR" fi ;; diff --git a/debian/frostfs-storage.postinst b/debian/frostfs-storage.postinst index 0ecce744..88fa53be 100755 --- a/debian/frostfs-storage.postinst +++ b/debian/frostfs-storage.postinst @@ -28,9 +28,9 @@ case "$1" in 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 + 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 -- 2.45.2 From 365adb4ebd050471498b3afef43939f27d1f2c6f Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 13 Mar 2023 10:37:56 +0300 Subject: [PATCH 15/70] [#133] .github: Restore logo.svg Signed-off-by: Evgenii Stratonikov --- .github/logo.svg | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/logo.svg diff --git a/.github/logo.svg b/.github/logo.svg new file mode 100644 index 00000000..148c359d --- /dev/null +++ b/.github/logo.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.45.2 From 5890cd4d7dae6877fb69aa78e15cc42b656c42e4 Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Fri, 10 Mar 2023 19:47:10 +0300 Subject: [PATCH 16/70] [#50] ir: Fix config property name for prometheus Signed-off-by: Anton Nikiforov --- pkg/innerring/innerring.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 79555aa1..aeb5b15b 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -925,7 +925,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan queueSize: cfg.GetUint32("workers.subnet"), }) - if cfg.GetString("metrics.address") != "" { + if cfg.GetString("prometheus.address") != "" { m := metrics.NewInnerRingMetrics() server.metrics = &m } -- 2.45.2 From 5ae44462803f436223091809d775c9b711fd4f45 Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Mon, 13 Mar 2023 09:21:28 +0300 Subject: [PATCH 17/70] [#50] ir: Add Health status Signed-off-by: Anton Nikiforov --- pkg/innerring/state.go | 3 +++ pkg/metrics/innerring.go | 20 +++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pkg/innerring/state.go b/pkg/innerring/state.go index b7551049..903d9c87 100644 --- a/pkg/innerring/state.go +++ b/pkg/innerring/state.go @@ -167,6 +167,9 @@ func (s *Server) ResetEpochTimer(h uint32) error { func (s *Server) setHealthStatus(hs control.HealthStatus) { s.healthStatus.Store(hs) + if s.metrics != nil { + s.metrics.SetHealth(int32(hs)) + } } // HealthStatus returns the current health status of the IR application. diff --git a/pkg/metrics/innerring.go b/pkg/metrics/innerring.go index 487edc19..55b0aa08 100644 --- a/pkg/metrics/innerring.go +++ b/pkg/metrics/innerring.go @@ -2,11 +2,12 @@ package metrics import "github.com/prometheus/client_golang/prometheus" -const innerRingSubsystem = "object" +const innerRingSubsystem = "ir" // InnerRingServiceMetrics contains metrics collected by inner ring. type InnerRingServiceMetrics struct { - epoch prometheus.Gauge + epoch prometheus.Gauge + health prometheus.Gauge } // NewInnerRingMetrics returns new instance of metrics collectors for inner ring. @@ -18,12 +19,20 @@ func NewInnerRingMetrics() InnerRingServiceMetrics { Name: "epoch", Help: "Current epoch as seen by inner-ring node.", }) + health = prometheus.NewGauge(prometheus.GaugeOpts{ + Namespace: namespace, + Subsystem: innerRingSubsystem, + Name: "health", + Help: "Current inner-ring node state.", + }) ) prometheus.MustRegister(epoch) + prometheus.MustRegister(health) return InnerRingServiceMetrics{ - epoch: epoch, + epoch: epoch, + health: health, } } @@ -31,3 +40,8 @@ func NewInnerRingMetrics() InnerRingServiceMetrics { func (m InnerRingServiceMetrics) SetEpoch(epoch uint64) { m.epoch.Set(float64(epoch)) } + +// SetHealth updates health metrics. +func (m InnerRingServiceMetrics) SetHealth(s int32) { + m.health.Set(float64(s)) +} -- 2.45.2 From 3e6fd4c611c48c5210821f7309599514663879d5 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 25 Jan 2023 13:25:45 +0300 Subject: [PATCH 18/70] [#82] pilorama: Allow to store last sync height Signed-off-by: Evgenii Stratonikov --- pkg/local_object_storage/engine/tree.go | 38 ++++++++++++++ pkg/local_object_storage/pilorama/boltdb.go | 40 +++++++++++++++ pkg/local_object_storage/pilorama/forest.go | 21 ++++++++ .../pilorama/forest_test.go | 49 +++++++++++++++++++ pkg/local_object_storage/pilorama/inmemory.go | 5 +- .../pilorama/interface.go | 4 ++ pkg/local_object_storage/shard/tree.go | 16 ++++++ 7 files changed, 171 insertions(+), 2 deletions(-) diff --git a/pkg/local_object_storage/engine/tree.go b/pkg/local_object_storage/engine/tree.go index 8a580040..0d6f49ee 100644 --- a/pkg/local_object_storage/engine/tree.go +++ b/pkg/local_object_storage/engine/tree.go @@ -213,6 +213,44 @@ func (e *StorageEngine) TreeExists(cid cidSDK.ID, treeID string) (bool, error) { return err == nil, err } +// TreeUpdateLastSyncHeight implements the pilorama.Forest interface. +func (e *StorageEngine) TreeUpdateLastSyncHeight(cid cidSDK.ID, treeID string, height uint64) error { + index, lst, err := e.getTreeShard(cid, treeID) + if err != nil && !errors.Is(err, pilorama.ErrTreeNotFound) { + return err + } + + err = lst[index].TreeUpdateLastSyncHeight(cid, treeID, height) + if err != nil && !errors.Is(err, shard.ErrReadOnlyMode) && err != shard.ErrPiloramaDisabled { + e.reportShardError(lst[index], "can't update tree synchronization height", err, + zap.Stringer("cid", cid), + zap.String("tree", treeID)) + } + return err +} + +// TreeLastSyncHeight implements the pilorama.Forest interface. +func (e *StorageEngine) TreeLastSyncHeight(cid cidSDK.ID, treeID string) (uint64, error) { + var err error + var height uint64 + for _, sh := range e.sortShardsByWeight(cid) { + height, err = sh.TreeLastSyncHeight(cid, treeID) + if err != nil { + if err == shard.ErrPiloramaDisabled { + break + } + if !errors.Is(err, pilorama.ErrTreeNotFound) { + e.reportShardError(sh, "can't read tree synchronization height", err, + zap.Stringer("cid", cid), + zap.String("tree", treeID)) + } + continue + } + return height, err + } + return height, err +} + func (e *StorageEngine) getTreeShard(cid cidSDK.ID, treeID string) (int, []hashedShard, error) { lst := e.sortShardsByWeight(cid) for i, sh := range lst { diff --git a/pkg/local_object_storage/pilorama/boltdb.go b/pkg/local_object_storage/pilorama/boltdb.go index 85f7a43d..b47fa16e 100644 --- a/pkg/local_object_storage/pilorama/boltdb.go +++ b/pkg/local_object_storage/pilorama/boltdb.go @@ -192,6 +192,46 @@ func (t *boltForest) TreeExists(cid cidSDK.ID, treeID string) (bool, error) { return exists, err } +var syncHeightKey = []byte{'h'} + +// TreeUpdateLastSyncHeight implements the pilorama.Forest interface. +func (t *boltForest) TreeUpdateLastSyncHeight(cid cidSDK.ID, treeID string, height uint64) error { + rawHeight := make([]byte, 8) + binary.LittleEndian.PutUint64(rawHeight, height) + + buck := bucketName(cid, treeID) + return t.db.Batch(func(tx *bbolt.Tx) error { + treeRoot := tx.Bucket(buck) + if treeRoot == nil { + return ErrTreeNotFound + } + + b := treeRoot.Bucket(dataBucket) + return b.Put(syncHeightKey, rawHeight) + }) +} + +// TreeLastSyncHeight implements the pilorama.Forest interface. +func (t *boltForest) TreeLastSyncHeight(cid cidSDK.ID, treeID string) (uint64, error) { + var height uint64 + + buck := bucketName(cid, treeID) + err := t.db.View(func(tx *bbolt.Tx) error { + treeRoot := tx.Bucket(buck) + if treeRoot == nil { + return ErrTreeNotFound + } + + b := treeRoot.Bucket(dataBucket) + data := b.Get(syncHeightKey) + if len(data) == 8 { + height = binary.LittleEndian.Uint64(data) + } + return nil + }) + return height, err +} + // TreeAddByPath implements the Forest interface. func (t *boltForest) TreeAddByPath(d CIDDescriptor, treeID string, attr string, path []string, meta []KeyValue) ([]Move, error) { if !d.checkValid() { diff --git a/pkg/local_object_storage/pilorama/forest.go b/pkg/local_object_storage/pilorama/forest.go index 96206364..743096c8 100644 --- a/pkg/local_object_storage/pilorama/forest.go +++ b/pkg/local_object_storage/pilorama/forest.go @@ -226,3 +226,24 @@ func (f *memoryForest) TreeExists(cid cidSDK.ID, treeID string) (bool, error) { _, ok := f.treeMap[fullID] return ok, nil } + +// TreeUpdateLastSyncHeight implements the pilorama.Forest interface. +func (f *memoryForest) TreeUpdateLastSyncHeight(cid cidSDK.ID, treeID string, height uint64) error { + fullID := cid.EncodeToString() + "/" + treeID + t, ok := f.treeMap[fullID] + if !ok { + return ErrTreeNotFound + } + t.syncHeight = height + return nil +} + +// TreeLastSyncHeight implements the pilorama.Forest interface. +func (f *memoryForest) TreeLastSyncHeight(cid cidSDK.ID, treeID string) (uint64, error) { + fullID := cid.EncodeToString() + "/" + treeID + t, ok := f.treeMap[fullID] + if !ok { + return 0, ErrTreeNotFound + } + return t.syncHeight, nil +} diff --git a/pkg/local_object_storage/pilorama/forest_test.go b/pkg/local_object_storage/pilorama/forest_test.go index 93c468d1..9fe372b3 100644 --- a/pkg/local_object_storage/pilorama/forest_test.go +++ b/pkg/local_object_storage/pilorama/forest_test.go @@ -1030,3 +1030,52 @@ func testTreeGetTrees(t *testing.T, s Forest) { require.ElementsMatch(t, treeIDs[cid], trees) } } + +func TestTreeLastSyncHeight(t *testing.T) { + for i := range providers { + t.Run(providers[i].name, func(t *testing.T) { + testTreeLastSyncHeight(t, providers[i].construct(t)) + }) + } +} + +func testTreeLastSyncHeight(t *testing.T, f Forest) { + cnr := cidtest.ID() + treeID := "someTree" + + t.Run("ErrNotFound if no log operations are stored for a tree", func(t *testing.T) { + _, err := f.TreeLastSyncHeight(cnr, treeID) + require.ErrorIs(t, err, ErrTreeNotFound) + + err = f.TreeUpdateLastSyncHeight(cnr, treeID, 1) + require.ErrorIs(t, err, ErrTreeNotFound) + }) + + _, err := f.TreeMove(CIDDescriptor{CID: cnr, Size: 1}, treeID, &Move{ + Parent: RootID, + Child: 1, + }) + require.NoError(t, err) + + h, err := f.TreeLastSyncHeight(cnr, treeID) + require.NoError(t, err) + require.EqualValues(t, 0, h) + + t.Run("separate storages for separate containers", func(t *testing.T) { + _, err := f.TreeLastSyncHeight(cidtest.ID(), treeID) + require.ErrorIs(t, err, ErrTreeNotFound) + }) + + require.NoError(t, f.TreeUpdateLastSyncHeight(cnr, treeID, 10)) + + h, err = f.TreeLastSyncHeight(cnr, treeID) + require.NoError(t, err) + require.EqualValues(t, 10, h) + + t.Run("removed correctly", func(t *testing.T) { + require.NoError(t, f.TreeDrop(cnr, treeID)) + + _, err := f.TreeLastSyncHeight(cnr, treeID) + require.ErrorIs(t, err, ErrTreeNotFound) + }) +} diff --git a/pkg/local_object_storage/pilorama/inmemory.go b/pkg/local_object_storage/pilorama/inmemory.go index fbd84162..92dc9b6a 100644 --- a/pkg/local_object_storage/pilorama/inmemory.go +++ b/pkg/local_object_storage/pilorama/inmemory.go @@ -143,8 +143,9 @@ func (s *state) findSpareID() Node { // tree is a mapping from the child nodes to their parent and metadata. type tree struct { - infoMap map[Node]nodeInfo - childMap map[Node][]Node + syncHeight uint64 + infoMap map[Node]nodeInfo + childMap map[Node][]Node } func newTree() *tree { diff --git a/pkg/local_object_storage/pilorama/interface.go b/pkg/local_object_storage/pilorama/interface.go index 7977986e..c2143de2 100644 --- a/pkg/local_object_storage/pilorama/interface.go +++ b/pkg/local_object_storage/pilorama/interface.go @@ -44,6 +44,10 @@ type Forest interface { // TreeExists checks if a tree exists locally. // If the tree is not found, false and a nil error should be returned. TreeExists(cid cidSDK.ID, treeID string) (bool, error) + // TreeUpdateLastSyncHeight updates last log height synchronized with _all_ container nodes. + TreeUpdateLastSyncHeight(cid cidSDK.ID, treeID string, height uint64) error + // TreeLastSyncHeight returns last log height synchronized with _all_ container nodes. + TreeLastSyncHeight(cid cidSDK.ID, treeID string) (uint64, error) } type ForestStorage interface { diff --git a/pkg/local_object_storage/shard/tree.go b/pkg/local_object_storage/shard/tree.go index 6e953712..b9f90999 100644 --- a/pkg/local_object_storage/shard/tree.go +++ b/pkg/local_object_storage/shard/tree.go @@ -111,3 +111,19 @@ func (s *Shard) TreeExists(cid cidSDK.ID, treeID string) (bool, error) { } return s.pilorama.TreeExists(cid, treeID) } + +// TreeUpdateLastSyncHeight implements the pilorama.Forest interface. +func (s *Shard) TreeUpdateLastSyncHeight(cid cidSDK.ID, treeID string, height uint64) error { + if s.pilorama == nil { + return ErrPiloramaDisabled + } + return s.pilorama.TreeUpdateLastSyncHeight(cid, treeID, height) +} + +// TreeLastSyncHeight implements the pilorama.Forest interface. +func (s *Shard) TreeLastSyncHeight(cid cidSDK.ID, treeID string) (uint64, error) { + if s.pilorama == nil { + return 0, ErrPiloramaDisabled + } + return s.pilorama.TreeLastSyncHeight(cid, treeID) +} -- 2.45.2 From 6cd806f99873b84e9a235b4ace70cf89abdfb69e Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 25 Jan 2023 15:44:44 +0300 Subject: [PATCH 19/70] [#82] services/tree: Save last synchronized height in a persistent storage Remember the last synchronized height and use it after service restart. Signed-off-by: Evgenii Stratonikov --- CHANGELOG.md | 1 + pkg/services/tree/service.go | 8 +++----- pkg/services/tree/sync.go | 35 ++++++++++++++--------------------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a7a33b..f2875ea4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Changelog for FrostFS Node - Reload config for pprof and metrics on SIGHUP in `neofs-node` (#1868) - Multiple configs support (#44) - Parameters `nns-name` and `nns-zone` for command `frostfs-cli container create` (#37) +- Tree service now saves the last synchronization height which persists across restarts (#82) ### Changed - Change `frostfs_node_engine_container_size` to counting sizes of logical objects diff --git a/pkg/services/tree/service.go b/pkg/services/tree/service.go index a01072cb..3176858e 100644 --- a/pkg/services/tree/service.go +++ b/pkg/services/tree/service.go @@ -31,10 +31,8 @@ type Service struct { syncChan chan struct{} syncPool *ants.Pool - // cnrMap maps contrainer and tree ID to the minimum height which was fetched from _each_ client. - // This allows us to better handle split-brain scenario, because we always synchronize - // from the last seen height. The inner map is read-only and should not be modified in-place. - cnrMap map[cidSDK.ID]map[string]uint64 + // cnrMap contains existing (used) container IDs. + cnrMap map[cidSDK.ID]struct{} // cnrMapMtx protects cnrMap cnrMapMtx sync.Mutex } @@ -63,7 +61,7 @@ func New(opts ...Option) *Service { s.replicateLocalCh = make(chan applyOp) s.replicationTasks = make(chan replicationTask, s.replicatorWorkerCount) s.containerCache.init(s.containerCacheSize) - s.cnrMap = make(map[cidSDK.ID]map[string]uint64) + s.cnrMap = make(map[cidSDK.ID]struct{}) s.syncChan = make(chan struct{}) s.syncPool, _ = ants.NewPool(defaultSyncWorkerCount) diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index d6646ab9..a1bab61d 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -86,31 +86,24 @@ func (s *Service) synchronizeAllTrees(ctx context.Context, cid cid.ID) error { return fmt.Errorf("could not fetch tree ID list: %w", outErr) } - s.cnrMapMtx.Lock() - oldStatus := s.cnrMap[cid] - s.cnrMapMtx.Unlock() - - syncStatus := map[string]uint64{} - for i := range treesToSync { - syncStatus[treesToSync[i]] = 0 - } - for tid := range oldStatus { - if _, ok := syncStatus[tid]; ok { - syncStatus[tid] = oldStatus[tid] - } - } - for _, tid := range treesToSync { - h := s.synchronizeTree(ctx, d, syncStatus[tid], tid, nodes) - if syncStatus[tid] < h { - syncStatus[tid] = h + h, err := s.forest.TreeLastSyncHeight(d.CID, tid) + if err != nil && !errors.Is(err, pilorama.ErrTreeNotFound) { + s.log.Warn("could not get last synchronized height for a tree", + zap.Stringer("cid", d.CID), + zap.String("tree", tid)) + continue + } + newHeight := s.synchronizeTree(ctx, d, h, tid, nodes) + if h < newHeight { + if err := s.forest.TreeUpdateLastSyncHeight(d.CID, tid, newHeight); err != nil { + s.log.Warn("could not update last synchronized height for a tree", + zap.Stringer("cid", d.CID), + zap.String("tree", tid)) + } } } - s.cnrMapMtx.Lock() - s.cnrMap[cid] = syncStatus - s.cnrMapMtx.Unlock() - return nil } -- 2.45.2 From 4e244686cf03cf3f30e5f1be3ecea5ce150daf42 Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Mon, 13 Mar 2023 10:36:16 +0300 Subject: [PATCH 20/70] [#83] Makefile fixes for pre-commit Add make targets to simplify pre-commit setup for individual developers. Signed-off-by: Stanislav Bogatyrev --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8b01081b..242a7ed1 100755 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ PKG_VERSION ?= $(shell echo $(VERSION) | sed "s/^v//" | \ sed "s/-/~/")-${OS_RELEASE} .PHONY: help all images dep clean fmts fmt imports test lint docker/lint - prepare-release debpackage + 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 @@ -140,10 +140,19 @@ docker/lint: --env HOME=/src \ golangci/golangci-lint:v$(LINT_VERSION) bash -c 'cd /src/ && make lint' +# Activate pre-commit hooks +pre-commit: + pre-commit install -t pre-commit -t commit-msg + +# Deactivate pre-commit hooks +unpre-commit: + pre-commit uninstall -t pre-commit -t commit-msg + # Print version version: @echo $(VERSION) +# Delete built artifacts clean: rm -rf vendor rm -rf .cache -- 2.45.2 From b4582239bf116cc1b2cd03ef4afb32eabf58e9b0 Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Fri, 10 Mar 2023 10:44:56 +0300 Subject: [PATCH 21/70] [#130] adm: Fix adding of pub key for `group.frostfs` at init step Signed-off-by: Anton Nikiforov --- CHANGELOG.md | 1 + cmd/frostfs-adm/internal/modules/morph/initialize_nns.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2875ea4..7e9ba6d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ Changelog for FrostFS Node - Create contract wallet only by `init` and `update-config` command (#63) - Actually use `object.put.pool_size_local` and independent pool for local puts (#64). - Pretty printer of basic ACL in the NeoFS CLI (#2259) +- Adding of public key for nns group `group.frostfs` at init step (#130) ### Removed ### Updated diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go b/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go index 91727202..b43c2da3 100644 --- a/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go @@ -82,13 +82,13 @@ func (c *initializeContext) setNNS() error { func (c *initializeContext) updateNNSGroup(nnsHash util.Uint160, pub *keys.PublicKey) error { bw := io.NewBufBinWriter() - needUpdate, needRegister, err := c.emitUpdateNNSGroupScript(bw, nnsHash, pub) - if !needUpdate || err != nil { + keyAlreadyAdded, domainRegCodeEmitted, err := c.emitUpdateNNSGroupScript(bw, nnsHash, pub) + if keyAlreadyAdded || err != nil { return err } script := bw.Bytes() - if needRegister { + if domainRegCodeEmitted { w := io.NewBufBinWriter() emit.Instruction(w.BinWriter, opcode.INITSSLOT, []byte{1}) wrapRegisterScriptWithPrice(w, nnsHash, script) -- 2.45.2 From 8b9e40a848eedff78c4f9b93bd70bc4a898d7a7e Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Tue, 7 Mar 2023 09:17:05 +0300 Subject: [PATCH 22/70] [#85] get-service: Add assembler Extract assemble logic to assembler Signed-off-by: Dmitrii Stepanov --- pkg/services/object/get/assembler.go | 293 +++++++++++++++++++++++++++ 1 file changed, 293 insertions(+) create mode 100644 pkg/services/object/get/assembler.go diff --git a/pkg/services/object/get/assembler.go b/pkg/services/object/get/assembler.go new file mode 100644 index 00000000..97f88cc9 --- /dev/null +++ b/pkg/services/object/get/assembler.go @@ -0,0 +1,293 @@ +package getsvc + +import ( + "context" + "errors" + + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" +) + +type objectGetter interface { + GetObject(ctx context.Context, id oid.ID, rng *objectSDK.Range) (*objectSDK.Object, error) + HeadObject(ctx context.Context, id oid.ID) (*objectSDK.Object, error) +} + +type objectWriter interface { + WriteChunk(context.Context, []byte) error + WriteHeader(context.Context, *objectSDK.Object) error +} + +var ( + errParentAddressDiffers = errors.New("parent address in child object differs") +) + +type assembler struct { + addr oid.Address + splitInfo *objectSDK.SplitInfo + rng *objectSDK.Range + objGetter objectGetter + + currentOffset uint64 + + parentObject *objectSDK.Object +} + +func newAssembler( + addr oid.Address, + splitInfo *objectSDK.SplitInfo, + rng *objectSDK.Range, + objGetter objectGetter) *assembler { + return &assembler{ + addr: addr, + rng: rng, + splitInfo: splitInfo, + objGetter: objGetter, + } +} + +// Assemble assembles splitted large object and writes it's content to ObjectWriter. +// It returns parent object. +func (a *assembler) Assemble(ctx context.Context, writer objectWriter) (*objectSDK.Object, error) { + sourceObjectID, ok := a.getLastPartOrLinkObjectID() + if !ok { + return nil, objectSDK.NewSplitInfoError(a.splitInfo) + } + previousID, childrenIDs, err := a.initializeFromSourceObjectID(ctx, sourceObjectID) + if err != nil { + return nil, err + } + if previousID == nil && len(childrenIDs) == 0 { + return nil, objectSDK.NewSplitInfoError(a.splitInfo) + } + if len(childrenIDs) > 0 { + if err := a.assembleObjectByChildrenList(ctx, childrenIDs, writer); err != nil { + return nil, err + } + } else { + if err := a.assemleObjectByPreviousIDInReverse(ctx, *previousID, writer); err != nil { + return nil, err + } + } + return a.parentObject, nil +} + +func (a *assembler) getLastPartOrLinkObjectID() (oid.ID, bool) { + sourceObjectID, ok := a.splitInfo.Link() + if ok { + return sourceObjectID, true + } + sourceObjectID, ok = a.splitInfo.LastPart() + if ok { + return sourceObjectID, true + } + return oid.ID{}, false +} + +func (a *assembler) initializeFromSourceObjectID(ctx context.Context, id oid.ID) (*oid.ID, []oid.ID, error) { + sourceObject, err := a.getChildObject(ctx, id, nil, true) + if err != nil { + return nil, nil, err + } + + parentObject := sourceObject.Parent() + if parentObject == nil { + return nil, nil, errors.New("received child with empty parent") + } + + a.parentObject = parentObject + + var payload []byte + + if a.rng != nil { + seekOff := a.rng.GetOffset() + seekLen := a.rng.GetLength() + seekTo := seekOff + seekLen + parentSize := parentObject.PayloadSize() + + if seekTo < seekOff || parentSize < seekOff || parentSize < seekTo { + return nil, nil, &apistatus.ObjectOutOfRange{} + } + + sourceSize := sourceObject.PayloadSize() + + a.currentOffset = parentSize - sourceSize + + from := uint64(0) + if a.currentOffset < seekOff { + from = seekOff - a.currentOffset + } + + to := uint64(0) + if seekOff+seekLen > a.currentOffset+from { + to = seekOff + seekLen - a.currentOffset + } + + payload = sourceObject.Payload()[from:to] + a.rng.SetLength(a.rng.GetLength() - to + from) + } else { + payload = sourceObject.Payload() + } + + a.parentObject.SetPayload(payload) + + idPrev, ok := sourceObject.PreviousID() + if ok { + return &idPrev, sourceObject.Children(), nil + } + + return nil, sourceObject.Children(), nil +} + +func (a *assembler) getChildObject(ctx context.Context, id oid.ID, rng *objectSDK.Range, verifyIsChild bool) (*objectSDK.Object, error) { + obj, err := a.objGetter.GetObject(ctx, id, rng) + if err != nil { + return nil, err + } + + if verifyIsChild && !a.isChild(obj) { + return nil, errParentAddressDiffers + } + return obj, nil +} + +func (a *assembler) assembleObjectByChildrenList(ctx context.Context, childrenIDs []oid.ID, writer objectWriter) error { + if a.rng == nil { + if err := writer.WriteHeader(ctx, a.parentObject.CutPayload()); err != nil { + return err + } + return a.assemblePayloadByObjectIDs(ctx, writer, childrenIDs, nil, true) + } + + if err := a.assemblePayloadInReverse(ctx, writer, childrenIDs[len(childrenIDs)-1]); err != nil { + return err + } + if err := writer.WriteChunk(ctx, a.parentObject.Payload()); err != nil { + return err + } + return nil +} + +func (a *assembler) assemleObjectByPreviousIDInReverse(ctx context.Context, prevID oid.ID, writer objectWriter) error { + if a.rng == nil { + if err := writer.WriteHeader(ctx, a.parentObject.CutPayload()); err != nil { + return err + } + } + + if err := a.assemblePayloadInReverse(ctx, writer, prevID); err != nil { + return err + } + if err := writer.WriteChunk(ctx, a.parentObject.Payload()); err != nil { // last part + return err + } + return nil +} + +func (a *assembler) assemblePayloadByObjectIDs(ctx context.Context, writer objectWriter, partIDs []oid.ID, partRanges []objectSDK.Range, verifyIsChild bool) error { + withRng := len(partRanges) > 0 && a.rng != nil + + for i := range partIDs { + var r *objectSDK.Range + if withRng { + r = &partRanges[i] + } + + child, err := a.getChildObject(ctx, partIDs[i], r, verifyIsChild) + if err != nil { + return err + } + + if err := writer.WriteChunk(ctx, child.Payload()); err != nil { + return err + } + } + return nil +} + +func (a *assembler) assemblePayloadInReverse(ctx context.Context, writer objectWriter, prevID oid.ID) error { + chain, rngs, err := a.buildChain(ctx, prevID) + if err != nil { + return err + } + + reverseRngs := len(rngs) > 0 + + for left, right := 0, len(chain)-1; left < right; left, right = left+1, right-1 { + chain[left], chain[right] = chain[right], chain[left] + + if reverseRngs { + rngs[left], rngs[right] = rngs[right], rngs[left] + } + } + + return a.assemblePayloadByObjectIDs(ctx, writer, chain, rngs, false) +} + +func (a *assembler) isChild(obj *objectSDK.Object) bool { + parent := obj.Parent() + return parent == nil || equalAddresses(a.addr, object.AddressOf(parent)) +} + +func (a *assembler) buildChain(ctx context.Context, prevID oid.ID) ([]oid.ID, []objectSDK.Range, error) { + var ( + chain []oid.ID + rngs []objectSDK.Range + from = a.rng.GetOffset() + to = from + a.rng.GetLength() + + hasPrev = true + ) + + // fill the chain end-to-start + for hasPrev { + // check that only for "range" requests, + // for `GET` it stops via the false `withPrev` + if a.rng != nil && a.currentOffset <= from { + break + } + + head, err := a.objGetter.HeadObject(ctx, prevID) + if err != nil { + return nil, nil, err + } + if !a.isChild(head) { + return nil, nil, errParentAddressDiffers + } + + if a.rng != nil { + sz := head.PayloadSize() + + a.currentOffset -= sz + + if a.currentOffset < to { + off := uint64(0) + if from > a.currentOffset { + off = from - a.currentOffset + sz -= from - a.currentOffset + } + + if to < a.currentOffset+off+sz { + sz = to - off - a.currentOffset + } + + index := len(rngs) + rngs = append(rngs, objectSDK.Range{}) + rngs[index].SetOffset(off) + rngs[index].SetLength(sz) + + id, _ := head.ID() + chain = append(chain, id) + } + } else { + id, _ := head.ID() + chain = append(chain, id) + } + + prevID, hasPrev = head.PreviousID() + } + + return chain, rngs, nil +} -- 2.45.2 From 2886b1581b850ee8319f934990e7cda7ba6afbe0 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Wed, 8 Mar 2023 12:56:34 +0300 Subject: [PATCH 23/70] [#85] get-service: Add unit tests Add unit tests to cover all assemble statements Signed-off-by: Dmitrii Stepanov --- pkg/services/object/get/get_test.go | 498 ++++++++++++++++++++++++++++ 1 file changed, 498 insertions(+) diff --git a/pkg/services/object/get/get_test.go b/pkg/services/object/get/get_test.go index a15f2cb1..ed239527 100644 --- a/pkg/services/object/get/get_test.go +++ b/pkg/services/object/get/get_test.go @@ -207,6 +207,40 @@ func generateObject(addr oid.Address, prev *oid.ID, payload []byte, children ... return obj } +type writeHeaderError struct{} + +func (whe *writeHeaderError) Error() string { + return "write header error" +} + +type writeHeaderErrorObjectWriter struct { +} + +func (w *writeHeaderErrorObjectWriter) WriteHeader(_ *objectSDK.Object) error { + return &writeHeaderError{} +} + +func (w *writeHeaderErrorObjectWriter) WriteChunk(p []byte) error { + return nil +} + +type writePayloadError struct{} + +func (whe *writePayloadError) Error() string { + return "write payload error" +} + +type writePayloadErrorObjectWriter struct { +} + +func (w *writePayloadErrorObjectWriter) WriteHeader(_ *objectSDK.Object) error { + return nil +} + +func (w *writePayloadErrorObjectWriter) WriteChunk(p []byte) error { + return &writePayloadError{} +} + func TestGetLocalOnly(t *testing.T) { ctx := context.Background() @@ -902,6 +936,340 @@ func TestGetRemoteSmall(t *testing.T) { require.NoError(t, err) require.Equal(t, payload[off:off+ln], w.Object().Payload()) }) + + t.Run("write header/payload failure", func(t *testing.T) { + addr := oidtest.Address() + addr.SetContainer(idCnr) + addr.SetObject(oidtest.ID()) + + srcObj := generateObject(addr, nil, nil) + + ns, as := testNodeMatrix(t, []int{2}) + + splitInfo := objectSDK.NewSplitInfo() + splitInfo.SetLink(oidtest.ID()) + + children, childIDs, payload := generateChain(2, idCnr) + srcObj.SetPayload(payload) + srcObj.SetPayloadSize(uint64(len(payload))) + children[len(children)-1].SetParent(srcObj) + + var linkAddr oid.Address + linkAddr.SetContainer(idCnr) + idLink, _ := splitInfo.Link() + linkAddr.SetObject(idLink) + + linkingObj := generateObject(linkAddr, nil, nil, childIDs...) + linkingObj.SetParentID(addr.Object()) + linkingObj.SetParent(srcObj) + + var child1Addr oid.Address + child1Addr.SetContainer(idCnr) + child1Addr.SetObject(childIDs[0]) + + var child2Addr oid.Address + child2Addr.SetContainer(idCnr) + child2Addr.SetObject(childIDs[1]) + + c1 := newTestClient() + c1.addResult(addr, nil, errors.New("any error")) + c1.addResult(linkAddr, nil, errors.New("any error")) + c1.addResult(child1Addr, nil, errors.New("any error")) + c1.addResult(child2Addr, nil, errors.New("any error")) + + c2 := newTestClient() + c2.addResult(addr, nil, objectSDK.NewSplitInfoError(splitInfo)) + c2.addResult(linkAddr, linkingObj, nil) + c2.addResult(child1Addr, children[0], nil) + c2.addResult(child2Addr, children[1], nil) + + builder := &testPlacementBuilder{ + vectors: map[string][][]netmap.NodeInfo{ + addr.EncodeToString(): ns, + linkAddr.EncodeToString(): ns, + child1Addr.EncodeToString(): ns, + child2Addr.EncodeToString(): ns, + }, + } + + svc := newSvc(builder, &testClientCache{ + clients: map[string]*testClient{ + as[0][0]: c1, + as[0][1]: c2, + }, + }) + + testHeadVirtual(svc, addr, splitInfo) + + wh := &writeHeaderErrorObjectWriter{} + + p := newPrm(false, wh) + p.WithAddress(addr) + + err := svc.Get(ctx, p) + require.ErrorAs(t, err, new(*writeHeaderError)) + + wp := &writePayloadErrorObjectWriter{} + + p = newPrm(false, wp) + p.WithAddress(addr) + + err = svc.Get(ctx, p) + require.ErrorAs(t, err, new(*writePayloadError)) + }) + + t.Run("linked object not a child of parent", func(t *testing.T) { + addr := oidtest.Address() + addr.SetContainer(idCnr) + addr.SetObject(oidtest.ID()) + + srcObj := generateObject(addr, nil, nil) + + ns, as := testNodeMatrix(t, []int{2}) + + splitInfo := objectSDK.NewSplitInfo() + splitInfo.SetLink(oidtest.ID()) + + children, childIDs, payload := generateChain(2, idCnr) + srcObj.SetPayload(payload) + srcObj.SetPayloadSize(uint64(len(payload))) + children[len(children)-1].SetParent(srcObj) + + var linkAddr oid.Address + linkAddr.SetContainer(idCnr) + idLink, _ := splitInfo.Link() + linkAddr.SetObject(idLink) + + wrongParentAddr := oidtest.Address() + wrongParentID := oidtest.ID() + wrongParentAddr.SetObject(wrongParentID) + wrongParentAddr.SetContainer(idCnr) + wrongParent := generateObject(wrongParentAddr, nil, nil) + + linkingObj := generateObject(linkAddr, nil, nil, childIDs...) + linkingObj.SetParentID(wrongParentID) + linkingObj.SetParent(wrongParent) + + var child1Addr oid.Address + child1Addr.SetContainer(idCnr) + child1Addr.SetObject(childIDs[0]) + + var child2Addr oid.Address + child2Addr.SetContainer(idCnr) + child2Addr.SetObject(childIDs[1]) + + c1 := newTestClient() + c1.addResult(addr, nil, errors.New("any error")) + c1.addResult(linkAddr, nil, errors.New("any error")) + c1.addResult(child1Addr, nil, errors.New("any error")) + c1.addResult(child2Addr, nil, errors.New("any error")) + + c2 := newTestClient() + c2.addResult(addr, nil, objectSDK.NewSplitInfoError(splitInfo)) + c2.addResult(linkAddr, linkingObj, nil) + c2.addResult(child1Addr, children[0], nil) + c2.addResult(child2Addr, children[1], nil) + + builder := &testPlacementBuilder{ + vectors: map[string][][]netmap.NodeInfo{ + addr.EncodeToString(): ns, + linkAddr.EncodeToString(): ns, + child1Addr.EncodeToString(): ns, + child2Addr.EncodeToString(): ns, + }, + } + + svc := newSvc(builder, &testClientCache{ + clients: map[string]*testClient{ + as[0][0]: c1, + as[0][1]: c2, + }, + }) + + testHeadVirtual(svc, addr, splitInfo) + + w := NewSimpleObjectWriter() + + p := newPrm(false, w) + p.WithAddress(addr) + + err := svc.Get(ctx, p) + require.NoError(t, err) //TODO fix me + //require.Equal(t, err.Error(), "wrong child header") + + w = NewSimpleObjectWriter() + payloadSz := srcObj.PayloadSize() + + off := payloadSz / 3 + ln := payloadSz / 3 + + rngPrm := newRngPrm(false, w, off, ln) + rngPrm.WithAddress(addr) + + err = svc.GetRange(ctx, rngPrm) + require.ErrorAs(t, err, new(*apistatus.ObjectOutOfRange)) //TODO fix me + //require.Equal(t, err.Error(), "wrong child header") + + }) + + t.Run("linked object with parent udefined", func(t *testing.T) { + addr := oidtest.Address() + addr.SetContainer(idCnr) + addr.SetObject(oidtest.ID()) + + srcObj := generateObject(addr, nil, nil) + + ns, as := testNodeMatrix(t, []int{2}) + + splitInfo := objectSDK.NewSplitInfo() + splitInfo.SetLink(oidtest.ID()) + + children, childIDs, payload := generateChain(2, idCnr) + srcObj.SetPayload(payload) + srcObj.SetPayloadSize(uint64(len(payload))) + children[len(children)-1].SetParent(srcObj) + + var linkAddr oid.Address + linkAddr.SetContainer(idCnr) + idLink, _ := splitInfo.Link() + linkAddr.SetObject(idLink) + + linkingObj := generateObject(linkAddr, nil, nil, childIDs...) + + var child1Addr oid.Address + child1Addr.SetContainer(idCnr) + child1Addr.SetObject(childIDs[0]) + + var child2Addr oid.Address + child2Addr.SetContainer(idCnr) + child2Addr.SetObject(childIDs[1]) + + c1 := newTestClient() + c1.addResult(addr, nil, errors.New("any error")) + c1.addResult(linkAddr, nil, errors.New("any error")) + c1.addResult(child1Addr, nil, errors.New("any error")) + c1.addResult(child2Addr, nil, errors.New("any error")) + + c2 := newTestClient() + c2.addResult(addr, nil, objectSDK.NewSplitInfoError(splitInfo)) + c2.addResult(linkAddr, linkingObj, nil) + c2.addResult(child1Addr, children[0], nil) + c2.addResult(child2Addr, children[1], nil) + + builder := &testPlacementBuilder{ + vectors: map[string][][]netmap.NodeInfo{ + addr.EncodeToString(): ns, + linkAddr.EncodeToString(): ns, + child1Addr.EncodeToString(): ns, + child2Addr.EncodeToString(): ns, + }, + } + + svc := newSvc(builder, &testClientCache{ + clients: map[string]*testClient{ + as[0][0]: c1, + as[0][1]: c2, + }, + }) + + testHeadVirtual(svc, addr, splitInfo) + + w := NewSimpleObjectWriter() + + p := newPrm(false, w) + p.WithAddress(addr) + + err := svc.Get(ctx, p) + require.NoError(t, err) //TODO fix me + //require.Equal(t, err.Error(), "received child with empty parent") + + w = NewSimpleObjectWriter() + payloadSz := srcObj.PayloadSize() + + off := payloadSz / 3 + ln := payloadSz / 3 + + rngPrm := newRngPrm(false, w, off, ln) + rngPrm.WithAddress(addr) + + err = svc.GetRange(ctx, rngPrm) + require.NoError(t, err) //TODO fix me + //require.Equal(t, err.Error(), "received child with empty parent") + }) + + t.Run("out of range", func(t *testing.T) { + addr := oidtest.Address() + addr.SetContainer(idCnr) + addr.SetObject(oidtest.ID()) + + srcObj := generateObject(addr, nil, nil) + + ns, as := testNodeMatrix(t, []int{2}) + + splitInfo := objectSDK.NewSplitInfo() + splitInfo.SetLink(oidtest.ID()) + + children, childIDs, payload := generateChain(2, idCnr) + srcObj.SetPayload(payload) + srcObj.SetPayloadSize(uint64(len(payload))) + children[len(children)-1].SetParent(srcObj) + + var linkAddr oid.Address + linkAddr.SetContainer(idCnr) + idLink, _ := splitInfo.Link() + linkAddr.SetObject(idLink) + + linkingObj := generateObject(linkAddr, nil, nil, childIDs...) + linkingObj.SetParentID(addr.Object()) + linkingObj.SetParent(srcObj) + + var child1Addr oid.Address + child1Addr.SetContainer(idCnr) + child1Addr.SetObject(childIDs[0]) + + var child2Addr oid.Address + child2Addr.SetContainer(idCnr) + child2Addr.SetObject(childIDs[1]) + + c1 := newTestClient() + c1.addResult(addr, nil, errors.New("any error")) + c1.addResult(linkAddr, nil, errors.New("any error")) + c1.addResult(child1Addr, nil, errors.New("any error")) + c1.addResult(child2Addr, nil, errors.New("any error")) + + c2 := newTestClient() + c2.addResult(addr, nil, objectSDK.NewSplitInfoError(splitInfo)) + c2.addResult(linkAddr, linkingObj, nil) + c2.addResult(child1Addr, children[0], nil) + c2.addResult(child2Addr, children[1], nil) + + builder := &testPlacementBuilder{ + vectors: map[string][][]netmap.NodeInfo{ + addr.EncodeToString(): ns, + linkAddr.EncodeToString(): ns, + child1Addr.EncodeToString(): ns, + child2Addr.EncodeToString(): ns, + }, + } + + svc := newSvc(builder, &testClientCache{ + clients: map[string]*testClient{ + as[0][0]: c1, + as[0][1]: c2, + }, + }) + + testHeadVirtual(svc, addr, splitInfo) + + w := NewSimpleObjectWriter() + + p := newRngPrm(false, w, uint64(len(payload)), uint64(len(payload))) + p.WithAddress(addr) + + err := svc.GetRange(ctx, p) + require.ErrorAs(t, err, new(*apistatus.ObjectOutOfRange)) + }) + }) t.Run("right child", func(t *testing.T) { @@ -1025,6 +1393,97 @@ func TestGetRemoteSmall(t *testing.T) { require.ErrorAs(t, err, new(apistatus.ObjectNotFound)) }) + t.Run("child has different parent", func(t *testing.T) { + addr := oidtest.Address() + addr.SetContainer(idCnr) + addr.SetObject(oidtest.ID()) + + srcObj := generateObject(addr, nil, nil) + + ns, as := testNodeMatrix(t, []int{2}) + + splitInfo := objectSDK.NewSplitInfo() + splitInfo.SetLastPart(oidtest.ID()) + + children, _, payload := generateChain(2, idCnr) + srcObj.SetPayloadSize(uint64(len(payload))) + srcObj.SetPayload(payload) + + wrongParentAddr := oidtest.Address() + wrongParentID := oidtest.ID() + wrongParentAddr.SetObject(wrongParentID) + wrongParentAddr.SetContainer(idCnr) + wrongParent := generateObject(wrongParentAddr, nil, nil) + + rightObj := children[len(children)-1] + + idLast, _ := splitInfo.LastPart() + rightObj.SetID(idLast) + rightObj.SetParentID(addr.Object()) + rightObj.SetParent(srcObj) + + firstObj := children[0] + firstObj.SetParent(wrongParent) + firstObj.SetParentID(wrongParentID) + + c1 := newTestClient() + c1.addResult(addr, nil, errors.New("any error")) + + for i := range children { + c1.addResult(object.AddressOf(children[i]), nil, errors.New("any error")) + } + + c2 := newTestClient() + c2.addResult(addr, nil, objectSDK.NewSplitInfoError(splitInfo)) + + for i := range children { + c2.addResult(object.AddressOf(children[i]), children[i], nil) + } + + builder := &testPlacementBuilder{ + vectors: map[string][][]netmap.NodeInfo{}, + } + + builder.vectors[addr.EncodeToString()] = ns + + for i := range children { + builder.vectors[object.AddressOf(children[i]).EncodeToString()] = ns + } + + svc := newSvc(builder, &testClientCache{ + clients: map[string]*testClient{ + as[0][0]: c1, + as[0][1]: c2, + }, + }) + + testHeadVirtual(svc, addr, splitInfo) + + w := NewSimpleObjectWriter() + + p := newPrm(false, w) + p.WithAddress(addr) + + err := svc.Get(ctx, p) + require.NoError(t, err) //TODO fix me, it must be an error, corrupted chain + //require.Equal(t, err.Error(), "parent address in child object differs") + require.Equal(t, srcObj, w.Object()) + + w = NewSimpleObjectWriter() + payloadSz := srcObj.PayloadSize() + + off := payloadSz / 3 + ln := payloadSz / 3 + + rngPrm := newRngPrm(false, w, off, ln) + rngPrm.WithAddress(addr) + + err = svc.GetRange(ctx, rngPrm) + require.NoError(t, err) //TODO fix me, it must be an error, corrupted chain + //require.Equal(t, err.Error(), "parent address in child object differs") + require.Equal(t, payload[off:off+ln], w.Object().Payload()) + }) + t.Run("OK", func(t *testing.T) { addr := oidtest.Address() addr.SetContainer(idCnr) @@ -1115,6 +1574,45 @@ func TestGetRemoteSmall(t *testing.T) { require.Equal(t, payload[off:off+ln], w.Object().Payload()) }) }) + + t.Run("corrupted source object", func(t *testing.T) { + addr := oidtest.Address() + addr.SetContainer(idCnr) + addr.SetObject(oidtest.ID()) + + ns, as := testNodeMatrix(t, []int{2}) + + splitInfo := objectSDK.NewSplitInfo() + + c1 := newTestClient() + c1.addResult(addr, nil, errors.New("any error")) + + c2 := newTestClient() + c2.addResult(addr, nil, objectSDK.NewSplitInfoError(splitInfo)) + + builder := &testPlacementBuilder{ + vectors: map[string][][]netmap.NodeInfo{}, + } + + builder.vectors[addr.EncodeToString()] = ns + + svc := newSvc(builder, &testClientCache{ + clients: map[string]*testClient{ + as[0][0]: c1, + as[0][1]: c2, + }, + }) + + testHeadVirtual(svc, addr, splitInfo) + + w := NewSimpleObjectWriter() + + p := newPrm(false, w) + p.WithAddress(addr) + + err := svc.Get(ctx, p) + require.ErrorAs(t, err, new(*objectSDK.SplitInfoError)) + }) }) } -- 2.45.2 From 07de839f1819d186b1b001c30588df0d2dbb0cd6 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Thu, 9 Mar 2023 09:54:12 +0300 Subject: [PATCH 24/70] [#85] get-service: Fix corrupted chain logic Should return an error in case of a broken LOB reference chain. Signed-off-by: Dmitrii Stepanov --- pkg/services/object/get/assemble.go | 3 +++ pkg/services/object/get/exec.go | 4 ++++ pkg/services/object/get/get_test.go | 27 ++++++++++++--------------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pkg/services/object/get/assemble.go b/pkg/services/object/get/assemble.go index 99195290..b6e1c4fb 100644 --- a/pkg/services/object/get/assemble.go +++ b/pkg/services/object/get/assemble.go @@ -1,6 +1,8 @@ package getsvc import ( + "errors" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" @@ -90,6 +92,7 @@ func (exec *execCtx) initFromChild(obj oid.ID) (prev *oid.ID, children []oid.ID) par := child.Parent() if par == nil { exec.status = statusUndefined + exec.err = errors.New("received child with empty parent") log.Debug("received child with empty parent") diff --git a/pkg/services/object/get/exec.go b/pkg/services/object/get/exec.go index 26f607a1..505ff043 100644 --- a/pkg/services/object/get/exec.go +++ b/pkg/services/object/get/exec.go @@ -220,6 +220,8 @@ func (exec *execCtx) getChild(id oid.ID, rng *objectSDK.Range, withHdr bool) (*o exec.err = errors.New("wrong child header") exec.log.Debug("parent address in child object differs") + + return nil, false } return child, ok @@ -256,8 +258,10 @@ func (exec *execCtx) headChild(id oid.ID) (*objectSDK.Object, bool) { if !exec.isChild(child) { exec.status = statusUndefined + exec.err = errors.New("parent address in child object differs") exec.log.Debug("parent address in child object differs") + return nil, false } else { exec.status = statusOK exec.err = nil diff --git a/pkg/services/object/get/get_test.go b/pkg/services/object/get/get_test.go index ed239527..8329a82a 100644 --- a/pkg/services/object/get/get_test.go +++ b/pkg/services/object/get/get_test.go @@ -1094,8 +1094,8 @@ func TestGetRemoteSmall(t *testing.T) { p.WithAddress(addr) err := svc.Get(ctx, p) - require.NoError(t, err) //TODO fix me - //require.Equal(t, err.Error(), "wrong child header") + require.Error(t, err) + require.Equal(t, err.Error(), "wrong child header") w = NewSimpleObjectWriter() payloadSz := srcObj.PayloadSize() @@ -1107,9 +1107,8 @@ func TestGetRemoteSmall(t *testing.T) { rngPrm.WithAddress(addr) err = svc.GetRange(ctx, rngPrm) - require.ErrorAs(t, err, new(*apistatus.ObjectOutOfRange)) //TODO fix me - //require.Equal(t, err.Error(), "wrong child header") - + require.Error(t, err) + require.Equal(t, err.Error(), "wrong child header") }) t.Run("linked object with parent udefined", func(t *testing.T) { @@ -1180,8 +1179,8 @@ func TestGetRemoteSmall(t *testing.T) { p.WithAddress(addr) err := svc.Get(ctx, p) - require.NoError(t, err) //TODO fix me - //require.Equal(t, err.Error(), "received child with empty parent") + require.Error(t, err) + require.Equal(t, err.Error(), "received child with empty parent") w = NewSimpleObjectWriter() payloadSz := srcObj.PayloadSize() @@ -1193,8 +1192,8 @@ func TestGetRemoteSmall(t *testing.T) { rngPrm.WithAddress(addr) err = svc.GetRange(ctx, rngPrm) - require.NoError(t, err) //TODO fix me - //require.Equal(t, err.Error(), "received child with empty parent") + require.Error(t, err) + require.Equal(t, err.Error(), "received child with empty parent") }) t.Run("out of range", func(t *testing.T) { @@ -1465,9 +1464,8 @@ func TestGetRemoteSmall(t *testing.T) { p.WithAddress(addr) err := svc.Get(ctx, p) - require.NoError(t, err) //TODO fix me, it must be an error, corrupted chain - //require.Equal(t, err.Error(), "parent address in child object differs") - require.Equal(t, srcObj, w.Object()) + require.Error(t, err) + require.Equal(t, err.Error(), "parent address in child object differs") w = NewSimpleObjectWriter() payloadSz := srcObj.PayloadSize() @@ -1479,9 +1477,8 @@ func TestGetRemoteSmall(t *testing.T) { rngPrm.WithAddress(addr) err = svc.GetRange(ctx, rngPrm) - require.NoError(t, err) //TODO fix me, it must be an error, corrupted chain - //require.Equal(t, err.Error(), "parent address in child object differs") - require.Equal(t, payload[off:off+ln], w.Object().Payload()) + require.Error(t, err) + require.Equal(t, err.Error(), "parent address in child object differs") }) t.Run("OK", func(t *testing.T) { -- 2.45.2 From b8e93d4c08962aa54dfd9f345f75853053ea555b Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Thu, 9 Mar 2023 11:02:27 +0300 Subject: [PATCH 25/70] [#85] get-service: Use assembler to assemble LOB Signed-off-by: Dmitrii Stepanov --- pkg/services/object/get/assemble.go | 300 ++++++------------ pkg/services/object/get/assembler.go | 15 +- pkg/services/object/get/exec.go | 88 +---- pkg/services/object/get/get_test.go | 20 +- pkg/services/object/get/prm.go | 5 +- pkg/services/object/get/util.go | 15 +- pkg/services/object/get/v2/streamer.go | 8 +- pkg/services/object/get/v2/util.go | 8 +- .../object_manager/tombstone/source/source.go | 2 +- 9 files changed, 126 insertions(+), 335 deletions(-) diff --git a/pkg/services/object/get/assemble.go b/pkg/services/object/get/assemble.go index b6e1c4fb..ed77b569 100644 --- a/pkg/services/object/get/assemble.go +++ b/pkg/services/object/get/assemble.go @@ -1,6 +1,7 @@ package getsvc import ( + "context" "errors" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" @@ -35,223 +36,102 @@ func (exec *execCtx) assemble() { exec.log.Debug("trying to assemble the object...") - splitInfo := exec.splitInfo() + assembler := newAssembler(exec.address(), exec.splitInfo(), exec.ctxRange(), exec) - childID, ok := splitInfo.Link() - if !ok { - childID, ok = splitInfo.LastPart() - if !ok { - exec.log.Debug("neither linking nor last part of split-chain is presented in split info") - return - } - } - - prev, children := exec.initFromChild(childID) - - if len(children) > 0 { - if exec.ctxRange() == nil { - if ok := exec.writeCollectedHeader(); ok { - exec.overtakePayloadDirectly(children, nil, true) - } - } else { - // TODO: #1155 choose one-by-one restoring algorithm according to size - // * if size > MAX => go right-to-left with HEAD and back with GET - // * else go right-to-left with GET and compose in single object before writing - - if ok := exec.overtakePayloadInReverse(children[len(children)-1]); ok { - // payload of all children except the last are written, write last payload - exec.writeObjectPayload(exec.collectedObject) - } - } - } else if prev != nil { - if ok := exec.writeCollectedHeader(); ok { - // TODO: #1155 choose one-by-one restoring algorithm according to size - // * if size > MAX => go right-to-left with HEAD and back with GET - // * else go right-to-left with GET and compose in single object before writing - - if ok := exec.overtakePayloadInReverse(*prev); ok { - // payload of all children except the last are written, write last payloa - exec.writeObjectPayload(exec.collectedObject) - } - } - } else { - exec.log.Debug("could not init parent from child") - } -} - -func (exec *execCtx) initFromChild(obj oid.ID) (prev *oid.ID, children []oid.ID) { - log := exec.log.With(zap.Stringer("child ID", obj)) - - log.Debug("starting assembling from child") - - child, ok := exec.getChild(obj, nil, true) - if !ok { - return - } - - par := child.Parent() - if par == nil { - exec.status = statusUndefined - exec.err = errors.New("received child with empty parent") - - log.Debug("received child with empty parent") - - return - } - - exec.collectedObject = par - - var payload []byte - - if rng := exec.ctxRange(); rng != nil { - seekOff := rng.GetOffset() - seekLen := rng.GetLength() - seekTo := seekOff + seekLen - parSize := par.PayloadSize() - - if seekTo < seekOff || parSize < seekOff || parSize < seekTo { - var errOutOfRange apistatus.ObjectOutOfRange - - exec.err = &errOutOfRange - exec.status = statusOutOfRange - - return - } - - childSize := child.PayloadSize() - - exec.curOff = parSize - childSize - - from := uint64(0) - if exec.curOff < seekOff { - from = seekOff - exec.curOff - } - - to := uint64(0) - if seekOff+seekLen > exec.curOff+from { - to = seekOff + seekLen - exec.curOff - } - - payload = child.Payload()[from:to] - rng.SetLength(rng.GetLength() - to + from) - } else { - payload = child.Payload() - } - - exec.collectedObject.SetPayload(payload) - - idPrev, ok := child.PreviousID() - if ok { - return &idPrev, child.Children() - } - - return nil, child.Children() -} - -func (exec *execCtx) overtakePayloadDirectly(children []oid.ID, rngs []objectSDK.Range, checkRight bool) { - withRng := len(rngs) > 0 && exec.ctxRange() != nil - - for i := range children { - var r *objectSDK.Range - if withRng { - r = &rngs[i] - } - - child, ok := exec.getChild(children[i], r, !withRng && checkRight) - if !ok { - return - } - - if ok := exec.writeObjectPayload(child); !ok { - return - } - } - - exec.status = statusOK - exec.err = nil -} - -func (exec *execCtx) overtakePayloadInReverse(prev oid.ID) bool { - chain, rngs, ok := exec.buildChainInReverse(prev) - if !ok { - return false - } - - reverseRngs := len(rngs) > 0 - - // reverse chain - for left, right := 0, len(chain)-1; left < right; left, right = left+1, right-1 { - chain[left], chain[right] = chain[right], chain[left] - - if reverseRngs { - rngs[left], rngs[right] = rngs[right], rngs[left] - } - } - - exec.overtakePayloadDirectly(chain, rngs, false) - - return exec.status == statusOK -} - -func (exec *execCtx) buildChainInReverse(prev oid.ID) ([]oid.ID, []objectSDK.Range, bool) { - var ( - chain = make([]oid.ID, 0) - rngs = make([]objectSDK.Range, 0) - seekRng = exec.ctxRange() - from = seekRng.GetOffset() - to = from + seekRng.GetLength() - - withPrev = true + exec.log.Debug("assembling splitted object...", + zap.Stringer("address", exec.address()), + zap.Uint64("range_offset", exec.ctxRange().GetOffset()), + zap.Uint64("range_length", exec.ctxRange().GetLength()), + ) + defer exec.log.Debug("assembling splitted object completed", + zap.Stringer("address", exec.address()), + zap.Uint64("range_offset", exec.ctxRange().GetOffset()), + zap.Uint64("range_length", exec.ctxRange().GetLength()), ) - // fill the chain end-to-start - for withPrev { - // check that only for "range" requests, - // for `GET` it stops via the false `withPrev` - if seekRng != nil && exec.curOff <= from { - break - } - - head, ok := exec.headChild(prev) - if !ok { - return nil, nil, false - } - - if seekRng != nil { - sz := head.PayloadSize() - - exec.curOff -= sz - - if exec.curOff < to { - off := uint64(0) - if from > exec.curOff { - off = from - exec.curOff - sz -= from - exec.curOff - } - - if to < exec.curOff+off+sz { - sz = to - off - exec.curOff - } - - index := len(rngs) - rngs = append(rngs, objectSDK.Range{}) - rngs[index].SetOffset(off) - rngs[index].SetLength(sz) - - id, _ := head.ID() - chain = append(chain, id) - } - } else { - id, _ := head.ID() - chain = append(chain, id) - } - - prev, withPrev = head.PreviousID() + obj, err := assembler.Assemble(exec.context(), exec.prm.objWriter) + if err != nil { + exec.log.Warn("failed to assemble splitted object", + zap.Error(err), + zap.Stringer("address", exec.address()), + zap.Uint64("range_offset", exec.ctxRange().GetOffset()), + zap.Uint64("range_length", exec.ctxRange().GetLength()), + ) } - return chain, rngs, true + var errSplitInfo *objectSDK.SplitInfoError + var errRemovedRemote *apistatus.ObjectAlreadyRemoved + var errOutOfRangeRemote *apistatus.ObjectOutOfRange + var errRemovedLocal apistatus.ObjectAlreadyRemoved + var errOutOfRangeLocal apistatus.ObjectOutOfRange + + switch { + default: + exec.status = statusUndefined + exec.err = err + case err == nil: + exec.status = statusOK + exec.err = nil + exec.collectedObject = obj + case errors.As(err, &errRemovedRemote): + exec.status = statusINHUMED + exec.err = errRemovedRemote + case errors.As(err, &errRemovedLocal): + exec.status = statusINHUMED + exec.err = errRemovedLocal + case errors.As(err, &errSplitInfo): + exec.status = statusVIRTUAL + exec.err = errSplitInfo + case errors.As(err, &errOutOfRangeRemote): + exec.status = statusOutOfRange + exec.err = errOutOfRangeRemote + case errors.As(err, &errOutOfRangeLocal): + exec.status = statusOutOfRange + exec.err = errOutOfRangeLocal + } } func equalAddresses(a, b oid.Address) bool { return a.Container().Equals(b.Container()) && a.Object().Equals(b.Object()) } + +func (exec *execCtx) HeadObject(ctx context.Context, id oid.ID) (*objectSDK.Object, error) { + p := exec.prm + p.common = p.common.WithLocalOnly(false) + p.addr.SetContainer(exec.containerID()) + p.addr.SetObject(id) + + prm := HeadPrm{ + commonPrm: p.commonPrm, + } + + w := NewSimpleObjectWriter() + prm.SetHeaderWriter(w) + + err := exec.svc.Head(exec.context(), prm) + + if err != nil { + return nil, err + } + + return w.Object(), nil +} + +func (exec *execCtx) GetObject(ctx context.Context, id oid.ID, rng *objectSDK.Range) (*objectSDK.Object, error) { + w := NewSimpleObjectWriter() + + p := exec.prm + p.common = p.common.WithLocalOnly(false) + p.objWriter = w + p.SetRange(rng) + + p.addr.SetContainer(exec.containerID()) + p.addr.SetObject(id) + + statusError := exec.svc.get(exec.context(), p.commonPrm, withPayloadRange(rng)) + + if statusError.err != nil { + return nil, statusError.err + } + return w.Object(), nil +} diff --git a/pkg/services/object/get/assembler.go b/pkg/services/object/get/assembler.go index 97f88cc9..4ae1981b 100644 --- a/pkg/services/object/get/assembler.go +++ b/pkg/services/object/get/assembler.go @@ -15,11 +15,6 @@ type objectGetter interface { HeadObject(ctx context.Context, id oid.ID) (*objectSDK.Object, error) } -type objectWriter interface { - WriteChunk(context.Context, []byte) error - WriteHeader(context.Context, *objectSDK.Object) error -} - var ( errParentAddressDiffers = errors.New("parent address in child object differs") ) @@ -50,7 +45,7 @@ func newAssembler( // Assemble assembles splitted large object and writes it's content to ObjectWriter. // It returns parent object. -func (a *assembler) Assemble(ctx context.Context, writer objectWriter) (*objectSDK.Object, error) { +func (a *assembler) Assemble(ctx context.Context, writer ObjectWriter) (*objectSDK.Object, error) { sourceObjectID, ok := a.getLastPartOrLinkObjectID() if !ok { return nil, objectSDK.NewSplitInfoError(a.splitInfo) @@ -153,7 +148,7 @@ func (a *assembler) getChildObject(ctx context.Context, id oid.ID, rng *objectSD return obj, nil } -func (a *assembler) assembleObjectByChildrenList(ctx context.Context, childrenIDs []oid.ID, writer objectWriter) error { +func (a *assembler) assembleObjectByChildrenList(ctx context.Context, childrenIDs []oid.ID, writer ObjectWriter) error { if a.rng == nil { if err := writer.WriteHeader(ctx, a.parentObject.CutPayload()); err != nil { return err @@ -170,7 +165,7 @@ func (a *assembler) assembleObjectByChildrenList(ctx context.Context, childrenID return nil } -func (a *assembler) assemleObjectByPreviousIDInReverse(ctx context.Context, prevID oid.ID, writer objectWriter) error { +func (a *assembler) assemleObjectByPreviousIDInReverse(ctx context.Context, prevID oid.ID, writer ObjectWriter) error { if a.rng == nil { if err := writer.WriteHeader(ctx, a.parentObject.CutPayload()); err != nil { return err @@ -186,7 +181,7 @@ func (a *assembler) assemleObjectByPreviousIDInReverse(ctx context.Context, prev return nil } -func (a *assembler) assemblePayloadByObjectIDs(ctx context.Context, writer objectWriter, partIDs []oid.ID, partRanges []objectSDK.Range, verifyIsChild bool) error { +func (a *assembler) assemblePayloadByObjectIDs(ctx context.Context, writer ObjectWriter, partIDs []oid.ID, partRanges []objectSDK.Range, verifyIsChild bool) error { withRng := len(partRanges) > 0 && a.rng != nil for i := range partIDs { @@ -207,7 +202,7 @@ func (a *assembler) assemblePayloadByObjectIDs(ctx context.Context, writer objec return nil } -func (a *assembler) assemblePayloadInReverse(ctx context.Context, writer objectWriter, prevID oid.ID) error { +func (a *assembler) assemblePayloadInReverse(ctx context.Context, writer ObjectWriter, prevID oid.ID) error { chain, rngs, err := a.buildChain(ctx, prevID) if err != nil { return err diff --git a/pkg/services/object/get/exec.go b/pkg/services/object/get/exec.go index 505ff043..ac26eac3 100644 --- a/pkg/services/object/get/exec.go +++ b/pkg/services/object/get/exec.go @@ -3,10 +3,8 @@ package getsvc import ( "context" "crypto/ecdsa" - "errors" clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" - "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" @@ -36,8 +34,6 @@ type execCtx struct { collectedObject *objectSDK.Object - curOff uint64 - head bool curProcEpoch uint64 @@ -99,15 +95,6 @@ func (exec execCtx) address() oid.Address { return exec.prm.addr } -// isChild checks if reading object is a parent of the given object. -// Object without reference to the parent (only children with the parent header -// have it) is automatically considered as child: this should be guaranteed by -// upper level logic. -func (exec execCtx) isChild(obj *objectSDK.Object) bool { - par := obj.Parent() - return par == nil || equalAddresses(exec.address(), object.AddressOf(par)) -} - func (exec execCtx) key() (*ecdsa.PrivateKey, error) { if exec.prm.signerKey != nil { // the key has already been requested and @@ -199,78 +186,6 @@ func (exec *execCtx) generateTraverser(addr oid.Address) (*placement.Traverser, } } -func (exec *execCtx) getChild(id oid.ID, rng *objectSDK.Range, withHdr bool) (*objectSDK.Object, bool) { - w := NewSimpleObjectWriter() - - p := exec.prm - p.common = p.common.WithLocalOnly(false) - p.objWriter = w - p.SetRange(rng) - - p.addr.SetContainer(exec.containerID()) - p.addr.SetObject(id) - - exec.statusError = exec.svc.get(exec.context(), p.commonPrm, withPayloadRange(rng)) - - child := w.Object() - ok := exec.status == statusOK - - if ok && withHdr && !exec.isChild(child) { - exec.status = statusUndefined - exec.err = errors.New("wrong child header") - - exec.log.Debug("parent address in child object differs") - - return nil, false - } - - return child, ok -} - -func (exec *execCtx) headChild(id oid.ID) (*objectSDK.Object, bool) { - p := exec.prm - p.common = p.common.WithLocalOnly(false) - p.addr.SetContainer(exec.containerID()) - p.addr.SetObject(id) - - prm := HeadPrm{ - commonPrm: p.commonPrm, - } - - w := NewSimpleObjectWriter() - prm.SetHeaderWriter(w) - - err := exec.svc.Head(exec.context(), prm) - - switch { - default: - exec.status = statusUndefined - exec.err = err - - exec.log.Debug("could not get child object header", - zap.Stringer("child ID", id), - zap.String("error", err.Error()), - ) - - return nil, false - case err == nil: - child := w.Object() - - if !exec.isChild(child) { - exec.status = statusUndefined - exec.err = errors.New("parent address in child object differs") - - exec.log.Debug("parent address in child object differs") - return nil, false - } else { - exec.status = statusOK - exec.err = nil - } - - return child, true - } -} - func (exec execCtx) remoteClient(info clientcore.NodeInfo) (getClient, bool) { c, err := exec.svc.clientCache.get(info) @@ -307,6 +222,7 @@ func (exec *execCtx) writeCollectedHeader() bool { } err := exec.prm.objWriter.WriteHeader( + exec.context(), exec.collectedObject.CutPayload(), ) @@ -331,7 +247,7 @@ func (exec *execCtx) writeObjectPayload(obj *objectSDK.Object) bool { return true } - err := exec.prm.objWriter.WriteChunk(obj.Payload()) + err := exec.prm.objWriter.WriteChunk(exec.context(), obj.Payload()) switch { default: diff --git a/pkg/services/object/get/get_test.go b/pkg/services/object/get/get_test.go index 8329a82a..530e7054 100644 --- a/pkg/services/object/get/get_test.go +++ b/pkg/services/object/get/get_test.go @@ -216,11 +216,11 @@ func (whe *writeHeaderError) Error() string { type writeHeaderErrorObjectWriter struct { } -func (w *writeHeaderErrorObjectWriter) WriteHeader(_ *objectSDK.Object) error { +func (w *writeHeaderErrorObjectWriter) WriteHeader(_ context.Context, _ *objectSDK.Object) error { return &writeHeaderError{} } -func (w *writeHeaderErrorObjectWriter) WriteChunk(p []byte) error { +func (w *writeHeaderErrorObjectWriter) WriteChunk(_ context.Context, _ []byte) error { return nil } @@ -233,11 +233,11 @@ func (whe *writePayloadError) Error() string { type writePayloadErrorObjectWriter struct { } -func (w *writePayloadErrorObjectWriter) WriteHeader(_ *objectSDK.Object) error { +func (w *writePayloadErrorObjectWriter) WriteHeader(_ context.Context, _ *objectSDK.Object) error { return nil } -func (w *writePayloadErrorObjectWriter) WriteChunk(p []byte) error { +func (w *writePayloadErrorObjectWriter) WriteChunk(_ context.Context, _ []byte) error { return &writePayloadError{} } @@ -1094,8 +1094,7 @@ func TestGetRemoteSmall(t *testing.T) { p.WithAddress(addr) err := svc.Get(ctx, p) - require.Error(t, err) - require.Equal(t, err.Error(), "wrong child header") + require.ErrorIs(t, err, errParentAddressDiffers) w = NewSimpleObjectWriter() payloadSz := srcObj.PayloadSize() @@ -1107,8 +1106,7 @@ func TestGetRemoteSmall(t *testing.T) { rngPrm.WithAddress(addr) err = svc.GetRange(ctx, rngPrm) - require.Error(t, err) - require.Equal(t, err.Error(), "wrong child header") + require.ErrorIs(t, err, errParentAddressDiffers) }) t.Run("linked object with parent udefined", func(t *testing.T) { @@ -1464,8 +1462,7 @@ func TestGetRemoteSmall(t *testing.T) { p.WithAddress(addr) err := svc.Get(ctx, p) - require.Error(t, err) - require.Equal(t, err.Error(), "parent address in child object differs") + require.ErrorIs(t, err, errParentAddressDiffers) w = NewSimpleObjectWriter() payloadSz := srcObj.PayloadSize() @@ -1477,8 +1474,7 @@ func TestGetRemoteSmall(t *testing.T) { rngPrm.WithAddress(addr) err = svc.GetRange(ctx, rngPrm) - require.Error(t, err) - require.Equal(t, err.Error(), "parent address in child object differs") + require.ErrorIs(t, err, errParentAddressDiffers) }) t.Run("OK", func(t *testing.T) { diff --git a/pkg/services/object/get/prm.go b/pkg/services/object/get/prm.go index f548aecf..88848264 100644 --- a/pkg/services/object/get/prm.go +++ b/pkg/services/object/get/prm.go @@ -1,6 +1,7 @@ package getsvc import ( + "context" "crypto/ecdsa" "errors" "hash" @@ -85,13 +86,13 @@ type commonPrm struct { // ChunkWriter is an interface of target component // to write payload chunk. type ChunkWriter interface { - WriteChunk([]byte) error + WriteChunk(context.Context, []byte) error } // HeaderWriter is an interface of target component // to write object header. type HeaderWriter interface { - WriteHeader(*object.Object) error + WriteHeader(context.Context, *object.Object) error } // ObjectWriter is an interface of target component to write object. diff --git a/pkg/services/object/get/util.go b/pkg/services/object/get/util.go index bfd79bde..dc98e6c5 100644 --- a/pkg/services/object/get/util.go +++ b/pkg/services/object/get/util.go @@ -1,6 +1,7 @@ package getsvc import ( + "context" "crypto/ecdsa" "errors" "io" @@ -54,7 +55,7 @@ func NewSimpleObjectWriter() *SimpleObjectWriter { } } -func (s *SimpleObjectWriter) WriteHeader(obj *object.Object) error { +func (s *SimpleObjectWriter) WriteHeader(_ context.Context, obj *object.Object) error { s.obj = obj s.pld = make([]byte, 0, obj.PayloadSize()) @@ -62,7 +63,7 @@ func (s *SimpleObjectWriter) WriteHeader(obj *object.Object) error { return nil } -func (s *SimpleObjectWriter) WriteChunk(p []byte) error { +func (s *SimpleObjectWriter) WriteChunk(_ context.Context, p []byte) error { s.pld = append(s.pld, p...) return nil } @@ -231,12 +232,12 @@ func (e *storageEngineWrapper) get(exec *execCtx) (*object.Object, error) { } } -func (w *partWriter) WriteChunk(p []byte) error { - return w.chunkWriter.WriteChunk(p) +func (w *partWriter) WriteChunk(ctx context.Context, p []byte) error { + return w.chunkWriter.WriteChunk(ctx, p) } -func (w *partWriter) WriteHeader(o *object.Object) error { - return w.headWriter.WriteHeader(o) +func (w *partWriter) WriteHeader(ctx context.Context, o *object.Object) error { + return w.headWriter.WriteHeader(ctx, o) } func payloadOnlyObject(payload []byte) *object.Object { @@ -246,7 +247,7 @@ func payloadOnlyObject(payload []byte) *object.Object { return obj } -func (h *hasherWrapper) WriteChunk(p []byte) error { +func (h *hasherWrapper) WriteChunk(_ context.Context, p []byte) error { _, err := h.hash.Write(p) return err } diff --git a/pkg/services/object/get/v2/streamer.go b/pkg/services/object/get/v2/streamer.go index bccc409c..4347ef41 100644 --- a/pkg/services/object/get/v2/streamer.go +++ b/pkg/services/object/get/v2/streamer.go @@ -1,6 +1,8 @@ package getsvc import ( + "context" + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -14,7 +16,7 @@ type streamObjectRangeWriter struct { objectSvc.GetObjectRangeStream } -func (s *streamObjectWriter) WriteHeader(obj *object.Object) error { +func (s *streamObjectWriter) WriteHeader(_ context.Context, obj *object.Object) error { p := new(objectV2.GetObjectPartInit) objV2 := obj.ToV2() @@ -25,7 +27,7 @@ func (s *streamObjectWriter) WriteHeader(obj *object.Object) error { return s.GetObjectStream.Send(newResponse(p)) } -func (s *streamObjectWriter) WriteChunk(chunk []byte) error { +func (s *streamObjectWriter) WriteChunk(_ context.Context, chunk []byte) error { p := new(objectV2.GetObjectPartChunk) p.SetChunk(chunk) @@ -43,7 +45,7 @@ func newResponse(p objectV2.GetObjectPart) *objectV2.GetResponse { return r } -func (s *streamObjectRangeWriter) WriteChunk(chunk []byte) error { +func (s *streamObjectRangeWriter) WriteChunk(_ context.Context, chunk []byte) error { return s.GetObjectRangeStream.Send(newRangeResponse(chunk)) } diff --git a/pkg/services/object/get/v2/util.go b/pkg/services/object/get/v2/util.go index d3190d6d..e0393e56 100644 --- a/pkg/services/object/get/v2/util.go +++ b/pkg/services/object/get/v2/util.go @@ -162,7 +162,7 @@ func (s *Service) toPrm(req *objectV2.GetRequest, stream objectSvc.GetObjectStre obj.SetHeader(v.GetHeader()) onceHeaderSending.Do(func() { - err = streamWrapper.WriteHeader(object.NewFromV2(obj)) + err = streamWrapper.WriteHeader(stream.Context(), object.NewFromV2(obj)) }) if err != nil { return nil, fmt.Errorf("could not write object header in Get forwarder: %w", err) @@ -180,7 +180,7 @@ func (s *Service) toPrm(req *objectV2.GetRequest, stream objectSvc.GetObjectStre continue } - if err = streamWrapper.WriteChunk(chunk); err != nil { + if err = streamWrapper.WriteChunk(stream.Context(), chunk); err != nil { return nil, fmt.Errorf("could not write object chunk in Get forwarder: %w", err) } @@ -320,7 +320,7 @@ func (s *Service) toRangePrm(req *objectV2.GetRangeRequest, stream objectSvc.Get continue } - if err = streamWrapper.WriteChunk(chunk); err != nil { + if err = streamWrapper.WriteChunk(stream.Context(), chunk); err != nil { return nil, fmt.Errorf("could not write object chunk in GetRange forwarder: %w", err) } @@ -414,7 +414,7 @@ type headResponseWriter struct { body *objectV2.HeadResponseBody } -func (w *headResponseWriter) WriteHeader(hdr *object.Object) error { +func (w *headResponseWriter) WriteHeader(_ context.Context, hdr *object.Object) error { if w.mainOnly { w.body.SetHeaderPart(toShortObjectHeader(hdr)) } else { diff --git a/pkg/services/object_manager/tombstone/source/source.go b/pkg/services/object_manager/tombstone/source/source.go index 1cb40839..8dd0dcab 100644 --- a/pkg/services/object_manager/tombstone/source/source.go +++ b/pkg/services/object_manager/tombstone/source/source.go @@ -51,7 +51,7 @@ type headerWriter struct { o *objectSDK.Object } -func (h *headerWriter) WriteHeader(o *objectSDK.Object) error { +func (h *headerWriter) WriteHeader(_ context.Context, o *objectSDK.Object) error { h.o = o return nil } -- 2.45.2 From ac0a278a05686c83e39016b33a24237d2f0f39e2 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Thu, 9 Mar 2023 11:16:38 +0300 Subject: [PATCH 26/70] [#85] get-service: Drop unused assemble flag Signed-off-by: Dmitrii Stepanov --- pkg/services/object/get/exec.go | 2 +- pkg/services/object/get/get_test.go | 3 --- pkg/services/object/get/service.go | 10 ---------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pkg/services/object/get/exec.go b/pkg/services/object/get/exec.go index ac26eac3..c843e9b1 100644 --- a/pkg/services/object/get/exec.go +++ b/pkg/services/object/get/exec.go @@ -115,7 +115,7 @@ func (exec execCtx) key() (*ecdsa.PrivateKey, error) { } func (exec *execCtx) canAssemble() bool { - return exec.svc.assembly && !exec.isRaw() && !exec.headOnly() && !exec.isLocal() + return !exec.isRaw() && !exec.headOnly() && !exec.isLocal() } func (exec *execCtx) splitInfo() *objectSDK.SplitInfo { diff --git a/pkg/services/object/get/get_test.go b/pkg/services/object/get/get_test.go index 530e7054..09d0c38f 100644 --- a/pkg/services/object/get/get_test.go +++ b/pkg/services/object/get/get_test.go @@ -248,7 +248,6 @@ func TestGetLocalOnly(t *testing.T) { svc := &Service{cfg: new(cfg)} svc.log = test.NewLogger(false) svc.localStorage = storage - svc.assembly = true return svc } @@ -510,7 +509,6 @@ func TestGetRemoteSmall(t *testing.T) { svc := &Service{cfg: new(cfg)} svc.log = test.NewLogger(false) svc.localStorage = newTestStorage() - svc.assembly = true const curEpoch = 13 @@ -1644,7 +1642,6 @@ func TestGetFromPastEpoch(t *testing.T) { svc := &Service{cfg: new(cfg)} svc.log = test.NewLogger(false) svc.localStorage = newTestStorage() - svc.assembly = true const curEpoch = 13 diff --git a/pkg/services/object/get/service.go b/pkg/services/object/get/service.go index 123c67b3..e69ab4f0 100644 --- a/pkg/services/object/get/service.go +++ b/pkg/services/object/get/service.go @@ -26,8 +26,6 @@ type getClient interface { } type cfg struct { - assembly bool - log *logger.Logger localStorage interface { @@ -51,7 +49,6 @@ type cfg struct { func defaultCfg() *cfg { return &cfg{ - assembly: true, log: &logger.Logger{Logger: zap.L()}, localStorage: new(storageEngineWrapper), clientCache: new(clientCacheWrapper), @@ -79,13 +76,6 @@ func WithLogger(l *logger.Logger) Option { } } -// WithoutAssembly returns option to disable object assembling. -func WithoutAssembly() Option { - return func(c *cfg) { - c.assembly = false - } -} - // WithLocalStorageEngine returns option to set local storage // instance. func WithLocalStorageEngine(e *engine.StorageEngine) Option { -- 2.45.2 From b1c165a93bd3b27657ccc10dbaa90de5b9b015ae Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Wed, 15 Mar 2023 14:35:50 +0300 Subject: [PATCH 27/70] [#83] Fix shellcheck pre-commit action Original shellcheck action requires Docker to run and it's not always available, especially inside Docker containers. Replacing it with python wrapper to simplify usage with Docker-based CI systems like Drone and WoodpeckerCI. Signed-off-by: Stanislav Bogatyrev --- .pre-commit-config.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a58352f8..88fde1b6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,8 +29,7 @@ repos: - id: gitlint stages: [commit-msg] - - repo: https://github.com/koalaman/shellcheck-precommit - rev: v0.9.0 + - repo: https://github.com/shellcheck-py/shellcheck-py + rev: v0.9.0.2 hooks: - - id: shellcheck -# args: ["--severity=warning"] # Optionally only show errors and warnings + - id: shellcheck -- 2.45.2 From 724debfdcdd781af66a44f3d442fbe1ff634e5d0 Mon Sep 17 00:00:00 2001 From: Alejandro Lopez Date: Fri, 3 Mar 2023 12:33:08 +0300 Subject: [PATCH 28/70] [#81] node: Add basic read/write benchmarks for substorages Signed-off-by: Alejandro Lopez --- go.mod | 3 +- go.sum | 4 +- .../blobstor/memstore/control.go | 15 + .../blobstor/memstore/memstore.go | 168 ++++++++ .../blobstor/memstore/memstore_test.go | 68 +++ .../blobstor/memstore/option.go | 42 ++ .../blobstor/perf_test.go | 402 ++++++++++++++++++ 7 files changed, 699 insertions(+), 3 deletions(-) create mode 100644 pkg/local_object_storage/blobstor/memstore/control.go create mode 100644 pkg/local_object_storage/blobstor/memstore/memstore.go create mode 100644 pkg/local_object_storage/blobstor/memstore/memstore_test.go create mode 100644 pkg/local_object_storage/blobstor/memstore/option.go create mode 100644 pkg/local_object_storage/blobstor/perf_test.go diff --git a/go.mod b/go.mod index f27cf415..61cd5764 100644 --- a/go.mod +++ b/go.mod @@ -39,6 +39,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) +require golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 + require ( git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 // indirect git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 // indirect @@ -91,7 +93,6 @@ require ( github.com/urfave/cli v1.22.5 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.4.0 // indirect - golang.org/x/exp v0.0.0-20221227203929-1b447090c38c // indirect golang.org/x/net v0.4.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.3.0 // indirect diff --git a/go.sum b/go.sum index c743d706..93f805d2 100644 --- a/go.sum +++ b/go.sum @@ -545,8 +545,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20221227203929-1b447090c38c h1:Govq2W3bnHJimHT2ium65kXcI7ZzTniZHcFATnLJM0Q= -golang.org/x/exp v0.0.0-20221227203929-1b447090c38c/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI= +golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/pkg/local_object_storage/blobstor/memstore/control.go b/pkg/local_object_storage/blobstor/memstore/control.go new file mode 100644 index 00000000..4deb9f6e --- /dev/null +++ b/pkg/local_object_storage/blobstor/memstore/control.go @@ -0,0 +1,15 @@ +package memstore + +import "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + +func (s *memstoreImpl) Open(readOnly bool) error { + s.readOnly = readOnly + return nil +} + +func (s *memstoreImpl) Init() error { return nil } +func (s *memstoreImpl) Close() error { return nil } +func (s *memstoreImpl) Type() string { return Type } +func (s *memstoreImpl) Path() string { return s.rootPath } +func (s *memstoreImpl) SetCompressor(cc *compression.Config) { s.compression = cc } +func (s *memstoreImpl) SetReportErrorFunc(f func(string, error)) { s.reportError = f } diff --git a/pkg/local_object_storage/blobstor/memstore/memstore.go b/pkg/local_object_storage/blobstor/memstore/memstore.go new file mode 100644 index 00000000..12a81297 --- /dev/null +++ b/pkg/local_object_storage/blobstor/memstore/memstore.go @@ -0,0 +1,168 @@ +// Package memstore implements a memory-backed common.Storage for testing purposes. +package memstore + +import ( + "fmt" + "sync" + + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" +) + +const Type = "memstore" + +type memstoreImpl struct { + *cfg + mu sync.RWMutex + objs map[string][]byte +} + +func New(opts ...Option) common.Storage { + st := &memstoreImpl{ + cfg: defaultConfig(), + objs: map[string][]byte{}, + } + + for _, opt := range opts { + opt(st.cfg) + } + + return st +} + +func (s *memstoreImpl) Get(req common.GetPrm) (common.GetRes, error) { + key := req.Address.EncodeToString() + + s.mu.RLock() + data, exists := s.objs[key] + s.mu.RUnlock() + + if !exists { + return common.GetRes{}, logicerr.Wrap(apistatus.ObjectNotFound{}) + } + + // Decompress the data. + var err error + if data, err = s.compression.Decompress(data); err != nil { + return common.GetRes{}, fmt.Errorf("could not decompress object data: %w", err) + } + + // Unmarshal the SDK object. + obj := objectSDK.New() + if err := obj.Unmarshal(data); err != nil { + return common.GetRes{}, fmt.Errorf("could not unmarshal the object: %w", err) + } + + return common.GetRes{Object: obj, RawData: data}, nil +} + +func (s *memstoreImpl) GetRange(req common.GetRangePrm) (common.GetRangeRes, error) { + getResp, err := s.Get(common.GetPrm{ + Address: req.Address, + StorageID: req.StorageID, + }) + if err != nil { + return common.GetRangeRes{}, err + } + + payload := getResp.Object.Payload() + from := req.Range.GetOffset() + to := from + req.Range.GetLength() + + if pLen := uint64(len(payload)); to < from || pLen < from || pLen < to { + return common.GetRangeRes{}, logicerr.Wrap(apistatus.ObjectOutOfRange{}) + } + + return common.GetRangeRes{ + Data: payload[from:to], + }, nil +} + +func (s *memstoreImpl) Exists(req common.ExistsPrm) (common.ExistsRes, error) { + key := req.Address.EncodeToString() + + s.mu.RLock() + defer s.mu.RUnlock() + + _, exists := s.objs[key] + return common.ExistsRes{Exists: exists}, nil + +} + +func (s *memstoreImpl) Put(req common.PutPrm) (common.PutRes, error) { + if s.readOnly { + return common.PutRes{}, common.ErrReadOnly + } + if !req.DontCompress { + req.RawData = s.compression.Compress(req.RawData) + } + + key := req.Address.EncodeToString() + + s.mu.Lock() + defer s.mu.Unlock() + + s.objs[key] = req.RawData + return common.PutRes{StorageID: []byte(s.rootPath)}, nil +} + +func (s *memstoreImpl) Delete(req common.DeletePrm) (common.DeleteRes, error) { + if s.readOnly { + return common.DeleteRes{}, common.ErrReadOnly + } + + key := req.Address.EncodeToString() + + s.mu.Lock() + defer s.mu.Unlock() + + if _, exists := s.objs[key]; exists { + delete(s.objs, key) + return common.DeleteRes{}, nil + } + + return common.DeleteRes{}, logicerr.Wrap(apistatus.ObjectNotFound{}) +} + +func (s *memstoreImpl) Iterate(req common.IteratePrm) (common.IterateRes, error) { + s.mu.RLock() + defer s.mu.RUnlock() + for k, v := range s.objs { + elem := common.IterationElement{ + ObjectData: v, + } + if err := elem.Address.DecodeString(string(k)); err != nil { + if req.IgnoreErrors { + continue + } + return common.IterateRes{}, logicerr.Wrap(fmt.Errorf("(%T) decoding address string %q: %v", s, string(k), err)) + } + var err error + if elem.ObjectData, err = s.compression.Decompress(elem.ObjectData); err != nil { + if req.IgnoreErrors { + if req.ErrorHandler != nil { + return common.IterateRes{}, req.ErrorHandler(elem.Address, err) + } + continue + } + return common.IterateRes{}, logicerr.Wrap(fmt.Errorf("(%T) decompressing data for address %q: %v", s, elem.Address.String(), err)) + } + switch { + case req.Handler != nil: + if err := req.Handler(elem); err != nil { + return common.IterateRes{}, err + } + case req.LazyHandler != nil: + if err := req.LazyHandler(elem.Address, func() ([]byte, error) { return elem.ObjectData, nil }); err != nil { + return common.IterateRes{}, err + } + default: + if !req.IgnoreErrors { + return common.IterateRes{}, logicerr.Wrap(fmt.Errorf("(%T) no Handler or LazyHandler set for IteratePrm", s)) + } + } + } + return common.IterateRes{}, nil +} diff --git a/pkg/local_object_storage/blobstor/memstore/memstore_test.go b/pkg/local_object_storage/blobstor/memstore/memstore_test.go new file mode 100644 index 00000000..531a7d9e --- /dev/null +++ b/pkg/local_object_storage/blobstor/memstore/memstore_test.go @@ -0,0 +1,68 @@ +package memstore + +import ( + "testing" + + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + "github.com/stretchr/testify/require" + "go.uber.org/zap/zaptest" +) + +func TestSimpleLifecycle(t *testing.T) { + s := New( + WithRootPath("memstore"), + WithLogger(&logger.Logger{Logger: zaptest.NewLogger(t)}), + ) + t.Cleanup(func() { _ = s.Close() }) + require.NoError(t, s.Open(false)) + require.NoError(t, s.Init()) + + obj := blobstortest.NewObject(1024) + addr := object.AddressOf(obj) + d, err := obj.Marshal() + require.NoError(t, err) + + { + _, err := s.Put(common.PutPrm{Address: addr, RawData: d, DontCompress: true}) + require.NoError(t, err) + } + + { + resp, err := s.Exists(common.ExistsPrm{Address: addr}) + require.NoError(t, err) + require.True(t, resp.Exists) + } + + { + resp, err := s.Get(common.GetPrm{Address: addr}) + require.NoError(t, err) + require.Equal(t, obj.Payload(), resp.Object.Payload()) + } + + { + var objRange objectSDK.Range + objRange.SetOffset(256) + objRange.SetLength(512) + resp, err := s.GetRange(common.GetRangePrm{ + Address: addr, + Range: objRange, + }) + require.NoError(t, err) + require.Equal(t, obj.Payload()[objRange.GetOffset():objRange.GetOffset()+objRange.GetLength()], resp.Data) + } + + { + _, err := s.Delete(common.DeletePrm{Address: addr}) + require.NoError(t, err) + } + + { + resp, err := s.Exists(common.ExistsPrm{Address: addr}) + require.NoError(t, err) + require.False(t, resp.Exists) + } +} diff --git a/pkg/local_object_storage/blobstor/memstore/option.go b/pkg/local_object_storage/blobstor/memstore/option.go new file mode 100644 index 00000000..3d67b1e9 --- /dev/null +++ b/pkg/local_object_storage/blobstor/memstore/option.go @@ -0,0 +1,42 @@ +package memstore + +import ( + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + "go.uber.org/zap" +) + +type cfg struct { + log *logger.Logger + rootPath string + readOnly bool + compression *compression.Config + reportError func(string, error) +} + +func defaultConfig() *cfg { + return &cfg{ + log: &logger.Logger{Logger: zap.L()}, + reportError: func(string, error) {}, + } +} + +type Option func(*cfg) + +func WithLogger(l *logger.Logger) Option { + return func(c *cfg) { + c.log = l + } +} + +func WithRootPath(p string) Option { + return func(c *cfg) { + c.rootPath = p + } +} + +func WithReadOnly(ro bool) Option { + return func(c *cfg) { + c.readOnly = ro + } +} diff --git a/pkg/local_object_storage/blobstor/perf_test.go b/pkg/local_object_storage/blobstor/perf_test.go new file mode 100644 index 00000000..96d90266 --- /dev/null +++ b/pkg/local_object_storage/blobstor/perf_test.go @@ -0,0 +1,402 @@ +package blobstor + +import ( + "encoding/binary" + "fmt" + "os" + "testing" + + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/memstore" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + "github.com/stretchr/testify/require" + "go.uber.org/atomic" + "golang.org/x/exp/rand" + "golang.org/x/exp/slices" +) + +// The storages to benchmark. Each storage has a description and a function which returns the actual +// storage along with a cleanup function. +var storages = []struct { + desc string + create func(*testing.B) (common.Storage, func()) +}{ + { + desc: "memstore", + create: func(*testing.B) (common.Storage, func()) { + return memstore.New(), func() {} + }, + }, + { + desc: "fstree_nosync", + create: func(b *testing.B) (common.Storage, func()) { + dir, err := os.MkdirTemp(os.TempDir(), "fstree_nosync") + if err != nil { + b.Fatalf("creating fstree_nosync root path: %v", err) + } + cleanup := func() { os.RemoveAll(dir) } + return fstree.New( + fstree.WithPath(dir), + fstree.WithDepth(2), + fstree.WithDirNameLen(2), + fstree.WithNoSync(true), + ), cleanup + }, + }, + { + desc: "fstree", + create: func(b *testing.B) (common.Storage, func()) { + dir, err := os.MkdirTemp(os.TempDir(), "fstree") + if err != nil { + b.Fatalf("creating fstree root path: %v", err) + } + cleanup := func() { os.RemoveAll(dir) } + return fstree.New( + fstree.WithPath(dir), + fstree.WithDepth(2), + fstree.WithDirNameLen(2), + ), cleanup + }, + }, + { + desc: "blobovniczatree", + create: func(b *testing.B) (common.Storage, func()) { + dir, err := os.MkdirTemp(os.TempDir(), "blobovniczatree") + if err != nil { + b.Fatalf("creating blobovniczatree root path: %v", err) + } + cleanup := func() { os.RemoveAll(dir) } + return blobovniczatree.NewBlobovniczaTree( + blobovniczatree.WithRootPath(dir), + ), cleanup + }, + }, +} + +func BenchmarkSubstorageReadPerf(b *testing.B) { + readTests := []struct { + desc string + size int + objGen func() objectGenerator + addrGen func() addressGenerator + }{ + { + desc: "seq100", + size: 10000, + objGen: func() objectGenerator { return &seqObjGenerator{objSize: 100} }, + addrGen: func() addressGenerator { return &seqAddrGenerator{maxID: 100} }, + }, + { + desc: "rand100", + size: 10000, + objGen: func() objectGenerator { return &seqObjGenerator{objSize: 100} }, + addrGen: func() addressGenerator { return randAddrGenerator(10000) }, + }, + } + for _, tt := range readTests { + for _, stEntry := range storages { + b.Run(fmt.Sprintf("%s-%s", stEntry.desc, tt.desc), func(b *testing.B) { + objGen := tt.objGen() + st, cleanup := stEntry.create(b) + + require.NoError(b, st.Open(false)) + require.NoError(b, st.Init()) + + // Fill database + for i := 0; i < tt.size; i++ { + obj := objGen.Next() + addr := addressFromObject(obj) + raw, err := obj.Marshal() + require.NoError(b, err) + if _, err := st.Put(common.PutPrm{ + Address: addr, + RawData: raw, + }); err != nil { + b.Fatalf("writing entry: %v", err) + } + } + + // Benchmark reading + addrGen := tt.addrGen() + b.ResetTimer() + b.RunParallel(func(pb *testing.PB) { + for pb.Next() { + _, err := st.Get(common.GetPrm{Address: addrGen.Next()}) + require.NoError(b, err) + } + }) + + require.NoError(b, st.Close()) + cleanup() + }) + } + } +} + +func BenchmarkSubstorageWritePerf(b *testing.B) { + generators := []struct { + desc string + create func() objectGenerator + }{ + {desc: "rand10", create: func() objectGenerator { return &randObjGenerator{objSize: 10} }}, + {desc: "rand100", create: func() objectGenerator { return &randObjGenerator{objSize: 100} }}, + {desc: "rand1000", create: func() objectGenerator { return &randObjGenerator{objSize: 1000} }}, + {desc: "overwrite10", create: func() objectGenerator { return &overwriteObjGenerator{objSize: 10, maxObjects: 100} }}, + {desc: "overwrite100", create: func() objectGenerator { return &overwriteObjGenerator{objSize: 100, maxObjects: 100} }}, + {desc: "overwrite1000", create: func() objectGenerator { return &overwriteObjGenerator{objSize: 1000, maxObjects: 100} }}, + } + + for _, genEntry := range generators { + for _, stEntry := range storages { + b.Run(fmt.Sprintf("%s-%s", stEntry.desc, genEntry.desc), func(b *testing.B) { + gen := genEntry.create() + st, cleanup := stEntry.create(b) + + require.NoError(b, st.Open(false)) + require.NoError(b, st.Init()) + + b.ResetTimer() + b.RunParallel(func(pb *testing.PB) { + for pb.Next() { + obj := gen.Next() + addr := addressFromObject(obj) + raw, err := obj.Marshal() + require.NoError(b, err) + if _, err := st.Put(common.PutPrm{ + Address: addr, + RawData: raw, + }); err != nil { + b.Fatalf("writing entry: %v", err) + } + } + }) + + require.NoError(b, st.Close()) + cleanup() + }) + } + } +} + +func BenchmarkSubstorageIteratePerf(b *testing.B) { + iterateTests := []struct { + desc string + size int + objGen func() objectGenerator + }{ + { + desc: "rand100", + size: 10000, + objGen: func() objectGenerator { return &randObjGenerator{objSize: 100} }, + }, + } + for _, tt := range iterateTests { + for _, stEntry := range storages { + b.Run(fmt.Sprintf("%s-%s", stEntry.desc, tt.desc), func(b *testing.B) { + objGen := tt.objGen() + st, cleanup := stEntry.create(b) + + require.NoError(b, st.Open(false)) + require.NoError(b, st.Init()) + + // Fill database + for i := 0; i < tt.size; i++ { + obj := objGen.Next() + addr := addressFromObject(obj) + raw, err := obj.Marshal() + require.NoError(b, err) + if _, err := st.Put(common.PutPrm{ + Address: addr, + RawData: raw, + }); err != nil { + b.Fatalf("writing entry: %v", err) + } + } + + // Benchmark iterate + cnt := 0 + b.ResetTimer() + _, err := st.Iterate(common.IteratePrm{ + Handler: func(elem common.IterationElement) error { + cnt++ + return nil + }, + }) + require.NoError(b, err) + require.Equal(b, tt.size, cnt) + b.StopTimer() + + require.NoError(b, st.Close()) + cleanup() + }) + } + } +} + +func addressFromObject(obj *objectSDK.Object) oid.Address { + var addr oid.Address + if id, isSet := obj.ID(); isSet { + addr.SetObject(id) + } else { + panic("object ID is not set") + } + if cid, isSet := obj.ContainerID(); isSet { + addr.SetContainer(cid) + } else { + panic("container ID is not set") + } + return addr +} + +// addressGenerator is the interface of types that generate object addresses. +type addressGenerator interface { + Next() oid.Address +} + +// seqAddrGenerator is an addressGenerator that generates addresses sequentially and wraps around the given max ID. +type seqAddrGenerator struct { + cnt atomic.Uint64 + maxID uint64 +} + +func (g *seqAddrGenerator) Next() oid.Address { + var id oid.ID + binary.LittleEndian.PutUint64(id[:], ((g.cnt.Inc()-1)%g.maxID)+1) + var addr oid.Address + addr.SetContainer(cid.ID{}) + addr.SetObject(id) + return addr +} + +func TestSeqAddrGenerator(t *testing.T) { + gen := &seqAddrGenerator{maxID: 10} + for i := 1; i <= 20; i++ { + addr := gen.Next() + id := addr.Object() + + require.Equal(t, uint64((i-1)%int(gen.maxID)+1), binary.LittleEndian.Uint64(id[:])) + } +} + +// randAddrGenerator is an addressGenerator that generates random addresses in the given range. +type randAddrGenerator uint64 + +func (g randAddrGenerator) Next() oid.Address { + var id oid.ID + binary.LittleEndian.PutUint64(id[:], uint64(1+int(rand.Int63n(int64(g))))) + var addr oid.Address + addr.SetContainer(cid.ID{}) + addr.SetObject(id) + return addr +} + +func TestRandAddrGenerator(t *testing.T) { + gen := randAddrGenerator(5) + for i := 0; i < 50; i++ { + addr := gen.Next() + id := addr.Object() + k := binary.LittleEndian.Uint64(id[:]) + + require.True(t, 1 <= k && k <= uint64(gen)) + } +} + +// objectGenerator is the interface of types that generate object entries. +type objectGenerator interface { + Next() *objectSDK.Object +} + +// seqObjGenerator is an objectGenerator that generates entries with random payloads of size objSize and sequential IDs. +type seqObjGenerator struct { + cnt atomic.Uint64 + objSize uint64 +} + +func (g *seqObjGenerator) Next() *objectSDK.Object { + var id oid.ID + binary.LittleEndian.PutUint64(id[:], g.cnt.Inc()) + return genObject(id, cid.ID{}, g.objSize) +} + +func TestSeqObjGenerator(t *testing.T) { + gen := &seqObjGenerator{objSize: 10} + var addrs []string + for i := 1; i <= 10; i++ { + obj := gen.Next() + id, isSet := obj.ID() + addrs = append(addrs, addressFromObject(obj).EncodeToString()) + + require.True(t, isSet) + require.Equal(t, gen.objSize, uint64(len(obj.Payload()))) + require.Equal(t, uint64(i), binary.LittleEndian.Uint64(id[:])) + } + require.True(t, slices.IsSorted(addrs)) +} + +// randObjGenerator is an objectGenerator that generates entries with random IDs and payloads of size objSize. +type randObjGenerator struct { + objSize uint64 +} + +func (g *randObjGenerator) Next() *objectSDK.Object { + return genObject(oidtest.ID(), cidtest.ID(), g.objSize) +} + +func TestRandObjGenerator(t *testing.T) { + gen := &randObjGenerator{objSize: 10} + for i := 0; i < 10; i++ { + obj := gen.Next() + + require.Equal(t, gen.objSize, uint64(len(obj.Payload()))) + } +} + +// overwriteObjGenerator is an objectGenerator that generates entries with random payloads of size objSize and at most maxObjects distinct IDs. +type overwriteObjGenerator struct { + objSize uint64 + maxObjects uint64 +} + +func (g *overwriteObjGenerator) Next() *objectSDK.Object { + var id oid.ID + binary.LittleEndian.PutUint64(id[:], uint64(1+rand.Int63n(int64(g.maxObjects)))) + return genObject(id, cid.ID{}, g.objSize) +} + +func TestOverwriteObjGenerator(t *testing.T) { + gen := &overwriteObjGenerator{ + objSize: 10, + maxObjects: 4, + } + for i := 0; i < 40; i++ { + obj := gen.Next() + id, isSet := obj.ID() + i := binary.LittleEndian.Uint64(id[:]) + + require.True(t, isSet) + require.Equal(t, gen.objSize, uint64(len(obj.Payload()))) + require.True(t, 1 <= i && i <= gen.maxObjects) + } +} + +// Generates an object with random payload and the given address and size. +// TODO(#86): there's some testing-related dupes in many places. Probably worth +// spending some time cleaning up a bit. +func genObject(id oid.ID, cid cid.ID, sz uint64) *objectSDK.Object { + raw := objectSDK.New() + + raw.SetID(id) + raw.SetContainerID(cid) + + payload := make([]byte, sz) + rand.Read(payload) + raw.SetPayload(payload) + + return raw +} -- 2.45.2 From 22be532cbdb22a03e9319a479807443223149dd3 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 14 Mar 2023 13:31:30 +0300 Subject: [PATCH 29/70] object/put: Persist session token till the end of a session Previously a token could've expired in the middle of an object.PUT stream, leading to upload being interrupted. This is bad, because user doesn't always now what is the right values for the session token lifetime. More than that, setting it to a very high value will eventually blow up the session token database. In this commit we read the session token once and reuse it for the whole stream duration. Signed-off-by: Evgenii Stratonikov --- pkg/services/object/put/remote.go | 28 ++++++++++------------------ pkg/services/object/put/streamer.go | 6 +++++- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pkg/services/object/put/remote.go b/pkg/services/object/put/remote.go index 04fc0d7d..0f0dc355 100644 --- a/pkg/services/object/put/remote.go +++ b/pkg/services/object/put/remote.go @@ -2,6 +2,7 @@ package putsvc import ( "context" + "crypto/ecdsa" "fmt" clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" @@ -17,7 +18,7 @@ import ( type remoteTarget struct { ctx context.Context - keyStorage *util.KeyStorage + privateKey *ecdsa.PrivateKey commonPrm *util.CommonPrm @@ -50,20 +51,6 @@ func (t *remoteTarget) WriteObject(obj *object.Object, _ objectcore.ContentMeta) } func (t *remoteTarget) Close() (*transformer.AccessIdentifiers, error) { - var sessionInfo *util.SessionInfo - - if tok := t.commonPrm.SessionToken(); tok != nil { - sessionInfo = &util.SessionInfo{ - ID: tok.ID(), - Owner: tok.Issuer(), - } - } - - key, err := t.keyStorage.GetKey(sessionInfo) - if err != nil { - return nil, fmt.Errorf("(%T) could not receive private key: %w", t, err) - } - c, err := t.clientConstructor.Get(t.nodeInfo) if err != nil { return nil, fmt.Errorf("(%T) could not create SDK client %s: %w", t, t.nodeInfo, err) @@ -73,7 +60,7 @@ func (t *remoteTarget) Close() (*transformer.AccessIdentifiers, error) { prm.SetContext(t.ctx) prm.SetClient(c) - prm.SetPrivateKey(key) + prm.SetPrivateKey(t.privateKey) prm.SetSessionToken(t.commonPrm.SessionToken()) prm.SetBearerToken(t.commonPrm.BearerToken()) prm.SetXHeaders(t.commonPrm.XHeaders()) @@ -116,13 +103,18 @@ func (p *RemotePutPrm) WithObject(v *object.Object) *RemotePutPrm { // PutObject sends object to remote node. func (s *RemoteSender) PutObject(ctx context.Context, p *RemotePutPrm) error { + key, err := s.keyStorage.GetKey(nil) + if err != nil { + return err + } + t := &remoteTarget{ ctx: ctx, - keyStorage: s.keyStorage, + privateKey: key, clientConstructor: s.clientConstructor, } - err := clientcore.NodeInfoFromRawNetmapElement(&t.nodeInfo, netmapCore.Node(p.node)) + err = clientcore.NodeInfoFromRawNetmapElement(&t.nodeInfo, netmapCore.Node(p.node)) if err != nil { return fmt.Errorf("parse client node info: %w", err) } diff --git a/pkg/services/object/put/streamer.go b/pkg/services/object/put/streamer.go index 1e27ef34..ae1a2f45 100644 --- a/pkg/services/object/put/streamer.go +++ b/pkg/services/object/put/streamer.go @@ -2,6 +2,7 @@ package putsvc import ( "context" + "crypto/ecdsa" "errors" "fmt" @@ -20,6 +21,8 @@ type Streamer struct { ctx context.Context + sessionKey *ecdsa.PrivateKey + target transformer.ObjectTarget relay func(client.NodeInfo, client.MultiAddressClient) error @@ -115,6 +118,7 @@ func (p *Streamer) initTarget(prm *PutInitPrm) error { } } + p.sessionKey = sessionKey p.target = &validatingTarget{ fmt: p.fmtValidator, unpreparedObject: true, @@ -227,7 +231,7 @@ func (p *Streamer) newCommonTarget(prm *PutInitPrm) transformer.ObjectTarget { rt := &remoteTarget{ ctx: p.ctx, - keyStorage: p.keyStorage, + privateKey: p.sessionKey, commonPrm: prm.common, clientConstructor: p.clientConstructor, } -- 2.45.2 From f006f3b342e98bf6c4fa22616e3252588db2d2c6 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Wed, 15 Mar 2023 03:42:49 +0300 Subject: [PATCH 30/70] [#67] node: Make engine's `IsLocked` public It will allow reusing that method in expiration checks. Signed-off-by: Pavel Karpy --- pkg/local_object_storage/engine/inhume.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/local_object_storage/engine/inhume.go b/pkg/local_object_storage/engine/inhume.go index 13aa9094..151820ab 100644 --- a/pkg/local_object_storage/engine/inhume.go +++ b/pkg/local_object_storage/engine/inhume.go @@ -81,7 +81,7 @@ func (e *StorageEngine) inhume(prm InhumePrm) (InhumeRes, error) { for i := range prm.addrs { if !prm.forceRemoval { - locked, err := e.isLocked(prm.addrs[i]) + locked, err := e.IsLocked(prm.addrs[i]) if err != nil { e.log.Warn("removing an object without full locking check", zap.Error(err), @@ -179,7 +179,8 @@ func (e *StorageEngine) inhumeAddr(addr oid.Address, prm shard.InhumePrm, checkE return ok, retErr } -func (e *StorageEngine) isLocked(addr oid.Address) (bool, error) { +// IsLocked checks whether an object is locked according to StorageEngine's state. +func (e *StorageEngine) IsLocked(addr oid.Address) (bool, error) { var locked bool var err error var outErr error -- 2.45.2 From 64bde68fb97fed2a77187be52056b8d34ca52137 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Wed, 15 Mar 2023 04:07:27 +0300 Subject: [PATCH 31/70] [#67] node: Accept expired locked objects Allow replication of any (expired too) locked object. Information about object locking is considered to be presented on the _container nodes_. Signed-off-by: Pavel Karpy --- cmd/frostfs-node/object.go | 8 +++++++ pkg/core/object/fmt.go | 33 ++++++++++++++++++++++++++++- pkg/core/object/fmt_test.go | 34 ++++++++++++++++++++++++++++-- pkg/services/object/put/local.go | 2 ++ pkg/services/object/put/service.go | 1 + 5 files changed, 75 insertions(+), 3 deletions(-) diff --git a/cmd/frostfs-node/object.go b/cmd/frostfs-node/object.go index 8ff63f41..5e030736 100644 --- a/cmd/frostfs-node/object.go +++ b/cmd/frostfs-node/object.go @@ -554,6 +554,10 @@ type engineWithNotifications struct { defaultTopic string } +func (e engineWithNotifications) IsLocked(address oid.Address) (bool, error) { + return e.base.IsLocked(address) +} + func (e engineWithNotifications) Delete(tombstone oid.Address, toDelete []oid.ID) error { return e.base.Delete(tombstone, toDelete) } @@ -587,6 +591,10 @@ type engineWithoutNotifications struct { engine *engine.StorageEngine } +func (e engineWithoutNotifications) IsLocked(address oid.Address) (bool, error) { + return e.IsLocked(address) +} + func (e engineWithoutNotifications) Delete(tombstone oid.Address, toDelete []oid.ID) error { var prm engine.InhumePrm diff --git a/pkg/core/object/fmt.go b/pkg/core/object/fmt.go index b3bafe6c..804f0bd4 100644 --- a/pkg/core/object/fmt.go +++ b/pkg/core/object/fmt.go @@ -27,6 +27,7 @@ type FormatValidatorOption func(*cfg) type cfg struct { netState netmap.State + e LockSource } // DeleteHandler is an interface of delete queue processor. @@ -38,6 +39,12 @@ type DeleteHandler interface { DeleteObjects(oid.Address, ...oid.Address) error } +// LockSource is a source of lock relations between the objects. +type LockSource interface { + // IsLocked must clarify object's lock status. + IsLocked(address oid.Address) (bool, error) +} + // Locker is an object lock storage interface. type Locker interface { // Lock list of objects as locked by locker in the specified container. @@ -319,7 +326,24 @@ func (v *FormatValidator) checkExpiration(obj *object.Object) error { } if exp < v.netState.CurrentEpoch() { - return errExpired + // an object could be expired but locked; + // put such an object is a correct operation + + cID, _ := obj.ContainerID() + oID, _ := obj.ID() + + var addr oid.Address + addr.SetContainer(cID) + addr.SetObject(oID) + + locked, err := v.e.IsLocked(addr) + if err != nil { + return fmt.Errorf("locking status check for an expired object: %w", err) + } + + if !locked { + return errExpired + } } return nil @@ -380,3 +404,10 @@ func WithNetState(netState netmap.State) FormatValidatorOption { c.netState = netState } } + +// WithLockSource return option to set the Storage Engine. +func WithLockSource(e LockSource) FormatValidatorOption { + return func(c *cfg) { + c.e = e + } +} diff --git a/pkg/core/object/fmt_test.go b/pkg/core/object/fmt_test.go index 3f2ea463..563c7827 100644 --- a/pkg/core/object/fmt_test.go +++ b/pkg/core/object/fmt_test.go @@ -36,13 +36,26 @@ func (s testNetState) CurrentEpoch() uint64 { return s.epoch } +type testLockSource struct { + m map[oid.Address]bool +} + +func (t testLockSource) IsLocked(address oid.Address) (bool, error) { + return t.m[address], nil +} + func TestFormatValidator_Validate(t *testing.T) { const curEpoch = 13 + ls := testLockSource{ + m: make(map[oid.Address]bool), + } + v := NewFormatValidator( WithNetState(testNetState{ epoch: curEpoch, }), + WithLockSource(ls), ) ownerKey, err := keys.NewPrivateKey() @@ -229,8 +242,25 @@ func TestFormatValidator_Validate(t *testing.T) { t.Run("expired object", func(t *testing.T) { val := strconv.FormatUint(curEpoch-1, 10) - err := v.Validate(fn(val), false) - require.ErrorIs(t, err, errExpired) + obj := fn(val) + + t.Run("non-locked", func(t *testing.T) { + err := v.Validate(obj, false) + require.ErrorIs(t, err, errExpired) + }) + + t.Run("locked", func(t *testing.T) { + var addr oid.Address + oID, _ := obj.ID() + cID, _ := obj.ContainerID() + + addr.SetContainer(cID) + addr.SetObject(oID) + ls.m[addr] = true + + err := v.Validate(obj, false) + require.NoError(t, err) + }) }) t.Run("alive object", func(t *testing.T) { diff --git a/pkg/services/object/put/local.go b/pkg/services/object/put/local.go index 009df95c..f344f77e 100644 --- a/pkg/services/object/put/local.go +++ b/pkg/services/object/put/local.go @@ -20,6 +20,8 @@ type ObjectStorage interface { // Lock must lock passed objects // and return any appeared error. Lock(locker oid.Address, toLock []oid.ID) error + // IsLocked must clarify object's lock status. + IsLocked(oid.Address) (bool, error) } type localTarget struct { diff --git a/pkg/services/object/put/service.go b/pkg/services/object/put/service.go index 338e5485..b74c97d4 100644 --- a/pkg/services/object/put/service.go +++ b/pkg/services/object/put/service.go @@ -101,6 +101,7 @@ func WithMaxSizeSource(v MaxSizeSource) Option { func WithObjectStorage(v ObjectStorage) Option { return func(c *cfg) { c.localStore = v + c.fmtValidatorOpts = append(c.fmtValidatorOpts, object.WithLockSource(v)) } } -- 2.45.2 From b70caa216b32c9417fbdeb82efb00e7a8394d708 Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Fri, 17 Mar 2023 10:32:36 +0300 Subject: [PATCH 32/70] [#144] Don't copy cache inside Docker environment May make docker builds not so clean. Signed-off-by: Stanislav Bogatyrev --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 4a4248d9..6f1699bf 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,3 +6,4 @@ Dockerfile temp .dockerignore docker +.cache -- 2.45.2 From 10c419adf087e45ba99aeaa3824f486667112a78 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Fri, 17 Mar 2023 18:47:59 +0300 Subject: [PATCH 33/70] [#67] node: Fix infinite recursion in SE's wrapper Signed-off-by: Pavel Karpy --- cmd/frostfs-node/object.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/frostfs-node/object.go b/cmd/frostfs-node/object.go index 5e030736..df838464 100644 --- a/cmd/frostfs-node/object.go +++ b/cmd/frostfs-node/object.go @@ -592,7 +592,7 @@ type engineWithoutNotifications struct { } func (e engineWithoutNotifications) IsLocked(address oid.Address) (bool, error) { - return e.IsLocked(address) + return e.engine.IsLocked(address) } func (e engineWithoutNotifications) Delete(tombstone oid.Address, toDelete []oid.ID) error { -- 2.45.2 From abd21f8099f2a51d87c9a2e1671fb813b7d28c02 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Tue, 14 Mar 2023 00:19:19 +0300 Subject: [PATCH 34/70] [#136] Revert "[#2260] services/object: Do not assemble object with TTL=1" This reverts commit 2567f8020ee19b1c866e52db966d5e5e8b62d428. It assumes that assembling logic could break some failover scenarios if request forwarding is done. However, it also breaks requesting big objects via a non-container node with TTL=2. Failover has been rechecked without that commit and no problems were found. Any (if found) other bugs related to the forwarding and object assembling must be solved more carefully. Signed-off-by: Pavel Karpy --- pkg/services/object/get/exec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/object/get/exec.go b/pkg/services/object/get/exec.go index c843e9b1..09ff9a82 100644 --- a/pkg/services/object/get/exec.go +++ b/pkg/services/object/get/exec.go @@ -115,7 +115,7 @@ func (exec execCtx) key() (*ecdsa.PrivateKey, error) { } func (exec *execCtx) canAssemble() bool { - return !exec.isRaw() && !exec.headOnly() && !exec.isLocal() + return !exec.isRaw() && !exec.headOnly() } func (exec *execCtx) splitInfo() *objectSDK.SplitInfo { -- 2.45.2 From db3ccd2762c54b36e3b5cfaf1d448f4c31db7ba0 Mon Sep 17 00:00:00 2001 From: Artem Tataurov Date: Thu, 9 Mar 2023 16:19:39 +0300 Subject: [PATCH 35/70] [#128] innerring: Add GAS pouring mechanism for a configurable list of wallets Signed-off-by: Artem Tataurov --- CHANGELOG.md | 1 + cmd/frostfs-ir/defaults.go | 1 + config/example/ir.yaml | 4 +++ pkg/innerring/innerring.go | 26 ++++++++++++++ .../processors/alphabet/process_emit.go | 15 +++++++- .../processors/alphabet/processor.go | 3 ++ pkg/morph/client/client.go | 34 +++++++++++++++++++ 7 files changed, 83 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e9ba6d0..cfc4eaf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changelog for FrostFS Node ## [Unreleased] ### Added +- Add GAS pouring mechanism for a configurable list of wallets (#128) - Separate batching for replicated operations over the same container in pilorama (#1621) - Doc for extended headers (#2128) - New `frostfs_node_object_container_size` metric for tracking size of reqular objects in a container (#2116) diff --git a/cmd/frostfs-ir/defaults.go b/cmd/frostfs-ir/defaults.go index fa26eef2..8c313fa4 100644 --- a/cmd/frostfs-ir/defaults.go +++ b/cmd/frostfs-ir/defaults.go @@ -102,6 +102,7 @@ func defaultConfiguration(cfg *viper.Viper) { cfg.SetDefault("emit.mint.threshold", 1) cfg.SetDefault("emit.mint.value", 20000000) // 0.2 Fixed8 cfg.SetDefault("emit.gas.balance_threshold", 0) + cfg.SetDefault("emit.extra_wallets", nil) cfg.SetDefault("audit.task.exec_pool_size", 10) cfg.SetDefault("audit.task.queue_capacity", 100) diff --git a/config/example/ir.yaml b/config/example/ir.yaml index ae5433f6..3dca0017 100644 --- a/config/example/ir.yaml +++ b/config/example/ir.yaml @@ -72,6 +72,10 @@ emit: threshold: 1 # Lifetime of records in LRU cache of all deposit receivers in FrostFS epochs gas: balance_threshold: 100000000000 # Fixed8 value of inner ring wallet balance threshold when GAS emission for deposit receivers is disabled; disabled by default + extra_wallets: # wallet addresses that are included in gas emission process in equal share with network map nodes + - "NQcfMqU6pfXFwaaBN6KHcTpT63eMtzk6eH" + - "NaSVC4xKySQBpKr1XRVYFCHjLhuYXnMBrP" + - "NT9jL5XcxcDt2iTj67o2d5xNfDxquN3pPk" workers: alphabet: 10 # Number of workers to process events from alphabet contract in parallel diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index aeb5b15b..33cfc39a 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -49,7 +49,9 @@ import ( "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/panjf2000/ants/v2" "github.com/spf13/viper" "go.uber.org/atomic" @@ -803,8 +805,14 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan } } + parsedWallets, err := parseWalletAddressesFromStrings(cfg.GetStringSlice("emit.extra_wallets")) + if err != nil { + return nil, err + } + // create alphabet processor alphabetProcessor, err := alphabet.New(&alphabet.Params{ + ParsedWallets: parsedWallets, Log: log, PoolSize: cfg.GetInt("workers.alphabet"), AlphabetContracts: server.contracts.alphabet, @@ -1034,6 +1042,24 @@ func ParsePublicKeysFromStrings(pubKeys []string) (keys.PublicKeys, error) { return publicKeys, nil } +// parseWalletAddressesFromStrings returns a slice of util.Uint160 from a slice +// of strings. +func parseWalletAddressesFromStrings(wallets []string) ([]util.Uint160, error) { + if len(wallets) == 0 { + return nil, nil + } + + var err error + extraWallets := make([]util.Uint160, len(wallets)) + for i := range wallets { + extraWallets[i], err = address.StringToUint160(wallets[i]) + if err != nil { + return nil, err + } + } + return extraWallets, nil +} + func (s *Server) initConfigFromBlockchain() error { // get current epoch epoch, err := s.netmapClient.Epoch() diff --git a/pkg/innerring/processors/alphabet/process_emit.go b/pkg/innerring/processors/alphabet/process_emit.go index a93eec52..353adb45 100644 --- a/pkg/innerring/processors/alphabet/process_emit.go +++ b/pkg/innerring/processors/alphabet/process_emit.go @@ -57,7 +57,7 @@ func (ap *Processor) processEmit() { return } - gasPerNode := fixedn.Fixed8(ap.storageEmission / uint64(ln)) + gasPerNode := fixedn.Fixed8(ap.storageEmission / uint64(ln+len(ap.parsedWallets))) for i := range nmNodes { keyBytes := nmNodes[i].PublicKey() @@ -79,4 +79,17 @@ func (ap *Processor) processEmit() { ) } } + + err = ap.morphClient.BatchTransferGas(ap.parsedWallets, gasPerNode) + if err != nil { + receiversLog := make([]string, len(ap.parsedWallets)) + for i, addr := range ap.parsedWallets { + receiversLog[i] = addr.StringLE() + } + ap.log.Warn("can't transfer gas to wallet", + zap.Strings("receivers", receiversLog), + zap.Int64("amount", int64(gasPerNode)), + zap.String("error", err.Error()), + ) + } } diff --git a/pkg/innerring/processors/alphabet/processor.go b/pkg/innerring/processors/alphabet/processor.go index f57d281e..98015813 100644 --- a/pkg/innerring/processors/alphabet/processor.go +++ b/pkg/innerring/processors/alphabet/processor.go @@ -33,6 +33,7 @@ type ( // Processor of events produced for alphabet contracts in the sidechain. Processor struct { + parsedWallets []util.Uint160 log *logger.Logger pool *ants.Pool alphabetContracts Contracts @@ -44,6 +45,7 @@ type ( // Params of the processor constructor. Params struct { + ParsedWallets []util.Uint160 Log *logger.Logger PoolSize int AlphabetContracts Contracts @@ -73,6 +75,7 @@ func New(p *Params) (*Processor, error) { } return &Processor{ + parsedWallets: p.ParsedWallets, log: p.Log, pool: pool, alphabetContracts: p.AlphabetContracts, diff --git a/pkg/morph/client/client.go b/pkg/morph/client/client.go index 4aae6dbf..51a030e6 100644 --- a/pkg/morph/client/client.go +++ b/pkg/morph/client/client.go @@ -244,6 +244,40 @@ func (c *Client) TransferGas(receiver util.Uint160, amount fixedn.Fixed8) error return nil } +func (c *Client) BatchTransferGas(receivers []util.Uint160, amount fixedn.Fixed8) error { + c.switchLock.RLock() + defer c.switchLock.RUnlock() + + if c.inactive { + return ErrConnectionLost + } + + transferParams := make([]nep17.TransferParameters, len(receivers)) + receiversLog := make([]string, len(receivers)) + + for i, receiver := range receivers { + transferParams[i] = nep17.TransferParameters{ + From: c.accAddr, + To: receiver, + Amount: big.NewInt(int64(amount)), + Data: nil, + } + receiversLog[i] = receiver.StringLE() + } + + txHash, vub, err := c.gasToken.MultiTransfer(transferParams) + if err != nil { + return err + } + + c.logger.Debug("batch gas transfer invoke", + zap.Strings("to", receiversLog), + zap.Stringer("tx_hash", txHash.Reverse()), + zap.Uint32("vub", vub)) + + return nil +} + // Wait function blocks routing execution until there // are `n` new blocks in the chain. // -- 2.45.2 From 392be818e5bf2e8cc0b8fc6a9463add3df9556de Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Mon, 20 Mar 2023 18:14:03 +0300 Subject: [PATCH 36/70] [#149] Fix gitlint regex to match our policy In our policy we mark commits not having a PR/Issue yet with a `[#XX]` reference to be replaced after PR creation. Signed-off-by: Stanislav Bogatyrev --- .gitlint | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlint b/.gitlint index 9ce883f4..96cf3ed8 100644 --- a/.gitlint +++ b/.gitlint @@ -1,9 +1,10 @@ [general] fail-without-commits=true +regex-style-search=true contrib=CC1 [title-match-regex] -regex=^\[\#[0-9]+\]\s +regex=^\[\#[0-9X]+\]\s [ignore-by-title] regex=^Release(.*) -- 2.45.2 From d64fb887ffab99b97bf1207b748fd23b0f30ea00 Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Mon, 20 Mar 2023 18:17:00 +0300 Subject: [PATCH 37/70] [#149] Reorder pre-commit hooks Minor changes to see what fails first Signed-off-by: Stanislav Bogatyrev --- .pre-commit-config.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 88fde1b6..2e9744f5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,12 @@ ci: autofix_prs: false repos: + - repo: https://github.com/jorisroovers/gitlint + rev: v0.19.1 + hooks: + - id: gitlint + stages: [commit-msg] + - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.4.0 hooks: @@ -18,18 +24,12 @@ repos: - id: end-of-file-fixer exclude: ".key$" - - repo: https://github.com/golangci/golangci-lint - rev: v1.51.2 - hooks: - - id: golangci-lint - - - repo: https://github.com/jorisroovers/gitlint - rev: v0.18.0 - hooks: - - id: gitlint - stages: [commit-msg] - - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.9.0.2 hooks: - id: shellcheck + + - repo: https://github.com/golangci/golangci-lint + rev: v1.51.2 + hooks: + - id: golangci-lint -- 2.45.2 From 573d92082145da29019d6440bfafee77244f470d Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Mon, 20 Mar 2023 18:22:36 +0300 Subject: [PATCH 38/70] [#149] Use custom image and kludges for node Until #139 is fixed, we can't use root inside Docker container running CI, but Woodpecker CI can't run non-root containers until they fix https://github.com/woodpecker-ci/woodpecker/issues/1077, hence we use temporary kludges with custom image and manual permissions in pipelines. Signed-off-by: Stanislav Bogatyrev --- .docker/Dockerfile.ci | 25 +++++++++++++++++++++++++ .woodpecker/full-pre-commit.yml | 11 +++++++++++ .woodpecker/pre-commit.yml | 17 +++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 .docker/Dockerfile.ci create mode 100644 .woodpecker/full-pre-commit.yml create mode 100644 .woodpecker/pre-commit.yml diff --git a/.docker/Dockerfile.ci b/.docker/Dockerfile.ci new file mode 100644 index 00000000..010616a1 --- /dev/null +++ b/.docker/Dockerfile.ci @@ -0,0 +1,25 @@ +FROM golang:1.19 + +WORKDIR /tmp + +# Install apt packages +RUN apt-get update && apt-get install --no-install-recommends -y \ + pip \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && rm -rf /var/lib/apt/lists/* + +# Dash → Bash +RUN echo "dash dash/sh boolean false" | debconf-set-selections +RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash + +RUN useradd -u 1234 -d /home/ci -m ci +USER ci + +ENV PATH="$PATH:/home/ci/.local/bin" + +COPY .pre-commit-config.yaml . + +RUN pip install "pre-commit==3.1.1" \ + && git init . \ + && pre-commit install-hooks \ + && rm -rf /tmp/* diff --git a/.woodpecker/full-pre-commit.yml b/.woodpecker/full-pre-commit.yml new file mode 100644 index 00000000..4aa62c1c --- /dev/null +++ b/.woodpecker/full-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 . + + full-pre-commit: + image: git.frostfs.info/truecloudlab/frostfs-ci:v0.36 + commands: + - export HOME="$(getent passwd $(id -u) | cut '-d:' -f6)" + - pre-commit run -a diff --git a/.woodpecker/pre-commit.yml b/.woodpecker/pre-commit.yml new file mode 100644 index 00000000..debe0cba --- /dev/null +++ b/.woodpecker/pre-commit.yml @@ -0,0 +1,17 @@ +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 + + unit: + image: git.frostfs.info/truecloudlab/frostfs-ci:v0.36 + commands: + - export HOME="$(getent passwd $(id -u) | cut '-d:' -f6)" + - make test -- 2.45.2 From 2dc86058c31f6868b342c9f43bbb64871be757d7 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Mon, 20 Mar 2023 09:38:57 +0300 Subject: [PATCH 39/70] [#148] memstore: Drop space line Signed-off-by: Dmitrii Stepanov --- pkg/local_object_storage/blobstor/memstore/memstore.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/local_object_storage/blobstor/memstore/memstore.go b/pkg/local_object_storage/blobstor/memstore/memstore.go index 12a81297..5f623847 100644 --- a/pkg/local_object_storage/blobstor/memstore/memstore.go +++ b/pkg/local_object_storage/blobstor/memstore/memstore.go @@ -88,7 +88,6 @@ func (s *memstoreImpl) Exists(req common.ExistsPrm) (common.ExistsRes, error) { _, exists := s.objs[key] return common.ExistsRes{Exists: exists}, nil - } func (s *memstoreImpl) Put(req common.PutPrm) (common.PutRes, error) { -- 2.45.2 From cc8ff015b4429827057f0db6c6f0b4d0d38fa1d7 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Mon, 20 Mar 2023 09:39:44 +0300 Subject: [PATCH 40/70] [#148] linter: Add containedctx linter Context has to be passed as an argument: https://pkg.go.dev/context Signed-off-by: Dmitrii Stepanov --- .golangci.yml | 1 + cmd/frostfs-node/config.go | 1 + cmd/frostfs-node/container.go | 1 + cmd/frostfs-node/reputation/common/util.go | 1 + cmd/frostfs-node/reputation/internal/client/client.go | 1 + pkg/core/storagegroup/storagegroup.go | 2 ++ pkg/innerring/internal/client/prm.go | 1 + pkg/morph/client/constructor.go | 1 + pkg/services/audit/auditor/context.go | 1 + pkg/services/audit/task.go | 1 + pkg/services/container/announcement/load/controller/calls.go | 1 + pkg/services/container/announcement/load/route/calls.go | 1 + pkg/services/object/delete/exec.go | 1 + pkg/services/object/get/exec.go | 1 + pkg/services/object/internal/client/client.go | 1 + pkg/services/object/put/remote.go | 1 + pkg/services/object/put/streamer.go | 1 + pkg/services/object/search/exec.go | 1 + pkg/services/policer/check.go | 1 + pkg/services/reputation/eigentrust/controller/calls.go | 1 + pkg/services/reputation/eigentrust/iteration.go | 1 + pkg/services/reputation/local/controller/calls.go | 1 + 22 files changed, 23 insertions(+) diff --git a/.golangci.yml b/.golangci.yml index 4c4fccc9..f4eed767 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -53,5 +53,6 @@ linters: - predeclared - reassign - whitespace + - containedctx disable-all: true fast: false diff --git a/cmd/frostfs-node/config.go b/cmd/frostfs-node/config.go index 3aabb63d..b2b12241 100644 --- a/cmd/frostfs-node/config.go +++ b/cmd/frostfs-node/config.go @@ -297,6 +297,7 @@ func (a *applicationConfiguration) readConfig(c *config.Config) error { // the application life cycle. // It should not contain any read configuration values, component-specific // helpers and fields. +// nolint: containedctx type internals struct { ctx context.Context ctxCancel func() diff --git a/cmd/frostfs-node/container.go b/cmd/frostfs-node/container.go index bfa555db..ac049922 100644 --- a/cmd/frostfs-node/container.go +++ b/cmd/frostfs-node/container.go @@ -363,6 +363,7 @@ func (p *remoteLoadAnnounceWriterProvider) InitWriter(ctx context.Context) (load }, nil } +// nolint: containedctx type remoteLoadAnnounceWriter struct { ctx context.Context diff --git a/cmd/frostfs-node/reputation/common/util.go b/cmd/frostfs-node/reputation/common/util.go index c0a5cbc7..28351d0c 100644 --- a/cmd/frostfs-node/reputation/common/util.go +++ b/cmd/frostfs-node/reputation/common/util.go @@ -8,6 +8,7 @@ import ( ) // EpochContext is a std context extended with epoch data. +// nolint: containedctx type EpochContext struct { context.Context E uint64 diff --git a/cmd/frostfs-node/reputation/internal/client/client.go b/cmd/frostfs-node/reputation/internal/client/client.go index 79bc3d44..22fd21d4 100644 --- a/cmd/frostfs-node/reputation/internal/client/client.go +++ b/cmd/frostfs-node/reputation/internal/client/client.go @@ -9,6 +9,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/reputation" ) +// nolint: containedctx type commonPrm struct { cli coreclient.Client diff --git a/pkg/core/storagegroup/storagegroup.go b/pkg/core/storagegroup/storagegroup.go index 6474377b..f4e58413 100644 --- a/pkg/core/storagegroup/storagegroup.go +++ b/pkg/core/storagegroup/storagegroup.go @@ -11,6 +11,7 @@ import ( ) // SearchSGPrm groups the parameters which are formed by Processor to search the storage group objects. +// nolint: containedctx type SearchSGPrm struct { Context context.Context @@ -25,6 +26,7 @@ type SearchSGDst struct { } // GetSGPrm groups parameter of GetSG operation. +// nolint: containedctx type GetSGPrm struct { Context context.Context diff --git a/pkg/innerring/internal/client/prm.go b/pkg/innerring/internal/client/prm.go index 3c749fe6..5498eb37 100644 --- a/pkg/innerring/internal/client/prm.go +++ b/pkg/innerring/internal/client/prm.go @@ -6,6 +6,7 @@ import ( oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) +// nolint: containedctx type contextPrm struct { ctx context.Context } diff --git a/pkg/morph/client/constructor.go b/pkg/morph/client/constructor.go index 01fd30f7..efb3d0bf 100644 --- a/pkg/morph/client/constructor.go +++ b/pkg/morph/client/constructor.go @@ -26,6 +26,7 @@ type Option func(*cfg) type Callback func() // groups the configurations with default values. +// nolint: containedctx type cfg struct { ctx context.Context // neo-go client context diff --git a/pkg/services/audit/auditor/context.go b/pkg/services/audit/auditor/context.go index 528a3bbb..4a5cbb45 100644 --- a/pkg/services/audit/auditor/context.go +++ b/pkg/services/audit/auditor/context.go @@ -81,6 +81,7 @@ type ContextPrm struct { pdpWorkerPool, porWorkerPool util.WorkerPool } +// nolint: containedctx type commonCommunicatorPrm struct { Context context.Context diff --git a/pkg/services/audit/task.go b/pkg/services/audit/task.go index 554aab6c..35932a69 100644 --- a/pkg/services/audit/task.go +++ b/pkg/services/audit/task.go @@ -10,6 +10,7 @@ import ( ) // Task groups groups the container audit parameters. +// nolint: containedctx type Task struct { reporter Reporter diff --git a/pkg/services/container/announcement/load/controller/calls.go b/pkg/services/container/announcement/load/controller/calls.go index 54eb7e07..c6b574c3 100644 --- a/pkg/services/container/announcement/load/controller/calls.go +++ b/pkg/services/container/announcement/load/controller/calls.go @@ -15,6 +15,7 @@ type StartPrm struct { Epoch uint64 } +// nolint: containedctx type commonContext struct { epoch uint64 diff --git a/pkg/services/container/announcement/load/route/calls.go b/pkg/services/container/announcement/load/route/calls.go index 989120b4..95099fd5 100644 --- a/pkg/services/container/announcement/load/route/calls.go +++ b/pkg/services/container/announcement/load/route/calls.go @@ -10,6 +10,7 @@ import ( "go.uber.org/zap" ) +// nolint: containedctx type routeContext struct { context.Context diff --git a/pkg/services/object/delete/exec.go b/pkg/services/object/delete/exec.go index 112796f2..4da4c808 100644 --- a/pkg/services/object/delete/exec.go +++ b/pkg/services/object/delete/exec.go @@ -18,6 +18,7 @@ type statusError struct { err error } +// nolint: containedctx type execCtx struct { svc *Service diff --git a/pkg/services/object/get/exec.go b/pkg/services/object/get/exec.go index 09ff9a82..9858b32b 100644 --- a/pkg/services/object/get/exec.go +++ b/pkg/services/object/get/exec.go @@ -19,6 +19,7 @@ type statusError struct { err error } +// nolint: containedctx type execCtx struct { svc *Service diff --git a/pkg/services/object/internal/client/client.go b/pkg/services/object/internal/client/client.go index 8f2483bc..ee6777a5 100644 --- a/pkg/services/object/internal/client/client.go +++ b/pkg/services/object/internal/client/client.go @@ -18,6 +18,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) +// nolint: containedctx type commonPrm struct { cli coreclient.Client diff --git a/pkg/services/object/put/remote.go b/pkg/services/object/put/remote.go index 0f0dc355..760de750 100644 --- a/pkg/services/object/put/remote.go +++ b/pkg/services/object/put/remote.go @@ -15,6 +15,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) +// nolint: containedctx type remoteTarget struct { ctx context.Context diff --git a/pkg/services/object/put/streamer.go b/pkg/services/object/put/streamer.go index ae1a2f45..8ca90e86 100644 --- a/pkg/services/object/put/streamer.go +++ b/pkg/services/object/put/streamer.go @@ -16,6 +16,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) +// nolint: containedctx type Streamer struct { *cfg diff --git a/pkg/services/object/search/exec.go b/pkg/services/object/search/exec.go index 18700b25..a1737b52 100644 --- a/pkg/services/object/search/exec.go +++ b/pkg/services/object/search/exec.go @@ -16,6 +16,7 @@ type statusError struct { err error } +// nolint: containedctx type execCtx struct { svc *Service diff --git a/pkg/services/policer/check.go b/pkg/services/policer/check.go index 1da07f45..e240bbea 100644 --- a/pkg/services/policer/check.go +++ b/pkg/services/policer/check.go @@ -136,6 +136,7 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add } } +// nolint: containedctx type processPlacementContext struct { context.Context diff --git a/pkg/services/reputation/eigentrust/controller/calls.go b/pkg/services/reputation/eigentrust/controller/calls.go index 87d23c7f..28228706 100644 --- a/pkg/services/reputation/eigentrust/controller/calls.go +++ b/pkg/services/reputation/eigentrust/controller/calls.go @@ -12,6 +12,7 @@ type ContinuePrm struct { Epoch uint64 } +// nolint: containedctx type iterContext struct { context.Context diff --git a/pkg/services/reputation/eigentrust/iteration.go b/pkg/services/reputation/eigentrust/iteration.go index 90a214eb..b06064f7 100644 --- a/pkg/services/reputation/eigentrust/iteration.go +++ b/pkg/services/reputation/eigentrust/iteration.go @@ -38,6 +38,7 @@ type IterationTrust struct { // IterContext aggregates context and data required for // iterations. +// nolint: containedctx type IterContext struct { context.Context EpochIteration diff --git a/pkg/services/reputation/local/controller/calls.go b/pkg/services/reputation/local/controller/calls.go index d4e122b0..98815492 100644 --- a/pkg/services/reputation/local/controller/calls.go +++ b/pkg/services/reputation/local/controller/calls.go @@ -51,6 +51,7 @@ type reportContext struct { ctx common.Context } +// nolint: containedctx type iteratorContext struct { context.Context -- 2.45.2 From 97c36ed3ecb197b99b937061fbc0d463703edc4d Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Mon, 20 Mar 2023 10:01:27 +0300 Subject: [PATCH 41/70] [#148] linter: Add funlen linter Long functions are hard to understand and source of errors Signed-off-by: Dmitrii Stepanov --- .golangci.yml | 4 ++++ cmd/frostfs-adm/internal/modules/morph/balance.go | 1 + cmd/frostfs-adm/internal/modules/morph/container.go | 1 + cmd/frostfs-adm/internal/modules/morph/deploy.go | 1 + cmd/frostfs-adm/internal/modules/morph/initialize.go | 1 + cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go | 1 + cmd/frostfs-adm/internal/modules/morph/notary.go | 1 + cmd/frostfs-adm/internal/modules/morph/root.go | 1 + cmd/frostfs-adm/internal/modules/morph/subnet.go | 5 +++++ cmd/frostfs-adm/internal/modules/storagecfg/root.go | 1 + cmd/frostfs-cli/modules/object/get.go | 1 + cmd/frostfs-cli/modules/object/put.go | 1 + cmd/frostfs-cli/modules/object/util.go | 2 ++ cmd/frostfs-ir/defaults.go | 1 + cmd/frostfs-node/config.go | 4 ++++ cmd/frostfs-node/container.go | 1 + cmd/frostfs-node/netmap.go | 1 + cmd/frostfs-node/object.go | 1 + cmd/frostfs-node/reputation.go | 1 + pkg/core/object/fmt.go | 2 ++ pkg/innerring/alphabet.go | 2 ++ pkg/innerring/innerring.go | 4 ++++ pkg/innerring/processors/alphabet/process_emit.go | 1 + pkg/innerring/processors/audit/process.go | 1 + pkg/innerring/processors/container/common.go | 2 ++ pkg/innerring/processors/governance/process_update.go | 1 + pkg/local_object_storage/blobstor/blobovniczatree/put.go | 2 ++ .../blobstor/internal/blobstortest/iterate.go | 1 + pkg/local_object_storage/engine/evacuate.go | 2 ++ pkg/local_object_storage/engine/get.go | 1 + pkg/local_object_storage/engine/range.go | 1 + pkg/local_object_storage/metabase/inhume.go | 2 ++ pkg/local_object_storage/metabase/put.go | 1 + pkg/local_object_storage/shard/control.go | 1 + pkg/metrics/engine.go | 1 + pkg/metrics/object.go | 1 + pkg/morph/client/notary.go | 1 + pkg/morph/event/listener.go | 1 + pkg/morph/event/notary_preparator.go | 2 ++ pkg/services/audit/auditor/por.go | 1 + pkg/services/object/acl/acl.go | 2 ++ pkg/services/object/acl/eacl/v2/headers.go | 1 + pkg/services/object/acl/v2/service.go | 1 + pkg/services/object/get/util.go | 1 + pkg/services/object/get/v2/util.go | 3 +++ pkg/services/object/put/distributed.go | 1 + pkg/services/object/put/streamer.go | 1 + pkg/services/object/search/v2/util.go | 1 + pkg/services/object/util/chain.go | 1 + pkg/services/policer/check.go | 1 + pkg/services/reputation/eigentrust/calculator/calls.go | 1 + pkg/services/tree/sync.go | 1 + 52 files changed, 76 insertions(+) diff --git a/.golangci.yml b/.golangci.yml index f4eed767..683d976a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -26,6 +26,9 @@ linters-settings: check-shadowing: false staticcheck: checks: ["all", "-SA1019"] # TODO Enable SA1019 after deprecated warning are fixed. + funlen: + lines: 80 + statements: 60 linters: enable: @@ -54,5 +57,6 @@ linters: - reassign - whitespace - containedctx + - funlen disable-all: true fast: false diff --git a/cmd/frostfs-adm/internal/modules/morph/balance.go b/cmd/frostfs-adm/internal/modules/morph/balance.go index 72485eef..c8549268 100644 --- a/cmd/frostfs-adm/internal/modules/morph/balance.go +++ b/cmd/frostfs-adm/internal/modules/morph/balance.go @@ -44,6 +44,7 @@ const ( notaryEnabled = true ) +// nolint: funlen func dumpBalances(cmd *cobra.Command, _ []string) error { var ( dumpStorage, _ = cmd.Flags().GetBool(dumpBalancesStorageFlag) diff --git a/cmd/frostfs-adm/internal/modules/morph/container.go b/cmd/frostfs-adm/internal/modules/morph/container.go index 5c0b18e0..1dec6127 100644 --- a/cmd/frostfs-adm/internal/modules/morph/container.go +++ b/cmd/frostfs-adm/internal/modules/morph/container.go @@ -152,6 +152,7 @@ func listContainers(cmd *cobra.Command, _ []string) error { return nil } +// nolint: funlen func restoreContainers(cmd *cobra.Command, _ []string) error { filename, err := cmd.Flags().GetString(containerDumpFlag) if err != nil { diff --git a/cmd/frostfs-adm/internal/modules/morph/deploy.go b/cmd/frostfs-adm/internal/modules/morph/deploy.go index 2aaddce1..97e216f3 100644 --- a/cmd/frostfs-adm/internal/modules/morph/deploy.go +++ b/cmd/frostfs-adm/internal/modules/morph/deploy.go @@ -57,6 +57,7 @@ func init() { ff.String(customZoneFlag, "frostfs", "Custom zone for NNS") } +// nolint: funlen func deployContractCmd(cmd *cobra.Command, args []string) error { v := viper.GetViper() c, err := newInitializeContext(cmd, v) diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize.go b/cmd/frostfs-adm/internal/modules/morph/initialize.go index bab8e12c..68e02e77 100644 --- a/cmd/frostfs-adm/internal/modules/morph/initialize.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize.go @@ -108,6 +108,7 @@ func (c *initializeContext) close() { } } +// nolint: funlen func newInitializeContext(cmd *cobra.Command, v *viper.Viper) (*initializeContext, error) { walletDir := config.ResolveHomePath(viper.GetString(alphabetWalletsFlag)) wallets, err := openAlphabetWallets(v, walletDir) diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go b/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go index 1be94bf1..c74b78e2 100644 --- a/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go @@ -156,6 +156,7 @@ func (c *initializeContext) deployNNS(method string) error { return c.awaitTx() } +// nolint: funlen func (c *initializeContext) updateContracts() error { alphaCs := c.getContract(alphabetContract) diff --git a/cmd/frostfs-adm/internal/modules/morph/notary.go b/cmd/frostfs-adm/internal/modules/morph/notary.go index 47466563..24cfd7d1 100644 --- a/cmd/frostfs-adm/internal/modules/morph/notary.go +++ b/cmd/frostfs-adm/internal/modules/morph/notary.go @@ -22,6 +22,7 @@ import ( // https://github.com/nspcc-dev/neo-go/blob/master/pkg/core/native/notary.go#L48 const defaultNotaryDepositLifetime = 5760 +// nolint: funlen func depositNotary(cmd *cobra.Command, _ []string) error { p, err := cmd.Flags().GetString(storageWalletFlag) if err != nil { diff --git a/cmd/frostfs-adm/internal/modules/morph/root.go b/cmd/frostfs-adm/internal/modules/morph/root.go index c1d81560..0b3ee756 100644 --- a/cmd/frostfs-adm/internal/modules/morph/root.go +++ b/cmd/frostfs-adm/internal/modules/morph/root.go @@ -238,6 +238,7 @@ var ( } ) +// nolint: funlen func init() { RootCmd.AddCommand(generateAlphabetCmd) generateAlphabetCmd.Flags().String(alphabetWalletsFlag, "", "Path to alphabet wallets dir") diff --git a/cmd/frostfs-adm/internal/modules/morph/subnet.go b/cmd/frostfs-adm/internal/modules/morph/subnet.go index 229a2cea..f289400a 100644 --- a/cmd/frostfs-adm/internal/modules/morph/subnet.go +++ b/cmd/frostfs-adm/internal/modules/morph/subnet.go @@ -307,6 +307,8 @@ const ( ) // common executor cmdSubnetAdminAdd and cmdSubnetAdminRemove commands. +// +// nolint: funlen func manageSubnetAdmins(cmd *cobra.Command, rm bool) error { // read private key var key keys.PrivateKey @@ -651,6 +653,8 @@ func addCommandInheritPreRun(par *cobra.Command, subs ...*cobra.Command) { } // registers flags and binds sub-commands for subnet commands. +// +// nolint: funlen func init() { cmdSubnetCreate.Flags().StringP(flagSubnetWallet, "w", "", "Path to file with wallet") _ = cmdSubnetCreate.MarkFlagRequired(flagSubnetWallet) @@ -868,6 +872,7 @@ func invokeNonNotary(c Client, key keys.PrivateKey, method string, args ...any) return nil } +// nolint: funlen func invokeNotary(c Client, key keys.PrivateKey, method string, notaryHash util.Uint160, args ...any) error { nnsCs, err := c.GetContractStateByID(1) if err != nil { diff --git a/cmd/frostfs-adm/internal/modules/storagecfg/root.go b/cmd/frostfs-adm/internal/modules/storagecfg/root.go index 682350ba..d08eb6cc 100644 --- a/cmd/frostfs-adm/internal/modules/storagecfg/root.go +++ b/cmd/frostfs-adm/internal/modules/storagecfg/root.go @@ -79,6 +79,7 @@ type config struct { MetabasePath string } +// nolint: funlen func storageConfig(cmd *cobra.Command, args []string) { var outPath string if len(args) != 0 { diff --git a/cmd/frostfs-cli/modules/object/get.go b/cmd/frostfs-cli/modules/object/get.go index b077610f..900326df 100644 --- a/cmd/frostfs-cli/modules/object/get.go +++ b/cmd/frostfs-cli/modules/object/get.go @@ -42,6 +42,7 @@ func initObjectGetCmd() { flags.Bool(binaryFlag, false, "Serialize whole object structure into given file(id + signature + header + payload).") } +// nolint: funlen func getObject(cmd *cobra.Command, _ []string) { var cnr cid.ID var obj oid.ID diff --git a/cmd/frostfs-cli/modules/object/put.go b/cmd/frostfs-cli/modules/object/put.go index ef3b6dcb..b672e15e 100644 --- a/cmd/frostfs-cli/modules/object/put.go +++ b/cmd/frostfs-cli/modules/object/put.go @@ -58,6 +58,7 @@ func initObjectPutCmd() { flags.Bool(binaryFlag, false, "Deserialize object structure from given file.") } +// nolint: funlen func putObject(cmd *cobra.Command, _ []string) { binary, _ := cmd.Flags().GetBool(binaryFlag) cidVal, _ := cmd.Flags().GetString(commonflags.CIDFlag) diff --git a/cmd/frostfs-cli/modules/object/util.go b/cmd/frostfs-cli/modules/object/util.go index 25adffc1..90b897c1 100644 --- a/cmd/frostfs-cli/modules/object/util.go +++ b/cmd/frostfs-cli/modules/object/util.go @@ -339,6 +339,8 @@ func initFlagSession(cmd *cobra.Command, verb string) { // container. // // The object itself is not included in the result. +// +// nolint: funlen func collectObjectRelatives(cmd *cobra.Command, cli *client.Client, cnr cid.ID, obj oid.ID) []oid.ID { common.PrintVerbose(cmd, "Fetching raw object header...") diff --git a/cmd/frostfs-ir/defaults.go b/cmd/frostfs-ir/defaults.go index 8c313fa4..9157d282 100644 --- a/cmd/frostfs-ir/defaults.go +++ b/cmd/frostfs-ir/defaults.go @@ -41,6 +41,7 @@ func newConfig(path, directory string) (*viper.Viper, error) { return v, err } +// nolint: funlen func defaultConfiguration(cfg *viper.Viper) { cfg.SetDefault("logger.level", "info") diff --git a/cmd/frostfs-node/config.go b/cmd/frostfs-node/config.go index b2b12241..25222ed4 100644 --- a/cmd/frostfs-node/config.go +++ b/cmd/frostfs-node/config.go @@ -171,6 +171,8 @@ type subStorageCfg struct { // readConfig fills applicationConfiguration with raw configuration values // not modifying them. +// +// nolint: funlen func (a *applicationConfiguration) readConfig(c *config.Config) error { if a._read { err := c.Reload() @@ -522,6 +524,7 @@ type cfgReputation struct { var persistateSideChainLastBlockKey = []byte("side_chain_last_processed_block") +// nolint: funlen func initCfg(appCfg *config.Config) *cfg { c := &cfg{} @@ -654,6 +657,7 @@ type shardOptsWithID struct { shOpts []shard.Option } +// nolint: funlen func (c *cfg) shardOpts() []shardOptsWithID { shards := make([]shardOptsWithID, 0, len(c.EngineCfg.shards)) diff --git a/cmd/frostfs-node/container.go b/cmd/frostfs-node/container.go index ac049922..bcd9e3be 100644 --- a/cmd/frostfs-node/container.go +++ b/cmd/frostfs-node/container.go @@ -39,6 +39,7 @@ const ( stopEstimationNotifyEvent = "StopEstimation" ) +// nolint: funlen func initContainerService(c *cfg) { // container wrapper that tries to invoke notary // requests if chain is configured so diff --git a/cmd/frostfs-node/netmap.go b/cmd/frostfs-node/netmap.go index d5f3036c..00bbdbf5 100644 --- a/cmd/frostfs-node/netmap.go +++ b/cmd/frostfs-node/netmap.go @@ -135,6 +135,7 @@ func (c *cfg) addressNum() int { return 0 } +// nolint: funlen func initNetmapService(c *cfg) { network.WriteToNodeInfo(c.localAddr, &c.cfgNodeInfo.localInfo) c.cfgNodeInfo.localInfo.SetPublicKey(c.key.PublicKey().Bytes()) diff --git a/cmd/frostfs-node/object.go b/cmd/frostfs-node/object.go index df838464..0f6fcc0b 100644 --- a/cmd/frostfs-node/object.go +++ b/cmd/frostfs-node/object.go @@ -163,6 +163,7 @@ func (x *coreClientConstructor) Get(info coreclient.NodeInfo) (coreclient.MultiA return c.(coreclient.MultiAddressClient), nil } +// nolint: funlen func initObjectService(c *cfg) { ls := c.cfgObject.cfgLocalStorage.localStorage keyStorage := util.NewKeyStorage(&c.key.PrivateKey, c.privateTokenStore, c.cfgNetmap.state) diff --git a/cmd/frostfs-node/reputation.go b/cmd/frostfs-node/reputation.go index e9626b14..8854b21c 100644 --- a/cmd/frostfs-node/reputation.go +++ b/cmd/frostfs-node/reputation.go @@ -33,6 +33,7 @@ import ( "go.uber.org/zap" ) +// nolint: funlen func initReputationService(c *cfg) { wrap, err := repClient.NewFromMorph(c.cfgMorph.client, c.cfgReputation.scriptHash, 0, repClient.TryNotary()) fatalOnErr(err) diff --git a/pkg/core/object/fmt.go b/pkg/core/object/fmt.go index 804f0bd4..217c0466 100644 --- a/pkg/core/object/fmt.go +++ b/pkg/core/object/fmt.go @@ -202,6 +202,8 @@ func (i ContentMeta) Objects() []oid.ID { } // ValidateContent validates payload content according to the object type. +// +// nolint: funlen func (v *FormatValidator) ValidateContent(o *object.Object) (ContentMeta, error) { meta := ContentMeta{ typ: o.Type(), diff --git a/pkg/innerring/alphabet.go b/pkg/innerring/alphabet.go index be16f823..518c1819 100644 --- a/pkg/innerring/alphabet.go +++ b/pkg/innerring/alphabet.go @@ -53,6 +53,8 @@ const ( ) // String returns l in config-compatible format. +// +// nolint: funlen func (l GlagoliticLetter) String() string { switch l { default: diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 33cfc39a..ae3217fc 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -158,6 +158,8 @@ var ( ) // Start runs all event providers. +// +// nolint: funlen func (s *Server) Start(ctx context.Context, intError chan<- error) (err error) { s.setHealthStatus(control.HealthStatus_STARTING) defer func() { @@ -319,6 +321,8 @@ func (s *Server) registerStarter(f func() error) { } // New creates instance of inner ring sever structure. +// +// nolint: funlen func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan<- error) (*Server, error) { var err error server := &Server{log: log} diff --git a/pkg/innerring/processors/alphabet/process_emit.go b/pkg/innerring/processors/alphabet/process_emit.go index 353adb45..867d9622 100644 --- a/pkg/innerring/processors/alphabet/process_emit.go +++ b/pkg/innerring/processors/alphabet/process_emit.go @@ -10,6 +10,7 @@ import ( const emitMethod = "emit" +// nolint: funlen func (ap *Processor) processEmit() { index := ap.irList.AlphabetIndex() if index < 0 { diff --git a/pkg/innerring/processors/audit/process.go b/pkg/innerring/processors/audit/process.go index 7feecb7b..3bdb0010 100644 --- a/pkg/innerring/processors/audit/process.go +++ b/pkg/innerring/processors/audit/process.go @@ -17,6 +17,7 @@ import ( "go.uber.org/zap" ) +// nolint: funlen func (ap *Processor) processStartAudit(epoch uint64) { log := ap.log.With(zap.Uint64("epoch", epoch)) diff --git a/pkg/innerring/processors/container/common.go b/pkg/innerring/processors/container/common.go index bfbf6c78..56adc0ce 100644 --- a/pkg/innerring/processors/container/common.go +++ b/pkg/innerring/processors/container/common.go @@ -46,6 +46,8 @@ type signatureVerificationData struct { // - v.binPublicKey is a public session key // - session context corresponds to the container and verb in v // - session is "alive" +// +// nolint: funlen func (cp *Processor) verifySignature(v signatureVerificationData) error { var err error var key frostfsecdsa.PublicKeyRFC6979 diff --git a/pkg/innerring/processors/governance/process_update.go b/pkg/innerring/processors/governance/process_update.go index 913ad3d7..c9764fee 100644 --- a/pkg/innerring/processors/governance/process_update.go +++ b/pkg/innerring/processors/governance/process_update.go @@ -18,6 +18,7 @@ const ( alphabetUpdateIDPrefix = "AlphabetUpdate" ) +// nolint: funlen func (gp *Processor) processAlphabetSync(txHash util.Uint256) { if !gp.alphabetState.IsAlphabet() { gp.log.Info("non alphabet mode, ignore alphabet sync") diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/put.go b/pkg/local_object_storage/blobstor/blobovniczatree/put.go index 614d66fe..438c2e23 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/put.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/put.go @@ -13,6 +13,8 @@ import ( // Put saves object in the maximum weight blobobnicza. // // returns error if could not save object in any blobovnicza. +// +// nolint: funlen func (b *Blobovniczas) Put(prm common.PutPrm) (common.PutRes, error) { if b.readOnly { return common.PutRes{}, common.ErrReadOnly diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go b/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go index 231df3ef..e2a310ef 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go @@ -9,6 +9,7 @@ import ( "github.com/stretchr/testify/require" ) +// nolint: funlen func TestIterate(t *testing.T, cons Constructor, min, max uint64) { s := cons(t) require.NoError(t, s.Open(false)) diff --git a/pkg/local_object_storage/engine/evacuate.go b/pkg/local_object_storage/engine/evacuate.go index 59965ba4..ee04212c 100644 --- a/pkg/local_object_storage/engine/evacuate.go +++ b/pkg/local_object_storage/engine/evacuate.go @@ -57,6 +57,8 @@ var errMustHaveTwoShards = errors.New("must have at least 1 spare shard") // Evacuate moves data from one shard to the others. // The shard being moved must be in read-only mode. +// +// nolint: funlen func (e *StorageEngine) Evacuate(prm EvacuateShardPrm) (EvacuateShardRes, error) { sidList := make([]string, len(prm.shardID)) for i := range prm.shardID { diff --git a/pkg/local_object_storage/engine/get.go b/pkg/local_object_storage/engine/get.go index 264ace58..787a7bac 100644 --- a/pkg/local_object_storage/engine/get.go +++ b/pkg/local_object_storage/engine/get.go @@ -52,6 +52,7 @@ func (e *StorageEngine) Get(prm GetPrm) (res GetRes, err error) { return } +// nolint: funlen func (e *StorageEngine) get(prm GetPrm) (GetRes, error) { if e.metrics != nil { defer elapsed(e.metrics.AddGetDuration)() diff --git a/pkg/local_object_storage/engine/range.go b/pkg/local_object_storage/engine/range.go index d6e6b08f..491b226b 100644 --- a/pkg/local_object_storage/engine/range.go +++ b/pkg/local_object_storage/engine/range.go @@ -65,6 +65,7 @@ func (e *StorageEngine) GetRange(prm RngPrm) (res RngRes, err error) { return } +// nolint: funlen func (e *StorageEngine) getRange(prm RngPrm) (RngRes, error) { if e.metrics != nil { defer elapsed(e.metrics.AddRangeDuration)() diff --git a/pkg/local_object_storage/metabase/inhume.go b/pkg/local_object_storage/metabase/inhume.go index ce772576..a067a187 100644 --- a/pkg/local_object_storage/metabase/inhume.go +++ b/pkg/local_object_storage/metabase/inhume.go @@ -118,6 +118,8 @@ var ErrLockObjectRemoval = logicerr.New("lock object removal") // // NOTE: Marks any object with GC mark (despite any prohibitions on operations // with that object) if WithForceGCMark option has been provided. +// +// nolint: funlen func (db *DB) Inhume(prm InhumePrm) (res InhumeRes, err error) { db.modeMtx.RLock() defer db.modeMtx.RUnlock() diff --git a/pkg/local_object_storage/metabase/put.go b/pkg/local_object_storage/metabase/put.go index 06b1d3ac..07bb4c2b 100644 --- a/pkg/local_object_storage/metabase/put.go +++ b/pkg/local_object_storage/metabase/put.go @@ -76,6 +76,7 @@ func (db *DB) Put(prm PutPrm) (res PutRes, err error) { return } +// nolint: funlen func (db *DB) put( tx *bbolt.Tx, obj *objectSDK.Object, id []byte, si *objectSDK.SplitInfo, currEpoch uint64) error { diff --git a/pkg/local_object_storage/shard/control.go b/pkg/local_object_storage/shard/control.go index 6d17114b..05f58f83 100644 --- a/pkg/local_object_storage/shard/control.go +++ b/pkg/local_object_storage/shard/control.go @@ -156,6 +156,7 @@ func (s *Shard) Init() error { return nil } +// nolint: funlen func (s *Shard) refillMetabase() error { err := s.metaBase.Reset() if err != nil { diff --git a/pkg/metrics/engine.go b/pkg/metrics/engine.go index 2696d4a8..fbc18483 100644 --- a/pkg/metrics/engine.go +++ b/pkg/metrics/engine.go @@ -26,6 +26,7 @@ type ( const engineSubsystem = "engine" +// nolint: funlen func newEngineMetrics() engineMetrics { var ( listContainersDuration = prometheus.NewCounter(prometheus.CounterOpts{ diff --git a/pkg/metrics/object.go b/pkg/metrics/object.go index 0bb16b78..ffa5d481 100644 --- a/pkg/metrics/object.go +++ b/pkg/metrics/object.go @@ -75,6 +75,7 @@ func (m methodCount) Inc(success bool) { } } +// nolint: funlen func newObjectServiceMetrics() objectServiceMetrics { var ( // Request counter metrics. getCounter = newMethodCallCounter("get") diff --git a/pkg/morph/client/notary.go b/pkg/morph/client/notary.go index a1980e2d..307a989f 100644 --- a/pkg/morph/client/notary.go +++ b/pkg/morph/client/notary.go @@ -445,6 +445,7 @@ func (c *Client) notaryInvokeAsCommittee(method string, nonce, vub uint32, args return c.notaryInvoke(true, true, designate, nonce, &vub, method, args...) } +// nolint: funlen func (c *Client) notaryInvoke(committee, invokedByAlpha bool, contract util.Uint160, nonce uint32, vub *uint32, method string, args ...any) error { alphabetList, err := c.notary.alphabetSource() // prepare arguments for test invocation if err != nil { diff --git a/pkg/morph/event/listener.go b/pkg/morph/event/listener.go index 13ad868e..17be3ea1 100644 --- a/pkg/morph/event/listener.go +++ b/pkg/morph/event/listener.go @@ -191,6 +191,7 @@ func (l *listener) listen(ctx context.Context, intError chan<- error) error { return nil } +// nolint: funlen func (l *listener) listenLoop(ctx context.Context, chEvent <-chan *state.ContainedNotificationEvent, intErr chan<- error) { var ( blockChan <-chan *block.Block diff --git a/pkg/morph/event/notary_preparator.go b/pkg/morph/event/notary_preparator.go index f661268f..f85b5b64 100644 --- a/pkg/morph/event/notary_preparator.go +++ b/pkg/morph/event/notary_preparator.go @@ -103,6 +103,8 @@ func notaryPreparator(prm PreparatorPrm) NotaryPreparator { // transaction is expected to be received one more time // from the Notary service but already signed. This happens // since every notary call is a new notary request in fact. +// +// nolint: funlen func (p Preparator) Prepare(nr *payload.P2PNotaryRequest) (NotaryEvent, error) { // notary request's main tx is expected to have // three or four witnesses: one for proxy contract, diff --git a/pkg/services/audit/auditor/por.go b/pkg/services/audit/auditor/por.go index 432826ac..1922213e 100644 --- a/pkg/services/audit/auditor/por.go +++ b/pkg/services/audit/auditor/por.go @@ -35,6 +35,7 @@ func (c *Context) executePoR() { c.report.SetPoRCounters(c.porRequests.Load(), c.porRetries.Load()) } +// nolint: funlen func (c *Context) checkStorageGroupPoR(sgID oid.ID, sg storagegroupSDK.StorageGroup) { members := sg.Members() c.updateSGInfo(sgID, members) diff --git a/pkg/services/object/acl/acl.go b/pkg/services/object/acl/acl.go index 6734f9f7..a068eadb 100644 --- a/pkg/services/object/acl/acl.go +++ b/pkg/services/object/acl/acl.go @@ -118,6 +118,8 @@ func (c *Checker) StickyBitCheck(info v2.RequestInfo, owner user.ID) bool { } // CheckEACL is a main check function for extended ACL. +// +// nolint: funlen func (c *Checker) CheckEACL(msg any, reqInfo v2.RequestInfo) error { basicACL := reqInfo.BasicACL() if !basicACL.Extendable() { diff --git a/pkg/services/object/acl/eacl/v2/headers.go b/pkg/services/object/acl/eacl/v2/headers.go index 31188fbf..63e733cf 100644 --- a/pkg/services/object/acl/eacl/v2/headers.go +++ b/pkg/services/object/acl/eacl/v2/headers.go @@ -101,6 +101,7 @@ func requestHeaders(msg xHeaderSource) []eaclSDK.Header { var errMissingOID = errors.New("object ID is missing") +// nolint: funlen func (h *cfg) readObjectHeaders(dst *headerSource) error { switch m := h.msg.(type) { default: diff --git a/pkg/services/object/acl/v2/service.go b/pkg/services/object/acl/v2/service.go index 6bae0d0c..6bf8c440 100644 --- a/pkg/services/object/acl/v2/service.go +++ b/pkg/services/object/acl/v2/service.go @@ -443,6 +443,7 @@ func (b Service) GetRangeHash( return b.next.GetRangeHash(ctx, request) } +// nolint: funlen func (p putStreamBasicChecker) Send(request *objectV2.PutRequest) error { body := request.GetBody() if body == nil { diff --git a/pkg/services/object/get/util.go b/pkg/services/object/get/util.go index dc98e6c5..d647b07f 100644 --- a/pkg/services/object/get/util.go +++ b/pkg/services/object/get/util.go @@ -87,6 +87,7 @@ func (c *clientCacheWrapper) get(info coreclient.NodeInfo) (getClient, error) { }, nil } +// nolint: funlen func (c *clientWrapper) getObject(exec *execCtx, info coreclient.NodeInfo) (*object.Object, error) { if exec.isForwardingEnabled() { return exec.prm.forwarder(info, c.client) diff --git a/pkg/services/object/get/v2/util.go b/pkg/services/object/get/v2/util.go index e0393e56..fb8e9970 100644 --- a/pkg/services/object/get/v2/util.go +++ b/pkg/services/object/get/v2/util.go @@ -33,6 +33,7 @@ import ( var errWrongMessageSeq = errors.New("incorrect message sequence") +// nolint: funlen func (s *Service) toPrm(req *objectV2.GetRequest, stream objectSvc.GetObjectStream) (*getsvc.Prm, error) { body := req.GetBody() @@ -199,6 +200,7 @@ func (s *Service) toPrm(req *objectV2.GetRequest, stream objectSvc.GetObjectStre return p, nil } +// nolint: funlen func (s *Service) toRangePrm(req *objectV2.GetRangeRequest, stream objectSvc.GetObjectRangeStream) (*getsvc.RangePrm, error) { body := req.GetBody() @@ -424,6 +426,7 @@ func (w *headResponseWriter) WriteHeader(_ context.Context, hdr *object.Object) return nil } +// nolint: funlen func (s *Service) toHeadPrm(ctx context.Context, req *objectV2.HeadRequest, resp *objectV2.HeadResponse) (*getsvc.HeadPrm, error) { body := req.GetBody() diff --git a/pkg/services/object/put/distributed.go b/pkg/services/object/put/distributed.go index 8d47e63b..47104b32 100644 --- a/pkg/services/object/put/distributed.go +++ b/pkg/services/object/put/distributed.go @@ -164,6 +164,7 @@ func (t *distributedTarget) sendObject(node nodeDesc) error { return nil } +// nolint: funlen func (t *distributedTarget) iteratePlacement(f func(nodeDesc) error) (*transformer.AccessIdentifiers, error) { id, _ := t.obj.ID() diff --git a/pkg/services/object/put/streamer.go b/pkg/services/object/put/streamer.go index 8ca90e86..915b718a 100644 --- a/pkg/services/object/put/streamer.go +++ b/pkg/services/object/put/streamer.go @@ -54,6 +54,7 @@ func (p *Streamer) MaxObjectSize() uint64 { return p.maxPayloadSz } +// nolint: funlen func (p *Streamer) initTarget(prm *PutInitPrm) error { // prevent re-calling if p.target != nil { diff --git a/pkg/services/object/search/v2/util.go b/pkg/services/object/search/v2/util.go index a2acb48f..c15217a1 100644 --- a/pkg/services/object/search/v2/util.go +++ b/pkg/services/object/search/v2/util.go @@ -22,6 +22,7 @@ import ( oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) +// nolint: funlen func (s *Service) toPrm(req *objectV2.SearchRequest, stream objectSvc.SearchStream) (*searchsvc.Prm, error) { body := req.GetBody() diff --git a/pkg/services/object/util/chain.go b/pkg/services/object/util/chain.go index 33bcd6c1..ded63731 100644 --- a/pkg/services/object/util/chain.go +++ b/pkg/services/object/util/chain.go @@ -72,6 +72,7 @@ func TraverseSplitChain(r HeadReceiver, addr oid.Address, h SplitMemberHandler) return err } +// nolint: funlen func traverseSplitChain(r HeadReceiver, addr oid.Address, h SplitMemberHandler) (bool, error) { v, err := r.Head(addr) if err != nil { diff --git a/pkg/services/policer/check.go b/pkg/services/policer/check.go index e240bbea..7b4bf826 100644 --- a/pkg/services/policer/check.go +++ b/pkg/services/policer/check.go @@ -147,6 +147,7 @@ type processPlacementContext struct { removeLocalCopy bool } +// nolint: funlen func (p *Policer) processNodes(ctx *processPlacementContext, addrWithType objectcore.AddressWithType, nodes []netmap.NodeInfo, shortage uint32, checkedNodes *nodeCache) { addr := addrWithType.Address diff --git a/pkg/services/reputation/eigentrust/calculator/calls.go b/pkg/services/reputation/eigentrust/calculator/calls.go index 09286d79..23e41872 100644 --- a/pkg/services/reputation/eigentrust/calculator/calls.go +++ b/pkg/services/reputation/eigentrust/calculator/calls.go @@ -104,6 +104,7 @@ type iterDaughterPrm struct { consumersIter TrustIterator } +// nolint: funlen func (c *Calculator) iterateDaughter(p iterDaughterPrm) { initTrust, err := c.prm.InitialTrustSource.InitialTrust(p.id) if err != nil { diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index a1bab61d..fa7cc69f 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -255,6 +255,7 @@ func (s *Service) SynchronizeAll() error { } } +// nolint: funlen func (s *Service) syncLoop(ctx context.Context) { for { select { -- 2.45.2 From 481a1ca6f35625f890612b6b5fc6e2eed7c982f3 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Mon, 20 Mar 2023 10:18:24 +0300 Subject: [PATCH 42/70] [#148] linter: Add gocognit linter Code with high cognitive complexity is hard intuitively to understand Signed-off-by: Dmitrii Stepanov --- .golangci.yml | 7 +++++-- cmd/frostfs-adm/internal/modules/morph/balance.go | 2 +- pkg/innerring/innerring.go | 2 +- pkg/local_object_storage/engine/evacuate.go | 2 +- pkg/local_object_storage/metabase/inhume.go | 2 +- pkg/local_object_storage/metabase/lock.go | 2 ++ pkg/morph/event/listener.go | 2 +- pkg/services/object/get/v2/util.go | 6 +++--- pkg/services/object/search/v2/util.go | 2 +- pkg/services/object/util/chain.go | 2 +- pkg/services/tree/sync.go | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 683d976a..4612d96a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -27,8 +27,10 @@ linters-settings: staticcheck: checks: ["all", "-SA1019"] # TODO Enable SA1019 after deprecated warning are fixed. funlen: - lines: 80 - statements: 60 + lines: 80 # default 60 + statements: 60 # default 40 + gocognit: + min-complexity: 40 # default 30 linters: enable: @@ -58,5 +60,6 @@ linters: - whitespace - containedctx - funlen + - gocognit disable-all: true fast: false diff --git a/cmd/frostfs-adm/internal/modules/morph/balance.go b/cmd/frostfs-adm/internal/modules/morph/balance.go index c8549268..ca9d939f 100644 --- a/cmd/frostfs-adm/internal/modules/morph/balance.go +++ b/cmd/frostfs-adm/internal/modules/morph/balance.go @@ -44,7 +44,7 @@ const ( notaryEnabled = true ) -// nolint: funlen +// nolint: funlen, gocognit func dumpBalances(cmd *cobra.Command, _ []string) error { var ( dumpStorage, _ = cmd.Flags().GetBool(dumpBalancesStorageFlag) diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index ae3217fc..200a2017 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -322,7 +322,7 @@ func (s *Server) registerStarter(f func() error) { // New creates instance of inner ring sever structure. // -// nolint: funlen +// nolint: funlen, gocognit func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan<- error) (*Server, error) { var err error server := &Server{log: log} diff --git a/pkg/local_object_storage/engine/evacuate.go b/pkg/local_object_storage/engine/evacuate.go index ee04212c..4bc7eac1 100644 --- a/pkg/local_object_storage/engine/evacuate.go +++ b/pkg/local_object_storage/engine/evacuate.go @@ -58,7 +58,7 @@ var errMustHaveTwoShards = errors.New("must have at least 1 spare shard") // Evacuate moves data from one shard to the others. // The shard being moved must be in read-only mode. // -// nolint: funlen +// nolint: funlen, gocognit func (e *StorageEngine) Evacuate(prm EvacuateShardPrm) (EvacuateShardRes, error) { sidList := make([]string, len(prm.shardID)) for i := range prm.shardID { diff --git a/pkg/local_object_storage/metabase/inhume.go b/pkg/local_object_storage/metabase/inhume.go index a067a187..3f33f990 100644 --- a/pkg/local_object_storage/metabase/inhume.go +++ b/pkg/local_object_storage/metabase/inhume.go @@ -119,7 +119,7 @@ var ErrLockObjectRemoval = logicerr.New("lock object removal") // NOTE: Marks any object with GC mark (despite any prohibitions on operations // with that object) if WithForceGCMark option has been provided. // -// nolint: funlen +// nolint: funlen, gocognit func (db *DB) Inhume(prm InhumePrm) (res InhumeRes, err error) { db.modeMtx.RLock() defer db.modeMtx.RUnlock() diff --git a/pkg/local_object_storage/metabase/lock.go b/pkg/local_object_storage/metabase/lock.go index 0ecd8cfe..65f9e669 100644 --- a/pkg/local_object_storage/metabase/lock.go +++ b/pkg/local_object_storage/metabase/lock.go @@ -138,6 +138,8 @@ func objectLocked(tx *bbolt.Tx, idCnr cid.ID, idObj oid.ID) bool { // Operation is very resource-intensive, which is caused by the admissibility // of multiple locks. Also, if we knew what objects are locked, it would be // possible to speed up the execution. +// +// nolint: gocognit func freePotentialLocks(tx *bbolt.Tx, idCnr cid.ID, locker oid.ID) error { bucketLocked := tx.Bucket(bucketNameLocked) if bucketLocked != nil { diff --git a/pkg/morph/event/listener.go b/pkg/morph/event/listener.go index 17be3ea1..ed2b9502 100644 --- a/pkg/morph/event/listener.go +++ b/pkg/morph/event/listener.go @@ -191,7 +191,7 @@ func (l *listener) listen(ctx context.Context, intError chan<- error) error { return nil } -// nolint: funlen +// nolint: funlen, gocognit func (l *listener) listenLoop(ctx context.Context, chEvent <-chan *state.ContainedNotificationEvent, intErr chan<- error) { var ( blockChan <-chan *block.Block diff --git a/pkg/services/object/get/v2/util.go b/pkg/services/object/get/v2/util.go index fb8e9970..e35cece3 100644 --- a/pkg/services/object/get/v2/util.go +++ b/pkg/services/object/get/v2/util.go @@ -33,7 +33,7 @@ import ( var errWrongMessageSeq = errors.New("incorrect message sequence") -// nolint: funlen +// nolint: funlen, gocognit func (s *Service) toPrm(req *objectV2.GetRequest, stream objectSvc.GetObjectStream) (*getsvc.Prm, error) { body := req.GetBody() @@ -200,7 +200,7 @@ func (s *Service) toPrm(req *objectV2.GetRequest, stream objectSvc.GetObjectStre return p, nil } -// nolint: funlen +// nolint: funlen, gocognit func (s *Service) toRangePrm(req *objectV2.GetRangeRequest, stream objectSvc.GetObjectRangeStream) (*getsvc.RangePrm, error) { body := req.GetBody() @@ -426,7 +426,7 @@ func (w *headResponseWriter) WriteHeader(_ context.Context, hdr *object.Object) return nil } -// nolint: funlen +// nolint: funlen, gocognit func (s *Service) toHeadPrm(ctx context.Context, req *objectV2.HeadRequest, resp *objectV2.HeadResponse) (*getsvc.HeadPrm, error) { body := req.GetBody() diff --git a/pkg/services/object/search/v2/util.go b/pkg/services/object/search/v2/util.go index c15217a1..2bde6b2f 100644 --- a/pkg/services/object/search/v2/util.go +++ b/pkg/services/object/search/v2/util.go @@ -22,7 +22,7 @@ import ( oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) -// nolint: funlen +// nolint: funlen, gocognit func (s *Service) toPrm(req *objectV2.SearchRequest, stream objectSvc.SearchStream) (*searchsvc.Prm, error) { body := req.GetBody() diff --git a/pkg/services/object/util/chain.go b/pkg/services/object/util/chain.go index ded63731..e6ec9363 100644 --- a/pkg/services/object/util/chain.go +++ b/pkg/services/object/util/chain.go @@ -72,7 +72,7 @@ func TraverseSplitChain(r HeadReceiver, addr oid.Address, h SplitMemberHandler) return err } -// nolint: funlen +// nolint: funlen, gocognit func traverseSplitChain(r HeadReceiver, addr oid.Address, h SplitMemberHandler) (bool, error) { v, err := r.Head(addr) if err != nil { diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index fa7cc69f..abd683b7 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -255,7 +255,7 @@ func (s *Service) SynchronizeAll() error { } } -// nolint: funlen +// nolint: funlen, gocognit func (s *Service) syncLoop(ctx context.Context) { for { select { -- 2.45.2 From 44b86bac5aa9121fbb19298ae13dcc8a9673bb7a Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Mon, 20 Mar 2023 15:10:53 +0300 Subject: [PATCH 43/70] [#148] linter: Add contextcheck linter Signed-off-by: Dmitrii Stepanov --- .golangci.yml | 1 + pkg/services/control/server/gc.go | 1 + pkg/services/object/get/assemble.go | 3 ++- pkg/services/object/get/get.go | 1 + pkg/services/object/get/remote.go | 1 + pkg/services/object/search/search.go | 1 + pkg/services/policer/check.go | 2 ++ pkg/services/tree/replicator.go | 1 + 8 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index 4612d96a..ac77301b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -61,5 +61,6 @@ linters: - containedctx - funlen - gocognit + - contextcheck disable-all: true fast: false diff --git a/pkg/services/control/server/gc.go b/pkg/services/control/server/gc.go index ea1f626f..7fa0a060 100644 --- a/pkg/services/control/server/gc.go +++ b/pkg/services/control/server/gc.go @@ -41,6 +41,7 @@ func (s *Server) DropObjects(_ context.Context, req *control.DropObjectsRequest) prm.WithForceRemoval() prm.WithAddress(addrList[i]) + //nolint: contextcheck _, err := s.s.Delete(prm) if err != nil && firstErr == nil { firstErr = err diff --git a/pkg/services/object/get/assemble.go b/pkg/services/object/get/assemble.go index ed77b569..ebae18eb 100644 --- a/pkg/services/object/get/assemble.go +++ b/pkg/services/object/get/assemble.go @@ -107,7 +107,7 @@ func (exec *execCtx) HeadObject(ctx context.Context, id oid.ID) (*objectSDK.Obje w := NewSimpleObjectWriter() prm.SetHeaderWriter(w) - + //nolint: contextcheck err := exec.svc.Head(exec.context(), prm) if err != nil { @@ -128,6 +128,7 @@ func (exec *execCtx) GetObject(ctx context.Context, id oid.ID, rng *objectSDK.Ra p.addr.SetContainer(exec.containerID()) p.addr.SetObject(id) + //nolint: contextcheck statusError := exec.svc.get(exec.context(), p.commonPrm, withPayloadRange(rng)) if statusError.err != nil { diff --git a/pkg/services/object/get/get.go b/pkg/services/object/get/get.go index f3d5f8a5..cdb2d96f 100644 --- a/pkg/services/object/get/get.go +++ b/pkg/services/object/get/get.go @@ -78,6 +78,7 @@ func (s *Service) get(ctx context.Context, prm commonPrm, opts ...execOption) st exec.setLogger(s.log) + //nolint: contextcheck exec.execute() return exec.statusError diff --git a/pkg/services/object/get/remote.go b/pkg/services/object/get/remote.go index da310d24..fbfb01bc 100644 --- a/pkg/services/object/get/remote.go +++ b/pkg/services/object/get/remote.go @@ -43,6 +43,7 @@ func (exec *execCtx) processNode(ctx context.Context, info client.NodeInfo) bool // has already been streamed to the requesting party if obj != nil { exec.collectedObject = obj + //nolint: contextcheck exec.writeCollectedObject() } case errors.As(err, &errRemoved): diff --git a/pkg/services/object/search/search.go b/pkg/services/object/search/search.go index 5e1249a1..5a688092 100644 --- a/pkg/services/object/search/search.go +++ b/pkg/services/object/search/search.go @@ -18,6 +18,7 @@ func (s *Service) Search(ctx context.Context, prm Prm) error { exec.setLogger(s.log) + //nolint: contextcheck exec.execute() return exec.statusError.err diff --git a/pkg/services/policer/check.go b/pkg/services/policer/check.go index 7b4bf826..7d4b714f 100644 --- a/pkg/services/policer/check.go +++ b/pkg/services/policer/check.go @@ -81,6 +81,7 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add prm.MarkAsGarbage(addrWithType.Address) prm.WithForceRemoval() + //nolint: contextcheck _, err := p.jobQueue.localStorage.Inhume(prm) if err != nil { p.log.Error("could not inhume object with missing container", @@ -124,6 +125,7 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add default: } + //nolint: contextcheck p.processNodes(c, addrWithType, nn[i], policy.ReplicaNumberByIndex(i), checkedNodes) } diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go index 0c3c35f7..01bd2deb 100644 --- a/pkg/services/tree/replicator.go +++ b/pkg/services/tree/replicator.go @@ -94,6 +94,7 @@ func (s *Service) replicationWorker() { func (s *Service) replicateLoop(ctx context.Context) { for i := 0; i < s.replicatorWorkerCount; i++ { + //nolint: contextcheck go s.replicationWorker() go s.localReplicationWorker() } -- 2.45.2 From 9cd8f7cea01241035ee1c877d68c4a8805bfdb56 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Mon, 20 Mar 2023 20:36:07 +0300 Subject: [PATCH 44/70] [#152] IR: Process empty basic incomes If network is not configured for basic income earnings, do not distribute GAS by the Alphabet nodes. Signed-off-by: Pavel Karpy --- pkg/innerring/processors/settlement/basic/collect.go | 5 +++++ pkg/innerring/processors/settlement/basic/context.go | 2 ++ pkg/innerring/processors/settlement/basic/distribute.go | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/pkg/innerring/processors/settlement/basic/collect.go b/pkg/innerring/processors/settlement/basic/collect.go index 72f4eb8d..ee7354c4 100644 --- a/pkg/innerring/processors/settlement/basic/collect.go +++ b/pkg/innerring/processors/settlement/basic/collect.go @@ -26,6 +26,11 @@ func (inc *IncomeSettlementContext) Collect() { return } + if cachedRate == 0 { + inc.noop = true + return + } + cnrEstimations, err := inc.estimations.Estimations(inc.epoch) if err != nil { inc.log.Error("can't fetch container size estimations", diff --git a/pkg/innerring/processors/settlement/basic/context.go b/pkg/innerring/processors/settlement/basic/context.go index a605c053..59bedf2e 100644 --- a/pkg/innerring/processors/settlement/basic/context.go +++ b/pkg/innerring/processors/settlement/basic/context.go @@ -28,6 +28,8 @@ type ( IncomeSettlementContext struct { mu sync.Mutex // lock to prevent collection and distribution in the same time + noop bool + log *logger.Logger epoch uint64 diff --git a/pkg/innerring/processors/settlement/basic/distribute.go b/pkg/innerring/processors/settlement/basic/distribute.go index a2baa36a..e085f1e2 100644 --- a/pkg/innerring/processors/settlement/basic/distribute.go +++ b/pkg/innerring/processors/settlement/basic/distribute.go @@ -12,6 +12,10 @@ func (inc *IncomeSettlementContext) Distribute() { inc.mu.Lock() defer inc.mu.Unlock() + if inc.noop { + return + } + txTable := common.NewTransferTable() bankBalance, err := inc.balances.Balance(inc.bankOwner) -- 2.45.2 From 6c4a1699ef57ef0bbf46b4ab1d083e7586a86631 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Fri, 17 Mar 2023 10:56:37 +0300 Subject: [PATCH 45/70] [#145] shard-gc: Expired locked unit test Added unit test that verifies that GC deletes expired locked objects in one epoch. Signed-off-by: Dmitrii Stepanov --- pkg/local_object_storage/shard/gc_test.go | 121 +++++++++++++++++++ pkg/local_object_storage/shard/shard_test.go | 6 +- 2 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 pkg/local_object_storage/shard/gc_test.go diff --git a/pkg/local_object_storage/shard/gc_test.go b/pkg/local_object_storage/shard/gc_test.go new file mode 100644 index 00000000..8643605e --- /dev/null +++ b/pkg/local_object_storage/shard/gc_test.go @@ -0,0 +1,121 @@ +package shard_test + +import ( + "context" + "path/filepath" + "testing" + "time" + + objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/panjf2000/ants/v2" + "github.com/stretchr/testify/require" + "go.uber.org/zap" +) + +func Test_GCDropsLockedExpiredObject(t *testing.T) { + var sh *shard.Shard + + epoch := &epochState{ + Value: 100, + } + + rootPath := t.TempDir() + opts := []shard.Option{ + shard.WithLogger(&logger.Logger{Logger: zap.NewNop()}), + shard.WithBlobStorOptions( + blobstor.WithStorages([]blobstor.SubStorage{ + { + Storage: blobovniczatree.NewBlobovniczaTree( + blobovniczatree.WithRootPath(filepath.Join(rootPath, "blob", "blobovnicza")), + blobovniczatree.WithBlobovniczaShallowDepth(2), + blobovniczatree.WithBlobovniczaShallowWidth(2)), + Policy: func(_ *object.Object, data []byte) bool { + return len(data) <= 1<<20 + }, + }, + { + Storage: fstree.New( + fstree.WithPath(filepath.Join(rootPath, "blob"))), + }, + }), + ), + shard.WithMetaBaseOptions( + meta.WithPath(filepath.Join(rootPath, "meta")), + meta.WithEpochState(epoch), + ), + shard.WithDeletedLockCallback(func(_ context.Context, addresses []oid.Address) { + sh.HandleDeletedLocks(addresses) + }), + shard.WithExpiredLocksCallback(func(_ context.Context, a []oid.Address) { + sh.HandleExpiredLocks(a) + }), + shard.WithGCWorkerPoolInitializer(func(sz int) util.WorkerPool { + pool, err := ants.NewPool(sz) + require.NoError(t, err) + + return pool + }), + } + + sh = shard.New(opts...) + require.NoError(t, sh.Open()) + require.NoError(t, sh.Init()) + + t.Cleanup(func() { + releaseShard(sh, t) + }) + + cnr := cidtest.ID() + + var objExpirationAttr objectSDK.Attribute + objExpirationAttr.SetKey(objectV2.SysAttributeExpEpoch) + objExpirationAttr.SetValue("101") + + obj := generateObjectWithCID(t, cnr) + obj.SetAttributes(objExpirationAttr) + objID, _ := obj.ID() + + var lockExpirationAttr objectSDK.Attribute + lockExpirationAttr.SetKey(objectV2.SysAttributeExpEpoch) + lockExpirationAttr.SetValue("103") + + lock := generateObjectWithCID(t, cnr) + lock.SetType(object.TypeLock) + lock.SetAttributes(lockExpirationAttr) + lockID, _ := lock.ID() + + var putPrm shard.PutPrm + putPrm.SetObject(obj) + + _, err := sh.Put(putPrm) + require.NoError(t, err) + + err = sh.Lock(cnr, lockID, []oid.ID{objID}) + require.NoError(t, err) + + putPrm.SetObject(lock) + _, err = sh.Put(putPrm) + require.NoError(t, err) + + epoch.Value = 105 + sh.NotificationChannel() <- shard.EventNewEpoch(epoch.Value) + + var getPrm shard.GetPrm + getPrm.SetAddress(objectCore.AddressOf(obj)) + require.Eventually(t, func() bool { + _, err = sh.Get(getPrm) + return shard.IsErrNotFound(err) + }, 3*time.Second, 1*time.Second, "expired object must be deleted") +} diff --git a/pkg/local_object_storage/shard/shard_test.go b/pkg/local_object_storage/shard/shard_test.go index a6da5391..2a98dabb 100644 --- a/pkg/local_object_storage/shard/shard_test.go +++ b/pkg/local_object_storage/shard/shard_test.go @@ -27,10 +27,12 @@ import ( "go.uber.org/zap/zaptest" ) -type epochState struct{} +type epochState struct { + Value uint64 +} func (s epochState) CurrentEpoch() uint64 { - return 0 + return s.Value } func newShard(t testing.TB, enableWriteCache bool) *shard.Shard { -- 2.45.2 From 5059dcc19dfd34d6b1f6e53a7d7efafb2c3c4b0e Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Fri, 17 Mar 2023 11:06:15 +0300 Subject: [PATCH 46/70] [#145] shard-gc: Delete expired objects after locks GC deletes expired locks and objects sequentially. Expired locks and objects are now being deleted concurrently in batches. Added a config parameter that controls the number of concurrent workers and batch size. Signed-off-by: Dmitrii Stepanov --- cmd/frostfs-node/config.go | 10 +- cmd/frostfs-node/config/engine/config_test.go | 5 + .../config/engine/shard/gc/config.go | 40 +++++ config/example/node.env | 4 + config/example/node.json | 4 +- config/example/node.yaml | 2 + go.mod | 5 +- pkg/local_object_storage/shard/control.go | 3 +- pkg/local_object_storage/shard/gc.go | 139 +++++++++++++++--- pkg/local_object_storage/shard/shard.go | 16 ++ 10 files changed, 196 insertions(+), 32 deletions(-) diff --git a/cmd/frostfs-node/config.go b/cmd/frostfs-node/config.go index 25222ed4..09f2c208 100644 --- a/cmd/frostfs-node/config.go +++ b/cmd/frostfs-node/config.go @@ -117,8 +117,10 @@ type shardCfg struct { subStorages []subStorageCfg gcCfg struct { - removerBatchSize int - removerSleepInterval time.Duration + removerBatchSize int + removerSleepInterval time.Duration + expiredCollectorBatchSize int + expiredCollectorWorkersCount int } writecacheCfg struct { @@ -287,6 +289,8 @@ func (a *applicationConfiguration) readConfig(c *config.Config) error { sh.gcCfg.removerBatchSize = gcCfg.RemoverBatchSize() sh.gcCfg.removerSleepInterval = gcCfg.RemoverSleepInterval() + sh.gcCfg.expiredCollectorBatchSize = gcCfg.ExpiredCollectorBatchSize() + sh.gcCfg.expiredCollectorWorkersCount = gcCfg.ExpiredCollectorWorkersCount() a.EngineCfg.shards = append(a.EngineCfg.shards, sh) @@ -753,6 +757,8 @@ func (c *cfg) shardOpts() []shardOptsWithID { shard.WithWriteCacheOptions(writeCacheOpts...), shard.WithRemoverBatchSize(shCfg.gcCfg.removerBatchSize), shard.WithGCRemoverSleepInterval(shCfg.gcCfg.removerSleepInterval), + shard.WithExpiredCollectorBatchSize(shCfg.gcCfg.expiredCollectorBatchSize), + shard.WithExpiredCollectorWorkersCount(shCfg.gcCfg.expiredCollectorWorkersCount), shard.WithGCWorkerPoolInitializer(func(sz int) util.WorkerPool { pool, err := ants.NewPool(sz) fatalOnErr(err) diff --git a/cmd/frostfs-node/config/engine/config_test.go b/cmd/frostfs-node/config/engine/config_test.go index 72e57ee5..83f5a65e 100644 --- a/cmd/frostfs-node/config/engine/config_test.go +++ b/cmd/frostfs-node/config/engine/config_test.go @@ -10,6 +10,7 @@ import ( shardconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" blobovniczaconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza" fstreeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/fstree" + gcconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/gc" piloramaconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/pilorama" configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" @@ -103,6 +104,8 @@ func TestEngineSection(t *testing.T) { require.EqualValues(t, 150, gc.RemoverBatchSize()) require.Equal(t, 2*time.Minute, gc.RemoverSleepInterval()) + require.Equal(t, 1500, gc.ExpiredCollectorBatchSize()) + require.Equal(t, 15, gc.ExpiredCollectorWorkersCount()) require.Equal(t, false, sc.RefillMetabase()) require.Equal(t, mode.ReadOnly, sc.Mode()) @@ -149,6 +152,8 @@ func TestEngineSection(t *testing.T) { require.EqualValues(t, 200, gc.RemoverBatchSize()) require.Equal(t, 5*time.Minute, gc.RemoverSleepInterval()) + require.Equal(t, gcconfig.ExpiredCollectorBatchSizeDefault, gc.ExpiredCollectorBatchSize()) + require.Equal(t, gcconfig.ExpiredCollectorWorkersCountDefault, gc.ExpiredCollectorWorkersCount()) require.Equal(t, true, sc.RefillMetabase()) require.Equal(t, mode.ReadWrite, sc.Mode()) diff --git a/cmd/frostfs-node/config/engine/shard/gc/config.go b/cmd/frostfs-node/config/engine/shard/gc/config.go index 1aa01d90..0500697c 100644 --- a/cmd/frostfs-node/config/engine/shard/gc/config.go +++ b/cmd/frostfs-node/config/engine/shard/gc/config.go @@ -16,6 +16,12 @@ const ( // RemoverSleepIntervalDefault is a default sleep interval of Shard GC's remover. RemoverSleepIntervalDefault = time.Minute + + // ExpiredCollectorWorkersCountDefault is a default workers count of Shard GC expired object collector. + ExpiredCollectorWorkersCountDefault = 5 + + // ExpiredCollectorBatchSizeDefault is a default batch size of Shard GC expired object collector. + ExpiredCollectorBatchSizeDefault = 500 ) // From wraps config section into Config. @@ -56,3 +62,37 @@ func (x *Config) RemoverSleepInterval() time.Duration { return RemoverSleepIntervalDefault } + +// ExpiredCollectorWorkersCount returns the value of "expired_collector_workers_count" +// config parameter. +// +// Returns ExpiredCollectorWorkersCountDefault if the value is not a positive number. +func (x *Config) ExpiredCollectorWorkersCount() int { + s := config.IntSafe( + (*config.Config)(x), + "expired_collector_workers_count", + ) + + if s > 0 { + return int(s) + } + + return ExpiredCollectorWorkersCountDefault +} + +// ExpiredCollectorBatchSize returns the value of "expired_collector_batch_size" +// config parameter. +// +// Returns ExpiredCollectorBatchSizeDefault if the value is not a positive number. +func (x *Config) ExpiredCollectorBatchSize() int { + s := config.IntSafe( + (*config.Config)(x), + "expired_collector_batch_size", + ) + + if s > 0 { + return int(s) + } + + return ExpiredCollectorBatchSizeDefault +} diff --git a/config/example/node.env b/config/example/node.env index 247178d6..8034fbb2 100644 --- a/config/example/node.env +++ b/config/example/node.env @@ -135,6 +135,10 @@ FROSTFS_STORAGE_SHARD_0_PILORAMA_MAX_BATCH_SIZE=200 FROSTFS_STORAGE_SHARD_0_GC_REMOVER_BATCH_SIZE=150 #### Sleep interval between data remover tacts FROSTFS_STORAGE_SHARD_0_GC_REMOVER_SLEEP_INTERVAL=2m +#### Limit of objects to be marked expired by the garbage collector +FROSTFS_STORAGE_SHARD_0_GC_EXPIRED_COLLECTOR_BATCH_SIZE=1500 +#### Limit of concurrent workers collecting expired objects by the garbage collector +FROSTFS_STORAGE_SHARD_0_GC_EXPIRED_COLLECTOR_WORKERS_COUNT=15 ## 1 shard ### Flag to refill Metabase from BlobStor diff --git a/config/example/node.json b/config/example/node.json index 9fbd0f9b..e7bb375a 100644 --- a/config/example/node.json +++ b/config/example/node.json @@ -187,7 +187,9 @@ }, "gc": { "remover_batch_size": 150, - "remover_sleep_interval": "2m" + "remover_sleep_interval": "2m", + "expired_collector_batch_size": 1500, + "expired_collector_workers_count": 15 } }, "1": { diff --git a/config/example/node.yaml b/config/example/node.yaml index bf1d6545..6a5ea5f0 100644 --- a/config/example/node.yaml +++ b/config/example/node.yaml @@ -192,6 +192,8 @@ storage: gc: remover_batch_size: 150 # number of objects to be removed by the garbage collector remover_sleep_interval: 2m # frequency of the garbage collector invocation + expired_collector_batch_size: 1500 # number of objects to be marked expired by the garbage collector + expired_collector_workers_count: 15 # number of concurrent workers collecting expired objects by the garbage collector 1: writecache: diff --git a/go.mod b/go.mod index 61cd5764..bb5a53b2 100644 --- a/go.mod +++ b/go.mod @@ -33,14 +33,14 @@ require ( go.etcd.io/bbolt v1.3.6 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.24.0 + golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 + golang.org/x/sync v0.1.0 golang.org/x/term v0.3.0 google.golang.org/grpc v1.51.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v3 v3.0.1 ) -require golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 - require ( git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 // indirect git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 // indirect @@ -94,7 +94,6 @@ require ( go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.4.0 // indirect golang.org/x/net v0.4.0 // indirect - golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.3.0 // indirect golang.org/x/text v0.5.0 // indirect golang.org/x/time v0.1.0 // indirect diff --git a/pkg/local_object_storage/shard/control.go b/pkg/local_object_storage/shard/control.go index 05f58f83..acf038d7 100644 --- a/pkg/local_object_storage/shard/control.go +++ b/pkg/local_object_storage/shard/control.go @@ -143,9 +143,8 @@ func (s *Shard) Init() error { eventNewEpoch: { cancelFunc: func() {}, handlers: []eventHandler{ - s.collectExpiredObjects, + s.collectExpiredLocksAndObjects, s.collectExpiredTombstones, - s.collectExpiredLocks, }, }, }, diff --git a/pkg/local_object_storage/shard/gc.go b/pkg/local_object_storage/shard/gc.go index a8910561..b5874711 100644 --- a/pkg/local_object_storage/shard/gc.go +++ b/pkg/local_object_storage/shard/gc.go @@ -12,6 +12,12 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" + "golang.org/x/sync/errgroup" +) + +const ( + minExpiredWorkers = 2 + minExpiredBatchSize = 1 ) // TombstoneSource is an interface that checks @@ -81,6 +87,9 @@ type gcCfg struct { log *logger.Logger workerPoolInit func(int) util.WorkerPool + + expiredCollectorWorkersCount int + expiredCollectorBatchSize int } func defaultGCCfg() gcCfg { @@ -234,15 +243,72 @@ func (s *Shard) removeGarbage() { } } +func (s *Shard) collectExpiredLocksAndObjects(ctx context.Context, e Event) { + s.collectExpiredLocks(ctx, e) + s.collectExpiredObjects(ctx, e) +} + +func (s *Shard) getExpiredObjectsParameters() (workersCount, batchSize int) { + workersCount = minExpiredWorkers + batchSize = minExpiredBatchSize + + if s.gc.gcCfg.expiredCollectorBatchSize > batchSize { + batchSize = s.gc.gcCfg.expiredCollectorBatchSize + } + + if s.gc.gcCfg.expiredCollectorWorkersCount > workersCount { + workersCount = s.gc.gcCfg.expiredCollectorWorkersCount + } + return +} + func (s *Shard) collectExpiredObjects(ctx context.Context, e Event) { - expired, err := s.getExpiredObjects(ctx, e.(newEpoch).epoch, func(typ object.Type) bool { - return typ != object.TypeTombstone && typ != object.TypeLock - }) - if err != nil || len(expired) == 0 { + workersCount, batchSize := s.getExpiredObjectsParameters() + + errGroup, egCtx := errgroup.WithContext(ctx) + errGroup.SetLimit(workersCount) + + errGroup.Go(func() error { + batch := make([]oid.Address, 0, batchSize) + err := s.getExpiredObjects(egCtx, e.(newEpoch).epoch, func(o *meta.ExpiredObject) { + if o.Type() != object.TypeTombstone && o.Type() != object.TypeLock { + batch = append(batch, o.Address()) + + if len(batch) == batchSize { + expired := batch + errGroup.Go(func() error { + s.handleExpiredObjects(egCtx, expired) + return egCtx.Err() + }) + batch = make([]oid.Address, 0, batchSize) + } + } + }) if err != nil { - s.log.Warn("iterator over expired objects failed", zap.String("error", err.Error())) + return err } + + if len(batch) > 0 { + expired := batch + errGroup.Go(func() error { + s.handleExpiredObjects(egCtx, expired) + return egCtx.Err() + }) + } + + return nil + }) + + if err := errGroup.Wait(); err != nil { + s.log.Warn("iterator over expired objects failed", zap.String("error", err.Error())) + } +} + +func (s *Shard) handleExpiredObjects(ctx context.Context, expired []oid.Address) { + select { + case <-ctx.Done(): return + default: } s.m.RLock() @@ -343,44 +409,69 @@ func (s *Shard) collectExpiredTombstones(ctx context.Context, e Event) { } func (s *Shard) collectExpiredLocks(ctx context.Context, e Event) { - expired, err := s.getExpiredObjects(ctx, e.(newEpoch).epoch, func(typ object.Type) bool { - return typ == object.TypeLock - }) - if err != nil || len(expired) == 0 { - if err != nil { - s.log.Warn("iterator over expired locks failed", zap.String("error", err.Error())) - } - return - } + workersCount, batchSize := s.getExpiredObjectsParameters() - s.expiredLocksCallback(ctx, expired) + errGroup, egCtx := errgroup.WithContext(ctx) + errGroup.SetLimit(workersCount) + + errGroup.Go(func() error { + batch := make([]oid.Address, 0, batchSize) + + err := s.getExpiredObjects(egCtx, e.(newEpoch).epoch, func(o *meta.ExpiredObject) { + if o.Type() == object.TypeLock { + batch = append(batch, o.Address()) + + if len(batch) == batchSize { + expired := batch + errGroup.Go(func() error { + s.expiredLocksCallback(egCtx, expired) + return egCtx.Err() + }) + batch = make([]oid.Address, 0, batchSize) + } + } + }) + if err != nil { + return err + } + + if len(batch) > 0 { + expired := batch + errGroup.Go(func() error { + s.expiredLocksCallback(egCtx, expired) + return egCtx.Err() + }) + } + + return nil + }) + + if err := errGroup.Wait(); err != nil { + s.log.Warn("iterator over expired locks failed", zap.String("error", err.Error())) + } } -func (s *Shard) getExpiredObjects(ctx context.Context, epoch uint64, typeCond func(object.Type) bool) ([]oid.Address, error) { +func (s *Shard) getExpiredObjects(ctx context.Context, epoch uint64, onExpiredFound func(*meta.ExpiredObject)) error { s.m.RLock() defer s.m.RUnlock() if s.info.Mode.NoMetabase() { - return nil, ErrDegradedMode + return ErrDegradedMode } - var expired []oid.Address - err := s.metaBase.IterateExpired(epoch, func(expiredObject *meta.ExpiredObject) error { select { case <-ctx.Done(): return meta.ErrInterruptIterator default: - if typeCond(expiredObject.Type()) { - expired = append(expired, expiredObject.Address()) - } + onExpiredFound(expiredObject) return nil } }) if err != nil { - return nil, err + return err } - return expired, ctx.Err() + return ctx.Err() } // HandleExpiredTombstones marks tombstones themselves as garbage diff --git a/pkg/local_object_storage/shard/shard.go b/pkg/local_object_storage/shard/shard.go index a0fd077c..dd74dad3 100644 --- a/pkg/local_object_storage/shard/shard.go +++ b/pkg/local_object_storage/shard/shard.go @@ -305,6 +305,22 @@ func WithReportErrorFunc(f func(selfID string, message string, err error)) Optio } } +// WithExpiredCollectorBatchSize returns option to set batch size +// of expired object collection operation. +func WithExpiredCollectorBatchSize(size int) Option { + return func(c *cfg) { + c.gcCfg.expiredCollectorBatchSize = size + } +} + +// WithExpiredCollectorWorkersCount returns option to set concurrent +// workers count of expired object collection operation. +func WithExpiredCollectorWorkersCount(count int) Option { + return func(c *cfg) { + c.gcCfg.expiredCollectorWorkersCount = count + } +} + func (s *Shard) fillInfo() { s.cfg.info.MetaBaseInfo = s.metaBase.DumpInfo() s.cfg.info.BlobStorInfo = s.blobStor.DumpInfo() -- 2.45.2 From 7a31988a36e4150214980f2f8a0fe7ce97454e02 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Tue, 21 Mar 2023 09:50:19 +0300 Subject: [PATCH 47/70] [#145] docs: Add expired object collector params Signed-off-by: Dmitrii Stepanov --- docs/storage-node-configuration.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/storage-node-configuration.md b/docs/storage-node-configuration.md index 16737ab9..6ecd1590 100644 --- a/docs/storage-node-configuration.md +++ b/docs/storage-node-configuration.md @@ -232,12 +232,16 @@ Contains garbage-collection service configuration. It iterates over the blobstor gc: remover_batch_size: 200 remover_sleep_interval: 5m + expired_collector_batch_size: 500 + expired_collector_workers_count: 5 ``` -| Parameter | Type | Default value | Description | -|--------------------------|------------|---------------|----------------------------------------------| -| `remover_batch_size` | `int` | `100` | Amount of objects to grab in a single batch. | -| `remover_sleep_interval` | `duration` | `1m` | Time to sleep between iterations. | +| Parameter | Type | Default value | Description | +|-----------------------------------|------------|---------------|----------------------------------------------------------| +| `remover_batch_size` | `int` | `100` | Amount of objects to grab in a single batch. | +| `remover_sleep_interval` | `duration` | `1m` | Time to sleep between iterations. | +| `expired_collector_batch_size` | `int` | `500` | Max amount of expired objects to grab in a single batch. | +| `expired_collector_workers_count` | `int` | `5` | Max amount of concurrent expired objects workers. | ### `metabase` subsection -- 2.45.2 From 9a4f40626cbfdbd00a77125ac57a9c4a8bef4797 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Mon, 20 Mar 2023 19:58:11 +0300 Subject: [PATCH 48/70] [#128] IR: Do not try to emit GAS to nobody Fix sending GAS to an empty extra wallets receivers list. Also, send GAS to extra wallets even if netmap is empty. Signed-off-by: Pavel Karpy --- .../processors/alphabet/process_emit.go | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkg/innerring/processors/alphabet/process_emit.go b/pkg/innerring/processors/alphabet/process_emit.go index 867d9622..10dcf079 100644 --- a/pkg/innerring/processors/alphabet/process_emit.go +++ b/pkg/innerring/processors/alphabet/process_emit.go @@ -50,15 +50,18 @@ func (ap *Processor) processEmit() { } nmNodes := networkMap.Nodes() + nmLen := len(nmNodes) + extraLen := len(ap.parsedWallets) - ln := len(nmNodes) - if ln == 0 { - ap.log.Debug("empty network map, do not emit gas") + ap.log.Debug("gas emission", + zap.Int("network_map", nmLen), + zap.Int("extra_wallets", extraLen)) + if nmLen+extraLen == 0 { return } - gasPerNode := fixedn.Fixed8(ap.storageEmission / uint64(ln+len(ap.parsedWallets))) + gasPerNode := fixedn.Fixed8(ap.storageEmission / uint64(nmLen+extraLen)) for i := range nmNodes { keyBytes := nmNodes[i].PublicKey() @@ -81,16 +84,18 @@ func (ap *Processor) processEmit() { } } - err = ap.morphClient.BatchTransferGas(ap.parsedWallets, gasPerNode) - if err != nil { - receiversLog := make([]string, len(ap.parsedWallets)) - for i, addr := range ap.parsedWallets { - receiversLog[i] = addr.StringLE() + if extraLen != 0 { + err = ap.morphClient.BatchTransferGas(ap.parsedWallets, gasPerNode) + if err != nil { + receiversLog := make([]string, extraLen) + for i, addr := range ap.parsedWallets { + receiversLog[i] = addr.StringLE() + } + ap.log.Warn("can't transfer gas to wallet", + zap.Strings("receivers", receiversLog), + zap.Int64("amount", int64(gasPerNode)), + zap.String("error", err.Error()), + ) } - ap.log.Warn("can't transfer gas to wallet", - zap.Strings("receivers", receiversLog), - zap.Int64("amount", int64(gasPerNode)), - zap.String("error", err.Error()), - ) } } -- 2.45.2 From 9aeea0b974f4c5e065ed31e74d6c813e6e2dfcac Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Tue, 21 Mar 2023 11:54:22 +0300 Subject: [PATCH 49/70] [#153] ci: Minor pipeline fixes - We can skip full pre-commit run - On a very slow agent golangci run may take up to 10 minutes Signed-off-by: Stanislav Bogatyrev --- .golangci.yml | 2 +- .woodpecker/full-pre-commit.yml | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .woodpecker/full-pre-commit.yml diff --git a/.golangci.yml b/.golangci.yml index ac77301b..fae355a3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,7 +4,7 @@ # options for analysis running run: # timeout for analysis, e.g. 30s, 5m, default is 1m - timeout: 5m + timeout: 10m # include test files or not, default is true tests: false diff --git a/.woodpecker/full-pre-commit.yml b/.woodpecker/full-pre-commit.yml deleted file mode 100644 index 4aa62c1c..00000000 --- a/.woodpecker/full-pre-commit.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - # Kludge for non-root containers under WoodPecker - fix-ownership: - image: alpine:latest - commands: chown -R 1234:1234 . - - full-pre-commit: - image: git.frostfs.info/truecloudlab/frostfs-ci:v0.36 - commands: - - export HOME="$(getent passwd $(id -u) | cut '-d:' -f6)" - - pre-commit run -a -- 2.45.2 From 7eb9e88f8fe881aabb4cfa279e9fb112bc9e3979 Mon Sep 17 00:00:00 2001 From: Liza Date: Tue, 21 Mar 2023 15:09:22 +0300 Subject: [PATCH 50/70] Add bug label; Delte label addition Signed-off-by: Liza --- .github/ISSUE_TEMPLATE/bug_report.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f1653e3f..141d86e8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,7 +2,7 @@ name: Bug report about: Create a report to help us improve title: '' -labels: community, triage +labels: community, triage, bug assignees: '' --- @@ -40,11 +40,4 @@ assignees: '' * Version used: * Server setup and configuration: -* Operating System and version (`uname -a`): - -## Don't forget to add labels! -- component label (`frostfs-adm`, `frostfs-storage`, ...) -- `goodfirstissue`, `helpwanted` if needed -- does this issue belong to an epic? -- priority (`P0`-`P4`) if already triaged -- quarter label (`202XQY`) if possible +* Operating System and version (`uname -a`): \ No newline at end of file -- 2.45.2 From ec2c5d45b4dd45faf8ce191037ec1e59eeeaf6e9 Mon Sep 17 00:00:00 2001 From: Liza Date: Tue, 21 Mar 2023 15:32:30 +0300 Subject: [PATCH 51/70] Add to Possible Solutions Signed-off-by: Liza --- .github/ISSUE_TEMPLATE/bug_report.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 141d86e8..fb169997 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -18,8 +18,11 @@ assignees: '' If suggesting a change/improvement, explain the difference from current behavior --> ## Possible Solution - + ## Steps to Reproduce (for bugs) * Version used: * Server setup and configuration: -* Operating System and version (`uname -a`): \ No newline at end of file +* Operating System and version (`uname -a`): -- 2.45.2 From 47e8c5bf23eedfc688828a3b874cb861ee4c6adb Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 21 Mar 2023 15:43:12 +0300 Subject: [PATCH 52/70] [#156] pilorama: Remove CIDDescriptor from TreeApply() Initially it was there to check whether an update is being initiated by a proper node. It is now obsolete for 2 reasons: 1. Background synchronization fetches all operations from a single node. 2. There are a lot more problems with trust in the tree service, it is only used in controlled environments. Signed-off-by: Evgenii Stratonikov --- pkg/local_object_storage/engine/tree.go | 8 +-- pkg/local_object_storage/pilorama/boltdb.go | 18 +++--- pkg/local_object_storage/pilorama/forest.go | 9 +-- .../pilorama/forest_test.go | 61 +++++++------------ .../pilorama/interface.go | 2 +- pkg/local_object_storage/shard/tree.go | 4 +- pkg/services/tree/replicator.go | 4 +- pkg/services/tree/service.go | 6 +- pkg/services/tree/sync.go | 35 ++++------- 9 files changed, 57 insertions(+), 90 deletions(-) diff --git a/pkg/local_object_storage/engine/tree.go b/pkg/local_object_storage/engine/tree.go index 0d6f49ee..b69ab489 100644 --- a/pkg/local_object_storage/engine/tree.go +++ b/pkg/local_object_storage/engine/tree.go @@ -51,17 +51,17 @@ func (e *StorageEngine) TreeAddByPath(d pilorama.CIDDescriptor, treeID string, a } // TreeApply implements the pilorama.Forest interface. -func (e *StorageEngine) TreeApply(d pilorama.CIDDescriptor, treeID string, m *pilorama.Move, backgroundSync bool) error { - index, lst, err := e.getTreeShard(d.CID, treeID) +func (e *StorageEngine) TreeApply(cnr cidSDK.ID, treeID string, m *pilorama.Move, backgroundSync bool) error { + index, lst, err := e.getTreeShard(cnr, treeID) if err != nil && !errors.Is(err, pilorama.ErrTreeNotFound) { return err } - err = lst[index].TreeApply(d, treeID, m, backgroundSync) + err = lst[index].TreeApply(cnr, treeID, m, backgroundSync) if err != nil { if !errors.Is(err, shard.ErrReadOnlyMode) && err != shard.ErrPiloramaDisabled { e.reportShardError(lst[index], "can't perform `TreeApply`", err, - zap.Stringer("cid", d.CID), + zap.Stringer("cid", cnr), zap.String("tree", treeID)) } return err diff --git a/pkg/local_object_storage/pilorama/boltdb.go b/pkg/local_object_storage/pilorama/boltdb.go index b47fa16e..42dde860 100644 --- a/pkg/local_object_storage/pilorama/boltdb.go +++ b/pkg/local_object_storage/pilorama/boltdb.go @@ -327,11 +327,7 @@ func (t *boltForest) findSpareID(bTree *bbolt.Bucket) uint64 { } // TreeApply implements the Forest interface. -func (t *boltForest) TreeApply(d CIDDescriptor, treeID string, m *Move, backgroundSync bool) error { - if !d.checkValid() { - return ErrInvalidCIDDescriptor - } - +func (t *boltForest) TreeApply(cnr cidSDK.ID, treeID string, m *Move, backgroundSync bool) error { t.modeMtx.RLock() defer t.modeMtx.RUnlock() @@ -344,7 +340,7 @@ func (t *boltForest) TreeApply(d CIDDescriptor, treeID string, m *Move, backgrou if backgroundSync { var seen bool err := t.db.View(func(tx *bbolt.Tx) error { - treeRoot := tx.Bucket(bucketName(d.CID, treeID)) + treeRoot := tx.Bucket(bucketName(cnr, treeID)) if treeRoot == nil { return nil } @@ -362,7 +358,7 @@ func (t *boltForest) TreeApply(d CIDDescriptor, treeID string, m *Move, backgrou } if t.db.MaxBatchSize == 1 { - fullID := bucketName(d.CID, treeID) + fullID := bucketName(cnr, treeID) return t.db.Update(func(tx *bbolt.Tx) error { bLog, bTree, err := t.getTreeBuckets(tx, fullID) if err != nil { @@ -375,11 +371,11 @@ func (t *boltForest) TreeApply(d CIDDescriptor, treeID string, m *Move, backgrou } ch := make(chan error, 1) - t.addBatch(d, treeID, m, ch) + t.addBatch(cnr, treeID, m, ch) return <-ch } -func (t *boltForest) addBatch(d CIDDescriptor, treeID string, m *Move, ch chan error) { +func (t *boltForest) addBatch(cnr cidSDK.ID, treeID string, m *Move, ch chan error) { t.mtx.Lock() for i := 0; i < len(t.batches); i++ { t.batches[i].mtx.Lock() @@ -391,7 +387,7 @@ func (t *boltForest) addBatch(d CIDDescriptor, treeID string, m *Move, ch chan e continue } - found := t.batches[i].cid.Equals(d.CID) && t.batches[i].treeID == treeID + found := t.batches[i].cid.Equals(cnr) && t.batches[i].treeID == treeID if found { t.batches[i].results = append(t.batches[i].results, ch) t.batches[i].operations = append(t.batches[i].operations, m) @@ -412,7 +408,7 @@ func (t *boltForest) addBatch(d CIDDescriptor, treeID string, m *Move, ch chan e } b := &batch{ forest: t, - cid: d.CID, + cid: cnr, treeID: treeID, results: []chan<- error{ch}, operations: []*Move{m}, diff --git a/pkg/local_object_storage/pilorama/forest.go b/pkg/local_object_storage/pilorama/forest.go index 743096c8..21209420 100644 --- a/pkg/local_object_storage/pilorama/forest.go +++ b/pkg/local_object_storage/pilorama/forest.go @@ -5,6 +5,7 @@ import ( "strings" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) @@ -93,12 +94,8 @@ func (f *memoryForest) TreeAddByPath(d CIDDescriptor, treeID string, attr string } // TreeApply implements the Forest interface. -func (f *memoryForest) TreeApply(d CIDDescriptor, treeID string, op *Move, _ bool) error { - if !d.checkValid() { - return ErrInvalidCIDDescriptor - } - - fullID := d.CID.String() + "/" + treeID +func (f *memoryForest) TreeApply(cnr cid.ID, treeID string, op *Move, _ bool) error { + fullID := cnr.String() + "/" + treeID s, ok := f.treeMap[fullID] if !ok { s = newState() diff --git a/pkg/local_object_storage/pilorama/forest_test.go b/pkg/local_object_storage/pilorama/forest_test.go index 9fe372b3..8e6f1271 100644 --- a/pkg/local_object_storage/pilorama/forest_test.go +++ b/pkg/local_object_storage/pilorama/forest_test.go @@ -411,21 +411,10 @@ func TestForest_Apply(t *testing.T) { func testForestTreeApply(t *testing.T, constructor func(t testing.TB, _ ...Option) Forest) { cid := cidtest.ID() - d := CIDDescriptor{cid, 0, 1} treeID := "version" - t.Run("invalid descriptor", func(t *testing.T) { - s := constructor(t) - err := s.TreeApply(CIDDescriptor{cid, 0, 0}, treeID, &Move{ - Child: 10, - Parent: 0, - Meta: Meta{Time: 1, Items: []KeyValue{{"grand", []byte{1}}}}, - }, false) - require.ErrorIs(t, err, ErrInvalidCIDDescriptor) - }) - testApply := func(t *testing.T, s Forest, child, parent Node, meta Meta) { - require.NoError(t, s.TreeApply(d, treeID, &Move{ + require.NoError(t, s.TreeApply(cid, treeID, &Move{ Child: child, Parent: parent, Meta: meta, @@ -465,7 +454,6 @@ func TestForest_GetOpLog(t *testing.T) { func testForestTreeGetOpLog(t *testing.T, constructor func(t testing.TB, _ ...Option) Forest) { cid := cidtest.ID() - d := CIDDescriptor{cid, 0, 1} treeID := "version" logs := []Move{ { @@ -491,7 +479,7 @@ func testForestTreeGetOpLog(t *testing.T, constructor func(t testing.TB, _ ...Op }) for i := range logs { - require.NoError(t, s.TreeApply(d, treeID, &logs[i], false)) + require.NoError(t, s.TreeApply(cid, treeID, &logs[i], false)) } testGetOpLog := func(t *testing.T, height uint64, m Move) { @@ -533,13 +521,12 @@ func testForestTreeExists(t *testing.T, constructor func(t testing.TB, opts ...O cid := cidtest.ID() treeID := "version" - d := CIDDescriptor{cid, 0, 1} t.Run("empty state, no panic", func(t *testing.T) { checkExists(t, false, cid, treeID) }) - require.NoError(t, s.TreeApply(d, treeID, &Move{Parent: 0, Child: 1}, false)) + require.NoError(t, s.TreeApply(cid, treeID, &Move{Parent: 0, Child: 1}, false)) checkExists(t, true, cid, treeID) checkExists(t, false, cidtest.ID(), treeID) // different CID, same tree checkExists(t, false, cid, "another tree") // same CID, different tree @@ -570,16 +557,16 @@ func TestApplyTricky1(t *testing.T) { } treeID := "version" - d := CIDDescriptor{CID: cidtest.ID(), Position: 0, Size: 1} + cid := cidtest.ID() for i := range providers { t.Run(providers[i].name, func(t *testing.T) { s := providers[i].construct(t) for i := range ops { - require.NoError(t, s.TreeApply(d, treeID, &ops[i], false)) + require.NoError(t, s.TreeApply(cid, treeID, &ops[i], false)) } for i := range expected { - _, parent, err := s.TreeGetMeta(d.CID, treeID, expected[i].child) + _, parent, err := s.TreeGetMeta(cid, treeID, expected[i].child) require.NoError(t, err) require.Equal(t, expected[i].parent, parent) } @@ -631,16 +618,16 @@ func TestApplyTricky2(t *testing.T) { } treeID := "version" - d := CIDDescriptor{CID: cidtest.ID(), Position: 0, Size: 1} + cid := cidtest.ID() for i := range providers { t.Run(providers[i].name, func(t *testing.T) { s := providers[i].construct(t) for i := range ops { - require.NoError(t, s.TreeApply(d, treeID, &ops[i], false)) + require.NoError(t, s.TreeApply(cid, treeID, &ops[i], false)) } for i := range expected { - _, parent, err := s.TreeGetMeta(d.CID, treeID, expected[i].child) + _, parent, err := s.TreeGetMeta(cid, treeID, expected[i].child) require.NoError(t, err) require.Equal(t, expected[i].parent, parent) } @@ -746,12 +733,11 @@ func testForestTreeParallelApply(t *testing.T, constructor func(t testing.TB, _ ops := prepareRandomTree(nodeCount, opCount) cid := cidtest.ID() - d := CIDDescriptor{cid, 0, 1} treeID := "version" expected := constructor(t) for i := range ops { - require.NoError(t, expected.TreeApply(d, treeID, &ops[i], false)) + require.NoError(t, expected.TreeApply(cid, treeID, &ops[i], false)) } for i := 0; i < iterCount; i++ { @@ -766,7 +752,7 @@ func testForestTreeParallelApply(t *testing.T, constructor func(t testing.TB, _ go func() { defer wg.Done() for op := range ch { - require.NoError(t, actual.TreeApply(d, treeID, op, false)) + require.NoError(t, actual.TreeApply(cid, treeID, op, false)) } }() } @@ -792,12 +778,11 @@ func testForestTreeApplyRandom(t *testing.T, constructor func(t testing.TB, _ .. ops := prepareRandomTree(nodeCount, opCount) cid := cidtest.ID() - d := CIDDescriptor{cid, 0, 1} treeID := "version" expected := constructor(t) for i := range ops { - require.NoError(t, expected.TreeApply(d, treeID, &ops[i], false)) + require.NoError(t, expected.TreeApply(cid, treeID, &ops[i], false)) } const iterCount = 200 @@ -807,7 +792,7 @@ func testForestTreeApplyRandom(t *testing.T, constructor func(t testing.TB, _ .. actual := constructor(t) for i := range ops { - require.NoError(t, actual.TreeApply(d, treeID, &ops[i], false)) + require.NoError(t, actual.TreeApply(cid, treeID, &ops[i], false)) } compareForests(t, expected, actual, cid, treeID, nodeCount) } @@ -889,7 +874,6 @@ func benchmarkApply(b *testing.B, s Forest, genFunc func(int) []Move) { ops := genFunc(b.N) cid := cidtest.ID() - d := CIDDescriptor{cid, 0, 1} treeID := "version" ch := make(chan int, b.N) for i := 0; i < b.N; i++ { @@ -901,7 +885,7 @@ func benchmarkApply(b *testing.B, s Forest, genFunc func(int) []Move) { b.SetParallelism(10) b.RunParallel(func(pb *testing.PB) { for pb.Next() { - if err := s.TreeApply(d, treeID, &ops[<-ch], false); err != nil { + if err := s.TreeApply(cid, treeID, &ops[<-ch], false); err != nil { b.Fatalf("error in `Apply`: %v", err) } } @@ -918,7 +902,6 @@ func TestTreeGetByPath(t *testing.T) { func testTreeGetByPath(t *testing.T, s Forest) { cid := cidtest.ID() - d := CIDDescriptor{cid, 0, 1} treeID := "version" // / @@ -928,12 +911,12 @@ func testTreeGetByPath(t *testing.T, s Forest) { // |- cat1.jpg, Version=XXX (4) // |- cat1.jpg, Version=YYY (5) // |- cat2.jpg, Version=ZZZ (6) - testMove(t, s, 0, 1, 0, d, treeID, "a", "") - testMove(t, s, 1, 2, 0, d, treeID, "b", "") - testMove(t, s, 2, 3, 1, d, treeID, "cat1.jpg", "TTT") - testMove(t, s, 3, 4, 2, d, treeID, "cat1.jpg", "XXX") - testMove(t, s, 4, 5, 2, d, treeID, "cat1.jpg", "YYY") - testMove(t, s, 5, 6, 2, d, treeID, "cat2.jpg", "ZZZ") + testMove(t, s, 0, 1, 0, cid, treeID, "a", "") + testMove(t, s, 1, 2, 0, cid, treeID, "b", "") + testMove(t, s, 2, 3, 1, cid, treeID, "cat1.jpg", "TTT") + testMove(t, s, 3, 4, 2, cid, treeID, "cat1.jpg", "XXX") + testMove(t, s, 4, 5, 2, cid, treeID, "cat1.jpg", "YYY") + testMove(t, s, 5, 6, 2, cid, treeID, "cat2.jpg", "ZZZ") if mf, ok := s.(*memoryForest); ok { single := mf.treeMap[cid.String()+"/"+treeID] @@ -970,14 +953,14 @@ func testTreeGetByPath(t *testing.T, s Forest) { }) } -func testMove(t *testing.T, s Forest, ts int, node, parent Node, d CIDDescriptor, treeID, filename, version string) { +func testMove(t *testing.T, s Forest, ts int, node, parent Node, cid cidSDK.ID, treeID, filename, version string) { items := make([]KeyValue, 1, 2) items[0] = KeyValue{AttributeFilename, []byte(filename)} if version != "" { items = append(items, KeyValue{AttributeVersion, []byte(version)}) } - require.NoError(t, s.TreeApply(d, treeID, &Move{ + require.NoError(t, s.TreeApply(cid, treeID, &Move{ Parent: parent, Child: node, Meta: Meta{ diff --git a/pkg/local_object_storage/pilorama/interface.go b/pkg/local_object_storage/pilorama/interface.go index c2143de2..290f633a 100644 --- a/pkg/local_object_storage/pilorama/interface.go +++ b/pkg/local_object_storage/pilorama/interface.go @@ -18,7 +18,7 @@ type Forest interface { TreeAddByPath(d CIDDescriptor, treeID string, attr string, path []string, meta []KeyValue) ([]Move, error) // TreeApply applies replicated operation from another node. // If background is true, TreeApply will first check whether an operation exists. - TreeApply(d CIDDescriptor, treeID string, m *Move, backgroundSync bool) error + TreeApply(cnr cidSDK.ID, treeID string, m *Move, backgroundSync bool) error // TreeGetByPath returns all nodes corresponding to the path. // The path is constructed by descending from the root using the values of the // AttributeFilename in meta. diff --git a/pkg/local_object_storage/shard/tree.go b/pkg/local_object_storage/shard/tree.go index b9f90999..684c92e6 100644 --- a/pkg/local_object_storage/shard/tree.go +++ b/pkg/local_object_storage/shard/tree.go @@ -42,7 +42,7 @@ func (s *Shard) TreeAddByPath(d pilorama.CIDDescriptor, treeID string, attr stri } // TreeApply implements the pilorama.Forest interface. -func (s *Shard) TreeApply(d pilorama.CIDDescriptor, treeID string, m *pilorama.Move, backgroundSync bool) error { +func (s *Shard) TreeApply(cnr cidSDK.ID, treeID string, m *pilorama.Move, backgroundSync bool) error { if s.pilorama == nil { return ErrPiloramaDisabled } @@ -53,7 +53,7 @@ func (s *Shard) TreeApply(d pilorama.CIDDescriptor, treeID string, m *pilorama.M if s.info.Mode.ReadOnly() { return ErrReadOnlyMode } - return s.pilorama.TreeApply(d, treeID, m, backgroundSync) + return s.pilorama.TreeApply(cnr, treeID, m, backgroundSync) } // TreeGetByPath implements the pilorama.Forest interface. diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go index 01bd2deb..8a118028 100644 --- a/pkg/services/tree/replicator.go +++ b/pkg/services/tree/replicator.go @@ -27,7 +27,7 @@ type replicationTask struct { type applyOp struct { treeID string - pilorama.CIDDescriptor + cid cidSDK.ID pilorama.Move } @@ -43,7 +43,7 @@ func (s *Service) localReplicationWorker() { case <-s.closeCh: return case op := <-s.replicateLocalCh: - err := s.forest.TreeApply(op.CIDDescriptor, op.treeID, &op.Move, false) + err := s.forest.TreeApply(op.cid, op.treeID, &op.Move, false) if err != nil { s.log.Error("failed to apply replicated operation", zap.String("err", err.Error())) diff --git a/pkg/services/tree/service.go b/pkg/services/tree/service.go index 3176858e..edea450f 100644 --- a/pkg/services/tree/service.go +++ b/pkg/services/tree/service.go @@ -468,7 +468,7 @@ func (s *Service) Apply(_ context.Context, req *ApplyRequest) (*ApplyResponse, e key := req.GetSignature().GetKey() - _, pos, size, err := s.getContainerInfo(cid, key) + _, pos, _, err := s.getContainerInfo(cid, key) if err != nil { return nil, err } @@ -485,8 +485,8 @@ func (s *Service) Apply(_ context.Context, req *ApplyRequest) (*ApplyResponse, e select { case s.replicateLocalCh <- applyOp{ - treeID: req.GetBody().GetTreeId(), - CIDDescriptor: pilorama.CIDDescriptor{CID: cid, Position: pos, Size: size}, + treeID: req.GetBody().GetTreeId(), + cid: cid, Move: pilorama.Move{ Parent: op.GetParentId(), Child: op.GetChildId(), diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index abd683b7..9fe24fed 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -14,6 +14,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/panjf2000/ants/v2" "go.uber.org/zap" @@ -40,11 +41,6 @@ func (s *Service) synchronizeAllTrees(ctx context.Context, cid cid.ID) error { return ErrNotInContainer } - var d pilorama.CIDDescriptor - d.CID = cid - d.Position = pos - d.Size = len(nodes) - nodes = randomizeNodeOrder(nodes, pos) if len(nodes) == 0 { return nil @@ -87,18 +83,18 @@ func (s *Service) synchronizeAllTrees(ctx context.Context, cid cid.ID) error { } for _, tid := range treesToSync { - h, err := s.forest.TreeLastSyncHeight(d.CID, tid) + h, err := s.forest.TreeLastSyncHeight(cid, tid) if err != nil && !errors.Is(err, pilorama.ErrTreeNotFound) { s.log.Warn("could not get last synchronized height for a tree", - zap.Stringer("cid", d.CID), + zap.Stringer("cid", cid), zap.String("tree", tid)) continue } - newHeight := s.synchronizeTree(ctx, d, h, tid, nodes) + newHeight := s.synchronizeTree(ctx, cid, h, tid, nodes) if h < newHeight { - if err := s.forest.TreeUpdateLastSyncHeight(d.CID, tid, newHeight); err != nil { + if err := s.forest.TreeUpdateLastSyncHeight(cid, tid, newHeight); err != nil { s.log.Warn("could not update last synchronized height for a tree", - zap.Stringer("cid", d.CID), + zap.Stringer("cid", cid), zap.String("tree", tid)) } } @@ -118,24 +114,19 @@ func (s *Service) SynchronizeTree(ctx context.Context, cid cid.ID, treeID string return ErrNotInContainer } - var d pilorama.CIDDescriptor - d.CID = cid - d.Position = pos - d.Size = len(nodes) - nodes = randomizeNodeOrder(nodes, pos) if len(nodes) == 0 { return nil } - s.synchronizeTree(ctx, d, 0, treeID, nodes) + s.synchronizeTree(ctx, cid, 0, treeID, nodes) return nil } -func (s *Service) synchronizeTree(ctx context.Context, d pilorama.CIDDescriptor, from uint64, +func (s *Service) synchronizeTree(ctx context.Context, cid cidSDK.ID, from uint64, treeID string, nodes []netmapSDK.NodeInfo) uint64 { s.log.Debug("synchronize tree", - zap.Stringer("cid", d.CID), + zap.Stringer("cid", cid), zap.String("tree", treeID), zap.Uint64("from", from)) @@ -157,7 +148,7 @@ func (s *Service) synchronizeTree(ctx context.Context, d pilorama.CIDDescriptor, treeClient := NewTreeServiceClient(cc) for { - h, err := s.synchronizeSingle(ctx, d, treeID, height, treeClient) + h, err := s.synchronizeSingle(ctx, cid, treeID, height, treeClient) if height < h { height = h } @@ -179,9 +170,9 @@ func (s *Service) synchronizeTree(ctx context.Context, d pilorama.CIDDescriptor, return newHeight } -func (s *Service) synchronizeSingle(ctx context.Context, d pilorama.CIDDescriptor, treeID string, height uint64, treeClient TreeServiceClient) (uint64, error) { +func (s *Service) synchronizeSingle(ctx context.Context, cid cidSDK.ID, treeID string, height uint64, treeClient TreeServiceClient) (uint64, error) { rawCID := make([]byte, sha256.Size) - d.CID.Encode(rawCID) + cid.Encode(rawCID) for { newHeight := height @@ -211,7 +202,7 @@ func (s *Service) synchronizeSingle(ctx context.Context, d pilorama.CIDDescripto if err := m.Meta.FromBytes(lm.Meta); err != nil { return newHeight, err } - if err := s.forest.TreeApply(d, treeID, m, true); err != nil { + if err := s.forest.TreeApply(cid, treeID, m, true); err != nil { return newHeight, err } if m.Time > newHeight { -- 2.45.2 From 5368c4207a710919bb8fea902a6c632baa8ca431 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 21 Mar 2023 16:51:21 +0300 Subject: [PATCH 53/70] [#156] services/tree: Split syncLoop() in functions Signed-off-by: Evgenii Stratonikov --- pkg/services/tree/sync.go | 158 ++++++++++++++++++++------------------ 1 file changed, 85 insertions(+), 73 deletions(-) diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index 9fe24fed..d4ef7df5 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -246,7 +246,6 @@ func (s *Service) SynchronizeAll() error { } } -// nolint: funlen, gocognit func (s *Service) syncLoop(ctx context.Context) { for { select { @@ -263,86 +262,99 @@ func (s *Service) syncLoop(ctx context.Context) { continue } - newMap := make(map[cid.ID]struct{}, len(s.cnrMap)) - cnrsToSync := make([]cid.ID, 0, len(cnrs)) + newMap, cnrsToSync := s.containersToSync(cnrs) - var removed []cid.ID - for _, cnr := range cnrs { - _, pos, err := s.getContainerNodes(cnr) - if err != nil { - s.log.Error("could not calculate container nodes", - zap.Stringer("cid", cnr), - zap.Error(err)) - continue - } + s.syncContainers(ctx, cnrsToSync) - if pos < 0 { - // node is not included in the container. - continue - } - - newMap[cnr] = struct{}{} - cnrsToSync = append(cnrsToSync, cnr) - } - - // sync new containers - var wg sync.WaitGroup - for _, cnr := range cnrsToSync { - wg.Add(1) - cnr := cnr - err := s.syncPool.Submit(func() { - defer wg.Done() - s.log.Debug("syncing container trees...", zap.Stringer("cid", cnr)) - - err := s.synchronizeAllTrees(ctx, cnr) - if err != nil { - s.log.Error("could not sync trees", zap.Stringer("cid", cnr), zap.Error(err)) - return - } - - s.log.Debug("container trees have been synced", zap.Stringer("cid", cnr)) - }) - if err != nil { - wg.Done() - s.log.Error("could not query trees for synchronization", - zap.Stringer("cid", cnr), - zap.Error(err)) - if errors.Is(err, ants.ErrPoolClosed) { - return - } - } - } - wg.Wait() - - s.cnrMapMtx.Lock() - for cnr := range s.cnrMap { - if _, ok := newMap[cnr]; ok { - continue - } - removed = append(removed, cnr) - } - for i := range removed { - delete(s.cnrMap, removed[i]) - } - s.cnrMapMtx.Unlock() - - for _, cnr := range removed { - s.log.Debug("removing redundant trees...", zap.Stringer("cid", cnr)) - - err = s.DropTree(ctx, cnr, "") - if err != nil { - s.log.Error("could not remove redundant tree", - zap.Stringer("cid", cnr), - zap.Error(err)) - continue - } - } + s.removeContainers(ctx, newMap) s.log.Debug("trees have been synchronized") } } } +func (s *Service) syncContainers(ctx context.Context, cnrs []cid.ID) { + // sync new containers + var wg sync.WaitGroup + for _, cnr := range cnrs { + wg.Add(1) + cnr := cnr + err := s.syncPool.Submit(func() { + defer wg.Done() + s.log.Debug("syncing container trees...", zap.Stringer("cid", cnr)) + + err := s.synchronizeAllTrees(ctx, cnr) + if err != nil { + s.log.Error("could not sync trees", zap.Stringer("cid", cnr), zap.Error(err)) + return + } + + s.log.Debug("container trees have been synced", zap.Stringer("cid", cnr)) + }) + if err != nil { + wg.Done() + s.log.Error("could not query trees for synchronization", + zap.Stringer("cid", cnr), + zap.Error(err)) + if errors.Is(err, ants.ErrPoolClosed) { + return + } + } + } + wg.Wait() +} + +func (s *Service) removeContainers(ctx context.Context, newContainers map[cid.ID]struct{}) { + s.cnrMapMtx.Lock() + defer s.cnrMapMtx.Unlock() + + var removed []cid.ID + for cnr := range s.cnrMap { + if _, ok := newContainers[cnr]; ok { + continue + } + removed = append(removed, cnr) + } + for i := range removed { + delete(s.cnrMap, removed[i]) + } + + for _, cnr := range removed { + s.log.Debug("removing redundant trees...", zap.Stringer("cid", cnr)) + + err := s.DropTree(ctx, cnr, "") + if err != nil { + s.log.Error("could not remove redundant tree", + zap.Stringer("cid", cnr), + zap.Error(err)) + } + } +} + +func (s *Service) containersToSync(cnrs []cid.ID) (map[cid.ID]struct{}, []cid.ID) { + newMap := make(map[cid.ID]struct{}, len(s.cnrMap)) + cnrsToSync := make([]cid.ID, 0, len(cnrs)) + + for _, cnr := range cnrs { + _, pos, err := s.getContainerNodes(cnr) + if err != nil { + s.log.Error("could not calculate container nodes", + zap.Stringer("cid", cnr), + zap.Error(err)) + continue + } + + if pos < 0 { + // node is not included in the container. + continue + } + + newMap[cnr] = struct{}{} + cnrsToSync = append(cnrsToSync, cnr) + } + return newMap, cnrsToSync +} + // randomizeNodeOrder shuffles nodes and removes not a `pos` index. // It is assumed that 0 <= pos < len(nodes). func randomizeNodeOrder(cnrNodes []netmap.NodeInfo, pos int) []netmap.NodeInfo { -- 2.45.2 From 3f6b96234904debb46759b18e04e6adf2683c7fe Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 21 Mar 2023 16:58:49 +0300 Subject: [PATCH 54/70] [#156] services/tree: Pass context to replicationWorker() Signed-off-by: Evgenii Stratonikov --- pkg/services/tree/replicator.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go index 8a118028..bb20310b 100644 --- a/pkg/services/tree/replicator.go +++ b/pkg/services/tree/replicator.go @@ -52,7 +52,7 @@ func (s *Service) localReplicationWorker() { } } -func (s *Service) replicationWorker() { +func (s *Service) replicationWorker(ctx context.Context) { for { select { case <-s.closeCh: @@ -64,13 +64,13 @@ func (s *Service) replicationWorker() { task.n.IterateNetworkEndpoints(func(addr string) bool { lastAddr = addr - c, err := s.cache.get(context.Background(), addr) + c, err := s.cache.get(ctx, addr) if err != nil { lastErr = fmt.Errorf("can't create client: %w", err) return false } - ctx, cancel := context.WithTimeout(context.Background(), s.replicatorTimeout) + ctx, cancel := context.WithTimeout(ctx, s.replicatorTimeout) _, lastErr = c.Apply(ctx, task.req) cancel() @@ -94,8 +94,7 @@ func (s *Service) replicationWorker() { func (s *Service) replicateLoop(ctx context.Context) { for i := 0; i < s.replicatorWorkerCount; i++ { - //nolint: contextcheck - go s.replicationWorker() + go s.replicationWorker(ctx) go s.localReplicationWorker() } defer func() { -- 2.45.2 From fb13902db9ba2515d7f71bb234a04e877357c254 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 21 Mar 2023 17:06:46 +0300 Subject: [PATCH 55/70] [#156] shard: Make refillMetabase() pass linter checks Signed-off-by: Evgenii Stratonikov --- pkg/local_object_storage/shard/control.go | 99 +++++++++++++---------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/pkg/local_object_storage/shard/control.go b/pkg/local_object_storage/shard/control.go index acf038d7..5aa7fbd3 100644 --- a/pkg/local_object_storage/shard/control.go +++ b/pkg/local_object_storage/shard/control.go @@ -155,7 +155,6 @@ func (s *Shard) Init() error { return nil } -// nolint: funlen func (s *Shard) refillMetabase() error { err := s.metaBase.Reset() if err != nil { @@ -172,57 +171,23 @@ func (s *Shard) refillMetabase() error { return nil } - // nolint: exhaustive + var err error switch obj.Type() { case objectSDK.TypeTombstone: - tombstone := objectSDK.NewTombstone() - - if err := tombstone.Unmarshal(obj.Payload()); err != nil { - return fmt.Errorf("could not unmarshal tombstone content: %w", err) - } - - tombAddr := object.AddressOf(obj) - memberIDs := tombstone.Members() - tombMembers := make([]oid.Address, 0, len(memberIDs)) - - for i := range memberIDs { - a := tombAddr - a.SetObject(memberIDs[i]) - - tombMembers = append(tombMembers, a) - } - - var inhumePrm meta.InhumePrm - - inhumePrm.SetTombstoneAddress(tombAddr) - inhumePrm.SetAddresses(tombMembers...) - - _, err = s.metaBase.Inhume(inhumePrm) - if err != nil { - return fmt.Errorf("could not inhume objects: %w", err) - } + err = s.refillTombstoneObject(obj) case objectSDK.TypeLock: - var lock objectSDK.Lock - if err := lock.Unmarshal(obj.Payload()); err != nil { - return fmt.Errorf("could not unmarshal lock content: %w", err) - } - - locked := make([]oid.ID, lock.NumberOfMembers()) - lock.ReadMembers(locked) - - cnr, _ := obj.ContainerID() - id, _ := obj.ID() - err = s.metaBase.Lock(cnr, id, locked) - if err != nil { - return fmt.Errorf("could not lock objects: %w", err) - } + err = s.refillLockObject(obj) + default: + } + if err != nil { + return err } var mPrm meta.PutPrm mPrm.SetObject(obj) mPrm.SetStorageID(descriptor) - _, err := s.metaBase.Put(mPrm) + _, err = s.metaBase.Put(mPrm) if err != nil && !meta.IsErrRemoved(err) && !errors.Is(err, meta.ErrObjectIsExpired) { return err } @@ -241,6 +206,54 @@ func (s *Shard) refillMetabase() error { return nil } +func (s *Shard) refillLockObject(obj *objectSDK.Object) error { + var lock objectSDK.Lock + if err := lock.Unmarshal(obj.Payload()); err != nil { + return fmt.Errorf("could not unmarshal lock content: %w", err) + } + + locked := make([]oid.ID, lock.NumberOfMembers()) + lock.ReadMembers(locked) + + cnr, _ := obj.ContainerID() + id, _ := obj.ID() + err := s.metaBase.Lock(cnr, id, locked) + if err != nil { + return fmt.Errorf("could not lock objects: %w", err) + } + return nil +} + +func (s *Shard) refillTombstoneObject(obj *objectSDK.Object) error { + tombstone := objectSDK.NewTombstone() + + if err := tombstone.Unmarshal(obj.Payload()); err != nil { + return fmt.Errorf("could not unmarshal tombstone content: %w", err) + } + + tombAddr := object.AddressOf(obj) + memberIDs := tombstone.Members() + tombMembers := make([]oid.Address, 0, len(memberIDs)) + + for i := range memberIDs { + a := tombAddr + a.SetObject(memberIDs[i]) + + tombMembers = append(tombMembers, a) + } + + var inhumePrm meta.InhumePrm + + inhumePrm.SetTombstoneAddress(tombAddr) + inhumePrm.SetAddresses(tombMembers...) + + _, err := s.metaBase.Inhume(inhumePrm) + if err != nil { + return fmt.Errorf("could not inhume objects: %w", err) + } + return nil +} + // Close releases all Shard's components. func (s *Shard) Close() error { components := []interface{ Close() error }{} -- 2.45.2 From 8014fdb21ac09e9b5db978b4073b3bb3412cf796 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 21 Mar 2023 17:11:04 +0300 Subject: [PATCH 56/70] [#156] metabase: Make freePotentialLocks() pass linter checks Signed-off-by: Evgenii Stratonikov --- pkg/local_object_storage/metabase/lock.go | 76 +++++++++++------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/pkg/local_object_storage/metabase/lock.go b/pkg/local_object_storage/metabase/lock.go index 65f9e669..2e6bed93 100644 --- a/pkg/local_object_storage/metabase/lock.go +++ b/pkg/local_object_storage/metabase/lock.go @@ -138,57 +138,57 @@ func objectLocked(tx *bbolt.Tx, idCnr cid.ID, idObj oid.ID) bool { // Operation is very resource-intensive, which is caused by the admissibility // of multiple locks. Also, if we knew what objects are locked, it would be // possible to speed up the execution. -// -// nolint: gocognit func freePotentialLocks(tx *bbolt.Tx, idCnr cid.ID, locker oid.ID) error { bucketLocked := tx.Bucket(bucketNameLocked) - if bucketLocked != nil { - key := make([]byte, cidSize) - idCnr.Encode(key) + if bucketLocked == nil { + return nil + } - bucketLockedContainer := bucketLocked.Bucket(key) - if bucketLockedContainer != nil { - keyLocker := objectKey(locker, key) - return bucketLockedContainer.ForEach(func(k, v []byte) error { - keyLockers, err := decodeList(v) - if err != nil { - return fmt.Errorf("decode list of lockers in locked bucket: %w", err) - } + key := make([]byte, cidSize) + idCnr.Encode(key) - for i := range keyLockers { - if bytes.Equal(keyLockers[i], keyLocker) { - if len(keyLockers) == 1 { - // locker was all alone - err = bucketLockedContainer.Delete(k) - if err != nil { - return fmt.Errorf("delete locked object record from locked bucket: %w", err) - } - } else { - // exclude locker - keyLockers = append(keyLockers[:i], keyLockers[i+1:]...) + bucketLockedContainer := bucketLocked.Bucket(key) + if bucketLockedContainer == nil { + return nil + } - v, err = encodeList(keyLockers) - if err != nil { - return fmt.Errorf("encode updated list of lockers: %w", err) - } + keyLocker := objectKey(locker, key) + return bucketLockedContainer.ForEach(func(k, v []byte) error { + keyLockers, err := decodeList(v) + if err != nil { + return fmt.Errorf("decode list of lockers in locked bucket: %w", err) + } - // update the record - err = bucketLockedContainer.Put(k, v) - if err != nil { - return fmt.Errorf("update list of lockers: %w", err) - } - } + for i := range keyLockers { + if bytes.Equal(keyLockers[i], keyLocker) { + if len(keyLockers) == 1 { + // locker was all alone + err = bucketLockedContainer.Delete(k) + if err != nil { + return fmt.Errorf("delete locked object record from locked bucket: %w", err) + } + } else { + // exclude locker + keyLockers = append(keyLockers[:i], keyLockers[i+1:]...) - return nil + v, err = encodeList(keyLockers) + if err != nil { + return fmt.Errorf("encode updated list of lockers: %w", err) + } + + // update the record + err = bucketLockedContainer.Put(k, v) + if err != nil { + return fmt.Errorf("update list of lockers: %w", err) } } return nil - }) + } } - } - return nil + return nil + }) } // IsLockedPrm groups the parameters of IsLocked operation. -- 2.45.2 From 484ac502cade34b981759127c91c7e5248c9773c Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 21 Mar 2023 17:36:14 +0300 Subject: [PATCH 57/70] [#156] frostfs-adm: Make dumpBalances() pass linter checks Signed-off-by: Evgenii Stratonikov --- .../internal/modules/morph/balance.go | 151 ++++++++++-------- 1 file changed, 87 insertions(+), 64 deletions(-) diff --git a/cmd/frostfs-adm/internal/modules/morph/balance.go b/cmd/frostfs-adm/internal/modules/morph/balance.go index ca9d939f..f97250c3 100644 --- a/cmd/frostfs-adm/internal/modules/morph/balance.go +++ b/cmd/frostfs-adm/internal/modules/morph/balance.go @@ -44,7 +44,6 @@ const ( notaryEnabled = true ) -// nolint: funlen, gocognit func dumpBalances(cmd *cobra.Command, _ []string) error { var ( dumpStorage, _ = cmd.Flags().GetBool(dumpBalancesStorageFlag) @@ -84,86 +83,110 @@ func dumpBalances(cmd *cobra.Command, _ []string) error { printBalances(cmd, "Inner ring nodes balances:", irList) if dumpStorage { - arr, err := unwrap.Array(inv.Call(nmHash, "netmap")) - if err != nil { - return errors.New("can't fetch the list of storage nodes") - } - - snList := make([]accBalancePair, len(arr)) - for i := range arr { - node, ok := arr[i].Value().([]stackitem.Item) - if !ok || len(node) == 0 { - return errors.New("can't parse the list of storage nodes") - } - bs, err := node[0].TryBytes() - if err != nil { - return errors.New("can't parse the list of storage nodes") - } - var ni netmap.NodeInfo - if err := ni.Unmarshal(bs); err != nil { - return fmt.Errorf("can't parse the list of storage nodes: %w", err) - } - pub, err := keys.NewPublicKeyFromBytes(ni.PublicKey(), elliptic.P256()) - if err != nil { - return fmt.Errorf("can't parse storage node public key: %w", err) - } - snList[i].scriptHash = pub.GetScriptHash() - } - - if err := fetchBalances(inv, gas.Hash, snList); err != nil { + if err := printStorageNodeBalances(cmd, inv, nmHash); err != nil { return err } - printBalances(cmd, "\nStorage node balances:", snList) } if dumpProxy { - h, err := nnsResolveHash(inv, nnsCs.Hash, proxyContract+".frostfs") - if err != nil { - return fmt.Errorf("can't get hash of the proxy contract: %w", err) - } - - proxyList := []accBalancePair{{scriptHash: h}} - if err := fetchBalances(inv, gas.Hash, proxyList); err != nil { + if err := printProxyContractBalance(cmd, inv, nnsCs.Hash); err != nil { return err } - printBalances(cmd, "\nProxy contract balance:", proxyList) } if dumpAlphabet { - alphaList := make([]accBalancePair, len(irList)) - - w := io.NewBufBinWriter() - for i := range alphaList { - emit.AppCall(w.BinWriter, nnsCs.Hash, "resolve", callflag.ReadOnly, - getAlphabetNNSDomain(i), - int64(nns.TXT)) - } - if w.Err != nil { - panic(w.Err) - } - - alphaRes, err := c.InvokeScript(w.Bytes(), nil) - if err != nil { - return fmt.Errorf("can't fetch info from NNS: %w", err) - } - - for i := range alphaList { - h, err := parseNNSResolveResult(alphaRes.Stack[i]) - if err != nil { - return fmt.Errorf("can't fetch the alphabet contract #%d hash: %w", i, err) - } - alphaList[i].scriptHash = h - } - - if err := fetchBalances(inv, gas.Hash, alphaList); err != nil { + if err := printAlphabetContractBalances(cmd, c, inv, len(irList), nnsCs.Hash); err != nil { return err } - printBalances(cmd, "\nAlphabet contracts balances:", alphaList) } return nil } +func printStorageNodeBalances(cmd *cobra.Command, inv *invoker.Invoker, nmHash util.Uint160) error { + arr, err := unwrap.Array(inv.Call(nmHash, "netmap")) + if err != nil { + return errors.New("can't fetch the list of storage nodes") + } + + snList := make([]accBalancePair, len(arr)) + for i := range arr { + node, ok := arr[i].Value().([]stackitem.Item) + if !ok || len(node) == 0 { + return errors.New("can't parse the list of storage nodes") + } + bs, err := node[0].TryBytes() + if err != nil { + return errors.New("can't parse the list of storage nodes") + } + var ni netmap.NodeInfo + if err := ni.Unmarshal(bs); err != nil { + return fmt.Errorf("can't parse the list of storage nodes: %w", err) + } + pub, err := keys.NewPublicKeyFromBytes(ni.PublicKey(), elliptic.P256()) + if err != nil { + return fmt.Errorf("can't parse storage node public key: %w", err) + } + snList[i].scriptHash = pub.GetScriptHash() + } + + if err := fetchBalances(inv, gas.Hash, snList); err != nil { + return err + } + + printBalances(cmd, "\nStorage node balances:", snList) + return nil +} + +func printProxyContractBalance(cmd *cobra.Command, inv *invoker.Invoker, nnsHash util.Uint160) error { + h, err := nnsResolveHash(inv, nnsHash, proxyContract+".frostfs") + if err != nil { + return fmt.Errorf("can't get hash of the proxy contract: %w", err) + } + + proxyList := []accBalancePair{{scriptHash: h}} + if err := fetchBalances(inv, gas.Hash, proxyList); err != nil { + return err + } + + printBalances(cmd, "\nProxy contract balance:", proxyList) + return nil +} + +func printAlphabetContractBalances(cmd *cobra.Command, c Client, inv *invoker.Invoker, count int, nnsHash util.Uint160) error { + alphaList := make([]accBalancePair, count) + + w := io.NewBufBinWriter() + for i := range alphaList { + emit.AppCall(w.BinWriter, nnsHash, "resolve", callflag.ReadOnly, + getAlphabetNNSDomain(i), + int64(nns.TXT)) + } + if w.Err != nil { + panic(w.Err) + } + + alphaRes, err := c.InvokeScript(w.Bytes(), nil) + if err != nil { + return fmt.Errorf("can't fetch info from NNS: %w", err) + } + + for i := range alphaList { + h, err := parseNNSResolveResult(alphaRes.Stack[i]) + if err != nil { + return fmt.Errorf("can't fetch the alphabet contract #%d hash: %w", i, err) + } + alphaList[i].scriptHash = h + } + + if err := fetchBalances(inv, gas.Hash, alphaList); err != nil { + return err + } + + printBalances(cmd, "\nAlphabet contracts balances:", alphaList) + return nil +} + func fetchIRNodes(c Client, nmHash, desigHash util.Uint160) ([]accBalancePair, error) { var irList []accBalancePair -- 2.45.2 From cbc2efb1d62e57e35e0c8a804d5c61cbcdd6c772 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 21 Mar 2023 17:53:09 +0300 Subject: [PATCH 58/70] [#156] object/get: Make toHeadPrm() pass gocognit Signed-off-by: Evgenii Stratonikov --- pkg/services/object/get/v2/util.go | 264 +++++++++++++++-------------- 1 file changed, 133 insertions(+), 131 deletions(-) diff --git a/pkg/services/object/get/v2/util.go b/pkg/services/object/get/v2/util.go index e35cece3..a871714a 100644 --- a/pkg/services/object/get/v2/util.go +++ b/pkg/services/object/get/v2/util.go @@ -426,7 +426,7 @@ func (w *headResponseWriter) WriteHeader(_ context.Context, hdr *object.Object) return nil } -// nolint: funlen, gocognit +// nolint: funlen func (s *Service) toHeadPrm(ctx context.Context, req *objectV2.HeadRequest, resp *objectV2.HeadResponse) (*getsvc.HeadPrm, error) { body := req.GetBody() @@ -459,138 +459,140 @@ func (s *Service) toHeadPrm(ctx context.Context, req *objectV2.HeadRequest, resp body: resp.GetBody(), }) - if !commonPrm.LocalOnly() { - var onceResign sync.Once - - p.SetRequestForwarder(groupAddressRequestForwarder(func(addr network.Address, c client.MultiAddressClient, pubkey []byte) (*object.Object, error) { - var err error - - key, err := s.keyStorage.GetKey(nil) - if err != nil { - return nil, err - } - - // once compose and resign forwarding request - onceResign.Do(func() { - // compose meta header of the local server - metaHdr := new(session.RequestMetaHeader) - metaHdr.SetTTL(meta.GetTTL() - 1) - // TODO: #1165 think how to set the other fields - metaHdr.SetOrigin(meta) - writeCurrentVersion(metaHdr) - - req.SetMetaHeader(metaHdr) - - err = signature.SignServiceMessage(key, req) - }) - - if err != nil { - return nil, err - } - - // code below is copy-pasted from c.GetObjectHeader implementation, - // perhaps it is worth highlighting the utility function in frostfs-api-go - - // send Head request - var headResp *objectV2.HeadResponse - err = c.RawForAddress(addr, func(cli *rpcclient.Client) error { - headResp, err = rpc.HeadObject(cli, req, rpcclient.WithContext(ctx)) - return err - }) - if err != nil { - return nil, fmt.Errorf("sending the request failed: %w", err) - } - - // verify response key - if err = internal.VerifyResponseKeyV2(pubkey, headResp); err != nil { - return nil, err - } - - // verify response structure - if err := signature.VerifyServiceMessage(headResp); err != nil { - return nil, fmt.Errorf("response verification failed: %w", err) - } - - if err = checkStatus(resp.GetMetaHeader().GetStatus()); err != nil { - return nil, err - } - - var ( - hdr *objectV2.Header - idSig *refs.Signature - ) - - switch v := headResp.GetBody().GetHeaderPart().(type) { - case nil: - return nil, fmt.Errorf("unexpected header type %T", v) - case *objectV2.ShortHeader: - if !body.GetMainOnly() { - return nil, fmt.Errorf("wrong header part type: expected %T, received %T", - (*objectV2.ShortHeader)(nil), (*objectV2.HeaderWithSignature)(nil), - ) - } - - h := v - - hdr = new(objectV2.Header) - hdr.SetPayloadLength(h.GetPayloadLength()) - hdr.SetVersion(h.GetVersion()) - hdr.SetOwnerID(h.GetOwnerID()) - hdr.SetObjectType(h.GetObjectType()) - hdr.SetCreationEpoch(h.GetCreationEpoch()) - hdr.SetPayloadHash(h.GetPayloadHash()) - hdr.SetHomomorphicHash(h.GetHomomorphicHash()) - case *objectV2.HeaderWithSignature: - if body.GetMainOnly() { - return nil, fmt.Errorf("wrong header part type: expected %T, received %T", - (*objectV2.HeaderWithSignature)(nil), (*objectV2.ShortHeader)(nil), - ) - } - - hdrWithSig := v - if hdrWithSig == nil { - return nil, errors.New("nil object part") - } - - hdr = hdrWithSig.GetHeader() - idSig = hdrWithSig.GetSignature() - - if idSig == nil { - // TODO(@cthulhu-rider): #1387 use "const" error - return nil, errors.New("missing signature") - } - - binID, err := objAddr.Object().Marshal() - if err != nil { - return nil, fmt.Errorf("marshal ID: %w", err) - } - - var sig frostfscrypto.Signature - if err := sig.ReadFromV2(*idSig); err != nil { - return nil, fmt.Errorf("can't read signature: %w", err) - } - - if !sig.Verify(binID) { - return nil, errors.New("invalid object ID signature") - } - case *objectV2.SplitInfo: - si := object.NewSplitInfoFromV2(v) - - return nil, object.NewSplitInfoError(si) - } - - objv2 := new(objectV2.Object) - objv2.SetHeader(hdr) - objv2.SetSignature(idSig) - - obj := object.NewFromV2(objv2) - obj.SetID(objAddr.Object()) - - // convert the object - return obj, nil - })) + if commonPrm.LocalOnly() { + return p, nil } + var onceResign sync.Once + + p.SetRequestForwarder(groupAddressRequestForwarder(func(addr network.Address, c client.MultiAddressClient, pubkey []byte) (*object.Object, error) { + var err error + + key, err := s.keyStorage.GetKey(nil) + if err != nil { + return nil, err + } + + // once compose and resign forwarding request + onceResign.Do(func() { + // compose meta header of the local server + metaHdr := new(session.RequestMetaHeader) + metaHdr.SetTTL(meta.GetTTL() - 1) + // TODO: #1165 think how to set the other fields + metaHdr.SetOrigin(meta) + writeCurrentVersion(metaHdr) + + req.SetMetaHeader(metaHdr) + + err = signature.SignServiceMessage(key, req) + }) + + if err != nil { + return nil, err + } + + // code below is copy-pasted from c.GetObjectHeader implementation, + // perhaps it is worth highlighting the utility function in frostfs-api-go + + // send Head request + var headResp *objectV2.HeadResponse + err = c.RawForAddress(addr, func(cli *rpcclient.Client) error { + headResp, err = rpc.HeadObject(cli, req, rpcclient.WithContext(ctx)) + return err + }) + if err != nil { + return nil, fmt.Errorf("sending the request failed: %w", err) + } + + // verify response key + if err = internal.VerifyResponseKeyV2(pubkey, headResp); err != nil { + return nil, err + } + + // verify response structure + if err := signature.VerifyServiceMessage(headResp); err != nil { + return nil, fmt.Errorf("response verification failed: %w", err) + } + + if err = checkStatus(resp.GetMetaHeader().GetStatus()); err != nil { + return nil, err + } + + var ( + hdr *objectV2.Header + idSig *refs.Signature + ) + + switch v := headResp.GetBody().GetHeaderPart().(type) { + case nil: + return nil, fmt.Errorf("unexpected header type %T", v) + case *objectV2.ShortHeader: + if !body.GetMainOnly() { + return nil, fmt.Errorf("wrong header part type: expected %T, received %T", + (*objectV2.ShortHeader)(nil), (*objectV2.HeaderWithSignature)(nil), + ) + } + + h := v + + hdr = new(objectV2.Header) + hdr.SetPayloadLength(h.GetPayloadLength()) + hdr.SetVersion(h.GetVersion()) + hdr.SetOwnerID(h.GetOwnerID()) + hdr.SetObjectType(h.GetObjectType()) + hdr.SetCreationEpoch(h.GetCreationEpoch()) + hdr.SetPayloadHash(h.GetPayloadHash()) + hdr.SetHomomorphicHash(h.GetHomomorphicHash()) + case *objectV2.HeaderWithSignature: + if body.GetMainOnly() { + return nil, fmt.Errorf("wrong header part type: expected %T, received %T", + (*objectV2.HeaderWithSignature)(nil), (*objectV2.ShortHeader)(nil), + ) + } + + hdrWithSig := v + if hdrWithSig == nil { + return nil, errors.New("nil object part") + } + + hdr = hdrWithSig.GetHeader() + idSig = hdrWithSig.GetSignature() + + if idSig == nil { + // TODO(@cthulhu-rider): #1387 use "const" error + return nil, errors.New("missing signature") + } + + binID, err := objAddr.Object().Marshal() + if err != nil { + return nil, fmt.Errorf("marshal ID: %w", err) + } + + var sig frostfscrypto.Signature + if err := sig.ReadFromV2(*idSig); err != nil { + return nil, fmt.Errorf("can't read signature: %w", err) + } + + if !sig.Verify(binID) { + return nil, errors.New("invalid object ID signature") + } + case *objectV2.SplitInfo: + si := object.NewSplitInfoFromV2(v) + + return nil, object.NewSplitInfoError(si) + } + + objv2 := new(objectV2.Object) + objv2.SetHeader(hdr) + objv2.SetSignature(idSig) + + obj := object.NewFromV2(objv2) + obj.SetID(objAddr.Object()) + + // convert the object + return obj, nil + })) + return p, nil } -- 2.45.2 From 1637a3edcea9a59f7fba3d9d0e970461e51daa2e Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Tue, 21 Mar 2023 15:39:33 +0300 Subject: [PATCH 59/70] [#155] search-service: Add search with ST test In case of session token (ST) with object IDs search should return only objects allowed in static session Signed-off-by: Dmitrii Stepanov --- pkg/services/object/search/search_test.go | 130 ++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/pkg/services/object/search/search_test.go b/pkg/services/object/search/search_test.go index bb3d422b..aacfb950 100644 --- a/pkg/services/object/search/search_test.go +++ b/pkg/services/object/search/search_test.go @@ -9,6 +9,7 @@ import ( "strconv" "testing" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" clientcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" netmapcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" @@ -18,8 +19,12 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + sessionsdk "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "github.com/google/uuid" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) @@ -425,3 +430,128 @@ func TestGetFromPastEpoch(t *testing.T) { require.NoError(t, err) assertContains(ids11, ids12, ids21, ids22) } + +func TestGetWithSessionToken(t *testing.T) { + ctx := context.Background() + + placementDim := []int{2} + + rs := make([]netmap.ReplicaDescriptor, len(placementDim)) + for i := range placementDim { + rs[i].SetNumberOfObjects(uint32(placementDim[i])) + } + + var pp netmap.PlacementPolicy + pp.AddReplicas(rs...) + + var cnr container.Container + cnr.SetPlacementPolicy(pp) + + var id cid.ID + container.CalculateID(&id, cnr) + + var addr oid.Address + addr.SetContainer(id) + + ns, as := testNodeMatrix(t, placementDim) + + builder := &testPlacementBuilder{ + vectors: map[string][][]netmap.NodeInfo{ + addr.EncodeToString(): ns, + }, + } + + localStorage := newTestStorage() + localIDs := generateIDs(10) + localStorage.addResult(id, localIDs, nil) + + c1 := newTestStorage() + ids1 := generateIDs(10) + c1.addResult(id, ids1, nil) + + c2 := newTestStorage() + ids2 := generateIDs(10) + c2.addResult(id, ids2, nil) + + w := new(simpleIDWriter) + + svc := &Service{cfg: new(cfg)} + svc.log = test.NewLogger(false) + svc.localStorage = localStorage + + const curEpoch = 13 + + svc.traverserGenerator = &testTraverserGenerator{ + c: cnr, + b: map[uint64]placement.Builder{ + curEpoch: builder, + }, + } + svc.clientConstructor = &testClientCache{ + clients: map[string]*testStorage{ + as[0][0]: c1, + as[0][1]: c2, + }, + } + + svc.currentEpochReceiver = testEpochReceiver(curEpoch) + + metaStub := &metaStub{ + TTL: 5, + LimitByObjectIDs: append(append(localIDs[:5], ids1[:5]...), ids2[:5]...), + T: t, + Exp: 20, + ContainerID: id, + } + + p := Prm{} + p.WithContainerID(id) + p.SetWriter(w) + var err error + p.common, err = util.CommonPrmFromV2(metaStub) + require.NoError(t, err) + + err = svc.Search(ctx, p) + require.NoError(t, err) + require.Len(t, w.ids, 15) + + for _, id := range metaStub.LimitByObjectIDs { + require.Contains(t, w.ids, id) + } +} + +type metaStub struct { + TTL uint32 + Exp uint64 + LimitByObjectIDs []oid.ID + T *testing.T + ContainerID cid.ID +} + +func (m *metaStub) GetMetaHeader() *session.RequestMetaHeader { + var result session.RequestMetaHeader + result.SetTTL(m.TTL) + + tokenObj := new(sessionsdk.Object) + tokenObj.ForVerb(sessionsdk.VerbObjectSearch) + tokenObj.LimitByObjects(m.LimitByObjectIDs...) + tokenObj.SetID(uuid.New()) + tokenObj.SetExp(m.Exp) + tokenObj.BindContainer(m.ContainerID) + + pubKey := &frostfsecdsa.PublicKey{} + + tokenObj.SetAuthKey(pubKey) + + priv, err := keys.NewPrivateKey() + require.NoError(m.T, err) + + require.NoError(m.T, tokenObj.Sign(priv.PrivateKey)) + + var token session.Token + tokenObj.WriteToV2(&token) + + result.SetSessionToken(&token) + + return &result +} -- 2.45.2 From 49234b915eae083a6a9042e63881627df0c874a3 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Tue, 21 Mar 2023 15:41:58 +0300 Subject: [PATCH 60/70] [#155] search-service: Fix search with ST Search should return only objects allowed in static session Signed-off-by: Dmitrii Stepanov --- pkg/services/object/search/exec.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkg/services/object/search/exec.go b/pkg/services/object/search/exec.go index a1737b52..8cc9a9a2 100644 --- a/pkg/services/object/search/exec.go +++ b/pkg/services/object/search/exec.go @@ -119,6 +119,7 @@ func (exec *execCtx) generateTraverser(cnr cid.ID) (*placement.Traverser, bool) } func (exec *execCtx) writeIDList(ids []oid.ID) { + ids = exec.filterAllowedObjectIDs(ids) err := exec.prm.writer.WriteIDs(ids) switch { @@ -134,3 +135,17 @@ func (exec *execCtx) writeIDList(ids []oid.ID) { exec.err = nil } } + +func (exec *execCtx) filterAllowedObjectIDs(objIDs []oid.ID) []oid.ID { + sessionToken := exec.prm.common.SessionToken() + if sessionToken == nil { + return objIDs + } + result := make([]oid.ID, 0, len(objIDs)) + for _, objID := range objIDs { + if sessionToken.AssertObject(objID) { + result = append(result, objID) + } + } + return result +} -- 2.45.2 From da8da1c63ad581203f27d44f5006a2b1f9caebf0 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Tue, 21 Mar 2023 21:31:48 +0300 Subject: [PATCH 61/70] [#98] fstree: Do not fail iteration over just removed files A directory is read and files are saved to a local variable. The iteration over such files may lead to a non-existing files reading due to a normal SN operation cycle and, therefore, may lead to a returning the OS error to a caller. Skip just removed (or lost) files as the golang std library does in similar situations: https://github.com/golang/go/blob/5f1a0320b92a60ee1283522135e00bff540ea115/src/os/dir_unix.go#L128-L133. Signed-off-by: Pavel Karpy --- CHANGELOG.md | 1 + pkg/local_object_storage/blobstor/fstree/fstree.go | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfc4eaf4..f1ba8aaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ Changelog for FrostFS Node - Actually use `object.put.pool_size_local` and independent pool for local puts (#64). - Pretty printer of basic ACL in the NeoFS CLI (#2259) - Adding of public key for nns group `group.frostfs` at init step (#130) +- Iterating over just removed files by FSTree (#98) ### Removed ### Updated diff --git a/pkg/local_object_storage/blobstor/fstree/fstree.go b/pkg/local_object_storage/blobstor/fstree/fstree.go index 3265e68f..1a124700 100644 --- a/pkg/local_object_storage/blobstor/fstree/fstree.go +++ b/pkg/local_object_storage/blobstor/fstree/fstree.go @@ -135,13 +135,16 @@ func (t *FSTree) iterate(depth uint64, curPath []string, prm common.IteratePrm) continue } + data, err := os.ReadFile(filepath.Join(curPath...)) + if err != nil && os.IsNotExist(err) { + continue + } + if prm.LazyHandler != nil { err = prm.LazyHandler(addr, func() ([]byte, error) { - return os.ReadFile(filepath.Join(curPath...)) + return data, err }) } else { - var data []byte - data, err = os.ReadFile(filepath.Join(curPath...)) if err == nil { data, err = t.Decompress(data) } -- 2.45.2 From f111704ceb4371d0e83ab189f533680ace32f9bc Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Wed, 22 Mar 2023 09:24:22 +0300 Subject: [PATCH 62/70] [#158] Fix gitlint run in pre-commit under CI Wrong stage was used. It still may run gitlint against only latest commit in PR. Signed-off-by: Stanislav Bogatyrev --- .gitlint | 4 ++-- .pre-commit-config.yaml | 1 + .woodpecker/pre-commit.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlint b/.gitlint index 96cf3ed8..7cf8a703 100644 --- a/.gitlint +++ b/.gitlint @@ -1,6 +1,6 @@ [general] -fail-without-commits=true -regex-style-search=true +fail-without-commits=True +regex-style-search=True contrib=CC1 [title-match-regex] diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2e9744f5..b79cc1e7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,6 +7,7 @@ repos: hooks: - id: gitlint stages: [commit-msg] + - id: gitlint-ci - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.4.0 diff --git a/.woodpecker/pre-commit.yml b/.woodpecker/pre-commit.yml index debe0cba..23159404 100644 --- a/.woodpecker/pre-commit.yml +++ b/.woodpecker/pre-commit.yml @@ -8,7 +8,7 @@ pipeline: image: git.frostfs.info/truecloudlab/frostfs-ci:v0.36 commands: - export HOME="$(getent passwd $(id -u) | cut '-d:' -f6)" - - pre-commit run + - pre-commit run --hook-stage manual unit: image: git.frostfs.info/truecloudlab/frostfs-ci:v0.36 -- 2.45.2 From 342e571d89ed6d0049f2f975a0decf35af27924c Mon Sep 17 00:00:00 2001 From: Denis Kirillov Date: Mon, 6 Mar 2023 16:11:42 +0300 Subject: [PATCH 63/70] [#159] Add handle __SYSTEM__ sys attributes Signed-off-by: Denis Kirillov --- CHANGELOG.md | 4 +++ cmd/frostfs-cli/docs/storage-node-xheaders.md | 10 +++--- cmd/frostfs-cli/modules/container/list.go | 2 +- .../modules/container/list_objects.go | 2 +- go.mod | 4 +-- go.sum | 8 ++--- pkg/core/object/fmt.go | 2 +- pkg/local_object_storage/metabase/exists.go | 35 +++++++++++-------- .../metabase/iterators.go | 5 ++- .../object_manager/tombstone/checker.go | 2 +- 10 files changed, 44 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1ba8aaf..d8082adc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Changelog for FrostFS Node - `neofs-cli` buffer for object put increased from 4 KiB to 3 MiB (#2243) - Expired locked object is available for reading (#56) - Initialize write-cache asynchronously (#32) +- Update system attribute names (#159) ### Fixed - Increase payload size metric on shards' `put` operation (#1794) @@ -70,6 +71,9 @@ You need to change configuration environment variables to `FROSTFS_*` if you use New config field `object.delete.tombstone_lifetime` allows to set tombstone lifetime more appropriate for a specific deployment. +Use `__SYSTEM__` prefix for system attributes instead of `__NEOFS__` +(existed objects with old attributes will be treated as before, but for new objects new attributes will be used). + ## [0.35.0] - 2022-12-28 - Sindo (신도, 信島) ### Added diff --git a/cmd/frostfs-cli/docs/storage-node-xheaders.md b/cmd/frostfs-cli/docs/storage-node-xheaders.md index db759dcf..15bce457 100644 --- a/cmd/frostfs-cli/docs/storage-node-xheaders.md +++ b/cmd/frostfs-cli/docs/storage-node-xheaders.md @@ -9,16 +9,16 @@ duplicated header names or headers with empty values are considered invalid. ## Existing headers -There are some "well-known" headers starting with `__FROSTFS__` prefix that +There are some "well-known" headers starting with `__SYSTEM__` prefix that affect system behaviour. For backward compatibility, the same set of "well-known" headers may also use `__NEOFS__` prefix: -* `__FROSTFS__NETMAP_EPOCH` - netmap epoch to use for object placement calculation. The `value` is string +* `__SYSTEM__NETMAP_EPOCH` - netmap epoch to use for object placement calculation. The `value` is string encoded `uint64` in decimal presentation. If set to '0' or omitted, the current epoch only will be used. -* `__FROSTFS__NETMAP_LOOKUP_DEPTH` - if object can't be found using current epoch's netmap, this header limits +* `__SYSTEM__NETMAP_LOOKUP_DEPTH` - if object can't be found using current epoch's netmap, this header limits how many past epochs the node can look up through. Depth is applied to a current epoch or the value -of `__FROSTFS__NETMAP_EPOCH` attribute. The `value` is string encoded `uint64` in decimal presentation. +of `__SYSTEM__NETMAP_EPOCH` attribute. The `value` is string encoded `uint64` in decimal presentation. If set to '0' or not set, only the current epoch is used. ## `frostfs-cli` commands with `--xhdr` @@ -30,5 +30,5 @@ List of commands with support of extended headers: Example: ```shell -$ frostfs-cli object put -r s01.frostfs.devenv:8080 -w wallet.json --cid CID --file FILE --xhdr "__FROSTFS__NETMAP_EPOCH=777" +$ frostfs-cli object put -r s01.frostfs.devenv:8080 -w wallet.json --cid CID --file FILE --xhdr "__SYSTEM__NETMAP_EPOCH=777" ``` diff --git a/cmd/frostfs-cli/modules/container/list.go b/cmd/frostfs-cli/modules/container/list.go index 1dd0fe8c..9565748c 100644 --- a/cmd/frostfs-cli/modules/container/list.go +++ b/cmd/frostfs-cli/modules/container/list.go @@ -62,7 +62,7 @@ var listContainersCmd = &cobra.Command{ res, err := internalclient.GetContainer(prmGet) if err == nil { res.Container().IterateAttributes(func(key, val string) { - if !strings.HasPrefix(key, container.SysAttributePrefix) { + if !strings.HasPrefix(key, container.SysAttributePrefix) && !strings.HasPrefix(key, container.SysAttributePrefixNeoFS) { // FIXME(@cthulhu-rider): neofs-sdk-go#314 use dedicated method to skip system attributes cmd.Printf(" %s: %s\n", key, val) } diff --git a/cmd/frostfs-cli/modules/container/list_objects.go b/cmd/frostfs-cli/modules/container/list_objects.go index 35649a08..aef4a1f8 100644 --- a/cmd/frostfs-cli/modules/container/list_objects.go +++ b/cmd/frostfs-cli/modules/container/list_objects.go @@ -70,7 +70,7 @@ var listContainerObjectsCmd = &cobra.Command{ attrs := resHead.Header().Attributes() for i := range attrs { attrKey := attrs[i].Key() - if !strings.HasPrefix(attrKey, v2object.SysAttributePrefix) { + if !strings.HasPrefix(attrKey, v2object.SysAttributePrefix) && !strings.HasPrefix(attrKey, v2object.SysAttributePrefixNeoFS) { // FIXME(@cthulhu-rider): neofs-sdk-go#226 use dedicated method to skip system attributes cmd.Printf(" %s: %s\n", attrKey, attrs[i].Value()) } diff --git a/go.mod b/go.mod index bb5a53b2..e3cfab20 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module git.frostfs.info/TrueCloudLab/frostfs-node go 1.18 require ( - git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51 + git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230315095236-9dc375346703 git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb - git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599 + git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230316081442-bec77f280a85 git.frostfs.info/TrueCloudLab/hrw v1.2.0 git.frostfs.info/TrueCloudLab/tzhash v1.8.0 github.com/cheggaaa/pb v1.0.29 diff --git a/go.sum b/go.sum index 93f805d2..724d51ef 100644 --- a/go.sum +++ b/go.sum @@ -36,14 +36,14 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51 h1:l4+K1hN+NuWNtlZZoV8yRRP3Uu7PifL05ukEqKcb0Ks= -git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51/go.mod h1:n0DxKYulu2Ar73R6OcNF34LiL/Xa+iDR7GZuaOChbLE= +git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230315095236-9dc375346703 h1:lxe0DtZq/uFZVZu9apx6OcIXCJskQBMd/GVeYGKA3wA= +git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230315095236-9dc375346703/go.mod h1:gRd5iE5A84viily6AcNBsSlTx2XgoWrwRDz7z0MayDQ= git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb h1:S/TrbOOu9qEXZRZ9/Ddw7crnxbBUQLo68PSzQWYrc9M= git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb/go.mod h1:nkR5gaGeez3Zv2SE7aceP0YwxG2FzIB5cGKpQO2vV2o= git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 h1:FxqFDhQYYgpe41qsIHVOcdzSVCB8JNSfPG7Uk4r2oSk= git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0/go.mod h1:RUIKZATQLJ+TaYQa60X2fTDwfuhMfm8Ar60bQ5fr+vU= -git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599 h1:mzGX2RX8R8H/tUqrUu1TcYk4QRDBcBIWGYscPncfLOQ= -git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599/go.mod h1:z7zcpGY+puI5puyy5oyFbf20vWp84WtslCxcr6/kv5c= +git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230316081442-bec77f280a85 h1:TUcJ5A0C1gWi3bAhw4b+V+iVM3E9mbBOdJIWWkAPNxo= +git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230316081442-bec77f280a85/go.mod h1:23fUGlEv/ImaOi3vck6vZj0v0b4hteOhLLPnVWHSQeA= git.frostfs.info/TrueCloudLab/hrw v1.2.0 h1:KvAES7xIqmQBGd2q8KanNosD9+4BhU/zqD5Kt5KSflk= git.frostfs.info/TrueCloudLab/hrw v1.2.0/go.mod h1:mq2sbvYfO+BB6iFZwYBkgC0yc6mJNx+qZi4jW918m+Y= git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 h1:M2KR3iBj7WpY3hP10IevfIB9MURr4O9mwVfJ+SjT3HA= diff --git a/pkg/core/object/fmt.go b/pkg/core/object/fmt.go index 217c0466..05330635 100644 --- a/pkg/core/object/fmt.go +++ b/pkg/core/object/fmt.go @@ -353,7 +353,7 @@ func (v *FormatValidator) checkExpiration(obj *object.Object) error { func expirationEpochAttribute(obj *object.Object) (uint64, error) { for _, a := range obj.Attributes() { - if a.Key() != objectV2.SysAttributeExpEpoch { + if a.Key() != objectV2.SysAttributeExpEpoch && a.Key() != objectV2.SysAttributeExpEpochNeoFS { continue } diff --git a/pkg/local_object_storage/metabase/exists.go b/pkg/local_object_storage/metabase/exists.go index 59bd9f4f..6ad65c73 100644 --- a/pkg/local_object_storage/metabase/exists.go +++ b/pkg/local_object_storage/metabase/exists.go @@ -110,20 +110,9 @@ func objectStatus(tx *bbolt.Tx, addr oid.Address, currEpoch uint64) uint8 { // GC is expected to collect all the objects that have // expired previously for less than the one epoch duration - var expired bool - - // bucket with objects that have expiration attr - attrKey := make([]byte, bucketKeySize+len(objectV2.SysAttributeExpEpoch)) - expirationBucket := tx.Bucket(attributeBucketName(addr.Container(), objectV2.SysAttributeExpEpoch, attrKey)) - if expirationBucket != nil { - // bucket that contains objects that expire in the current epoch - prevEpochBkt := expirationBucket.Bucket([]byte(strconv.FormatUint(currEpoch-1, 10))) - if prevEpochBkt != nil { - rawOID := objectKey(addr.Object(), make([]byte, objectKeySize)) - if prevEpochBkt.Get(rawOID) != nil { - expired = true - } - } + expired := isExpiredWithAttribute(tx, objectV2.SysAttributeExpEpoch, addr, currEpoch) + if !expired { + expired = isExpiredWithAttribute(tx, objectV2.SysAttributeExpEpochNeoFS, addr, currEpoch) } if expired { @@ -136,6 +125,24 @@ func objectStatus(tx *bbolt.Tx, addr oid.Address, currEpoch uint64) uint8 { return inGraveyardWithKey(addrKey, graveyardBkt, garbageBkt) } +func isExpiredWithAttribute(tx *bbolt.Tx, attr string, addr oid.Address, currEpoch uint64) bool { + // bucket with objects that have expiration attr + attrKey := make([]byte, bucketKeySize+len(attr)) + expirationBucket := tx.Bucket(attributeBucketName(addr.Container(), attr, attrKey)) + if expirationBucket != nil { + // bucket that contains objects that expire in the current epoch + prevEpochBkt := expirationBucket.Bucket([]byte(strconv.FormatUint(currEpoch-1, 10))) + if prevEpochBkt != nil { + rawOID := objectKey(addr.Object(), make([]byte, objectKeySize)) + if prevEpochBkt.Get(rawOID) != nil { + return true + } + } + } + + return false +} + func inGraveyardWithKey(addrKey []byte, graveyard, garbageBCK *bbolt.Bucket) uint8 { if graveyard == nil { // incorrect metabase state, does not make diff --git a/pkg/local_object_storage/metabase/iterators.go b/pkg/local_object_storage/metabase/iterators.go index 9741225d..3c5888e1 100644 --- a/pkg/local_object_storage/metabase/iterators.go +++ b/pkg/local_object_storage/metabase/iterators.go @@ -60,7 +60,10 @@ func (db *DB) iterateExpired(tx *bbolt.Tx, epoch uint64, h ExpiredObjectHandler) err := tx.ForEach(func(name []byte, b *bbolt.Bucket) error { cidBytes := cidFromAttributeBucket(name, objectV2.SysAttributeExpEpoch) if cidBytes == nil { - return nil + cidBytes = cidFromAttributeBucket(name, objectV2.SysAttributeExpEpochNeoFS) + if cidBytes == nil { + return nil + } } var cnrID cid.ID diff --git a/pkg/services/object_manager/tombstone/checker.go b/pkg/services/object_manager/tombstone/checker.go index 379dad0f..4097f22b 100644 --- a/pkg/services/object_manager/tombstone/checker.go +++ b/pkg/services/object_manager/tombstone/checker.go @@ -73,7 +73,7 @@ func (g *ExpirationChecker) IsTombstoneAvailable(ctx context.Context, a oid.Addr func (g *ExpirationChecker) handleTS(addr string, ts *object.Object, reqEpoch uint64) bool { for _, atr := range ts.Attributes() { - if atr.Key() == objectV2.SysAttributeExpEpoch { + if atr.Key() == objectV2.SysAttributeExpEpoch || atr.Key() == objectV2.SysAttributeExpEpochNeoFS { epoch, err := strconv.ParseUint(atr.Value(), 10, 64) if err != nil { g.log.Warn( -- 2.45.2 From 9808dec591ac80d7dc8898d0cc9080c81b2985d1 Mon Sep 17 00:00:00 2001 From: Ayrat Arifullin Date: Mon, 20 Mar 2023 17:10:26 +0300 Subject: [PATCH 64/70] [#86] node: Move testing utils to one package Move testing utils from tests in local_object_storage package to unified testutil package Signed-off-by: Airat Arifullin --- .../blobstor/perf_test.go | 210 ++---------------- .../engine/control_test.go | 3 +- .../engine/delete_test.go | 7 +- .../engine/engine_test.go | 41 +--- pkg/local_object_storage/engine/error_test.go | 7 +- .../engine/evacuate_test.go | 5 +- pkg/local_object_storage/engine/head_test.go | 9 +- .../engine/inhume_test.go | 9 +- pkg/local_object_storage/engine/list_test.go | 3 +- pkg/local_object_storage/engine/lock_test.go | 15 +- pkg/local_object_storage/engine/tree_test.go | 5 +- .../internal/testutil/generators.go | 110 +++++++++ .../internal/testutil/generators_test.go | 70 ++++++ .../internal/testutil/object.go | 68 ++++++ .../metabase/containers_test.go | 13 +- .../metabase/control_test.go | 3 +- .../metabase/counter_test.go | 11 +- pkg/local_object_storage/metabase/db_test.go | 48 +--- .../metabase/delete_test.go | 15 +- .../metabase/exists_test.go | 23 +- pkg/local_object_storage/metabase/get_test.go | 13 +- .../metabase/graveyard_test.go | 33 +-- .../metabase/inhume_test.go | 5 +- .../metabase/iterators_test.go | 5 +- .../metabase/list_test.go | 25 ++- .../metabase/lock_test.go | 5 +- .../metabase/movable_test.go | 5 +- pkg/local_object_storage/metabase/put_test.go | 7 +- .../metabase/select_test.go | 81 +++---- .../metabase/storage_id_test.go | 5 +- pkg/local_object_storage/shard/delete_test.go | 13 +- pkg/local_object_storage/shard/dump_test.go | 7 +- pkg/local_object_storage/shard/get_test.go | 25 ++- pkg/local_object_storage/shard/head_test.go | 11 +- pkg/local_object_storage/shard/inhume_test.go | 7 +- pkg/local_object_storage/shard/list_test.go | 7 +- pkg/local_object_storage/shard/lock_test.go | 11 +- .../shard/metrics_test.go | 5 +- pkg/local_object_storage/shard/range_test.go | 7 +- pkg/local_object_storage/shard/shard_test.go | 60 ----- .../shard/shutdown_test.go | 3 +- 41 files changed, 495 insertions(+), 520 deletions(-) create mode 100644 pkg/local_object_storage/internal/testutil/generators.go create mode 100644 pkg/local_object_storage/internal/testutil/generators_test.go create mode 100644 pkg/local_object_storage/internal/testutil/object.go diff --git a/pkg/local_object_storage/blobstor/perf_test.go b/pkg/local_object_storage/blobstor/perf_test.go index 96d90266..7da4619d 100644 --- a/pkg/local_object_storage/blobstor/perf_test.go +++ b/pkg/local_object_storage/blobstor/perf_test.go @@ -1,7 +1,6 @@ package blobstor import ( - "encoding/binary" "fmt" "os" "testing" @@ -10,15 +9,8 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/memstore" - cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" - objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" - oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "github.com/stretchr/testify/require" - "go.uber.org/atomic" - "golang.org/x/exp/rand" - "golang.org/x/exp/slices" ) // The storages to benchmark. Each storage has a description and a function which returns the actual @@ -83,20 +75,20 @@ func BenchmarkSubstorageReadPerf(b *testing.B) { readTests := []struct { desc string size int - objGen func() objectGenerator - addrGen func() addressGenerator + objGen func() testutil.ObjectGenerator + addrGen func() testutil.AddressGenerator }{ { desc: "seq100", size: 10000, - objGen: func() objectGenerator { return &seqObjGenerator{objSize: 100} }, - addrGen: func() addressGenerator { return &seqAddrGenerator{maxID: 100} }, + objGen: func() testutil.ObjectGenerator { return &testutil.SeqObjGenerator{ObjSize: 100} }, + addrGen: func() testutil.AddressGenerator { return &testutil.SeqAddrGenerator{MaxID: 100} }, }, { desc: "rand100", size: 10000, - objGen: func() objectGenerator { return &seqObjGenerator{objSize: 100} }, - addrGen: func() addressGenerator { return randAddrGenerator(10000) }, + objGen: func() testutil.ObjectGenerator { return &testutil.SeqObjGenerator{ObjSize: 100} }, + addrGen: func() testutil.AddressGenerator { return testutil.RandAddrGenerator(10000) }, }, } for _, tt := range readTests { @@ -111,7 +103,7 @@ func BenchmarkSubstorageReadPerf(b *testing.B) { // Fill database for i := 0; i < tt.size; i++ { obj := objGen.Next() - addr := addressFromObject(obj) + addr := testutil.AddressFromObject(obj) raw, err := obj.Marshal() require.NoError(b, err) if _, err := st.Put(common.PutPrm{ @@ -142,14 +134,16 @@ func BenchmarkSubstorageReadPerf(b *testing.B) { func BenchmarkSubstorageWritePerf(b *testing.B) { generators := []struct { desc string - create func() objectGenerator + create func() testutil.ObjectGenerator }{ - {desc: "rand10", create: func() objectGenerator { return &randObjGenerator{objSize: 10} }}, - {desc: "rand100", create: func() objectGenerator { return &randObjGenerator{objSize: 100} }}, - {desc: "rand1000", create: func() objectGenerator { return &randObjGenerator{objSize: 1000} }}, - {desc: "overwrite10", create: func() objectGenerator { return &overwriteObjGenerator{objSize: 10, maxObjects: 100} }}, - {desc: "overwrite100", create: func() objectGenerator { return &overwriteObjGenerator{objSize: 100, maxObjects: 100} }}, - {desc: "overwrite1000", create: func() objectGenerator { return &overwriteObjGenerator{objSize: 1000, maxObjects: 100} }}, + {desc: "rand10", create: func() testutil.ObjectGenerator { return &testutil.RandObjGenerator{ObjSize: 10} }}, + {desc: "rand100", create: func() testutil.ObjectGenerator { return &testutil.RandObjGenerator{ObjSize: 100} }}, + {desc: "rand1000", create: func() testutil.ObjectGenerator { return &testutil.RandObjGenerator{ObjSize: 1000} }}, + {desc: "overwrite10", create: func() testutil.ObjectGenerator { return &testutil.OverwriteObjGenerator{ObjSize: 10, MaxObjects: 100} }}, + {desc: "overwrite100", create: func() testutil.ObjectGenerator { return &testutil.OverwriteObjGenerator{ObjSize: 100, MaxObjects: 100} }}, + {desc: "overwrite1000", create: func() testutil.ObjectGenerator { + return &testutil.OverwriteObjGenerator{ObjSize: 1000, MaxObjects: 100} + }}, } for _, genEntry := range generators { @@ -165,7 +159,7 @@ func BenchmarkSubstorageWritePerf(b *testing.B) { b.RunParallel(func(pb *testing.PB) { for pb.Next() { obj := gen.Next() - addr := addressFromObject(obj) + addr := testutil.AddressFromObject(obj) raw, err := obj.Marshal() require.NoError(b, err) if _, err := st.Put(common.PutPrm{ @@ -188,12 +182,12 @@ func BenchmarkSubstorageIteratePerf(b *testing.B) { iterateTests := []struct { desc string size int - objGen func() objectGenerator + objGen func() testutil.ObjectGenerator }{ { desc: "rand100", size: 10000, - objGen: func() objectGenerator { return &randObjGenerator{objSize: 100} }, + objGen: func() testutil.ObjectGenerator { return &testutil.RandObjGenerator{ObjSize: 100} }, }, } for _, tt := range iterateTests { @@ -208,7 +202,7 @@ func BenchmarkSubstorageIteratePerf(b *testing.B) { // Fill database for i := 0; i < tt.size; i++ { obj := objGen.Next() - addr := addressFromObject(obj) + addr := testutil.AddressFromObject(obj) raw, err := obj.Marshal() require.NoError(b, err) if _, err := st.Put(common.PutPrm{ @@ -238,165 +232,3 @@ func BenchmarkSubstorageIteratePerf(b *testing.B) { } } } - -func addressFromObject(obj *objectSDK.Object) oid.Address { - var addr oid.Address - if id, isSet := obj.ID(); isSet { - addr.SetObject(id) - } else { - panic("object ID is not set") - } - if cid, isSet := obj.ContainerID(); isSet { - addr.SetContainer(cid) - } else { - panic("container ID is not set") - } - return addr -} - -// addressGenerator is the interface of types that generate object addresses. -type addressGenerator interface { - Next() oid.Address -} - -// seqAddrGenerator is an addressGenerator that generates addresses sequentially and wraps around the given max ID. -type seqAddrGenerator struct { - cnt atomic.Uint64 - maxID uint64 -} - -func (g *seqAddrGenerator) Next() oid.Address { - var id oid.ID - binary.LittleEndian.PutUint64(id[:], ((g.cnt.Inc()-1)%g.maxID)+1) - var addr oid.Address - addr.SetContainer(cid.ID{}) - addr.SetObject(id) - return addr -} - -func TestSeqAddrGenerator(t *testing.T) { - gen := &seqAddrGenerator{maxID: 10} - for i := 1; i <= 20; i++ { - addr := gen.Next() - id := addr.Object() - - require.Equal(t, uint64((i-1)%int(gen.maxID)+1), binary.LittleEndian.Uint64(id[:])) - } -} - -// randAddrGenerator is an addressGenerator that generates random addresses in the given range. -type randAddrGenerator uint64 - -func (g randAddrGenerator) Next() oid.Address { - var id oid.ID - binary.LittleEndian.PutUint64(id[:], uint64(1+int(rand.Int63n(int64(g))))) - var addr oid.Address - addr.SetContainer(cid.ID{}) - addr.SetObject(id) - return addr -} - -func TestRandAddrGenerator(t *testing.T) { - gen := randAddrGenerator(5) - for i := 0; i < 50; i++ { - addr := gen.Next() - id := addr.Object() - k := binary.LittleEndian.Uint64(id[:]) - - require.True(t, 1 <= k && k <= uint64(gen)) - } -} - -// objectGenerator is the interface of types that generate object entries. -type objectGenerator interface { - Next() *objectSDK.Object -} - -// seqObjGenerator is an objectGenerator that generates entries with random payloads of size objSize and sequential IDs. -type seqObjGenerator struct { - cnt atomic.Uint64 - objSize uint64 -} - -func (g *seqObjGenerator) Next() *objectSDK.Object { - var id oid.ID - binary.LittleEndian.PutUint64(id[:], g.cnt.Inc()) - return genObject(id, cid.ID{}, g.objSize) -} - -func TestSeqObjGenerator(t *testing.T) { - gen := &seqObjGenerator{objSize: 10} - var addrs []string - for i := 1; i <= 10; i++ { - obj := gen.Next() - id, isSet := obj.ID() - addrs = append(addrs, addressFromObject(obj).EncodeToString()) - - require.True(t, isSet) - require.Equal(t, gen.objSize, uint64(len(obj.Payload()))) - require.Equal(t, uint64(i), binary.LittleEndian.Uint64(id[:])) - } - require.True(t, slices.IsSorted(addrs)) -} - -// randObjGenerator is an objectGenerator that generates entries with random IDs and payloads of size objSize. -type randObjGenerator struct { - objSize uint64 -} - -func (g *randObjGenerator) Next() *objectSDK.Object { - return genObject(oidtest.ID(), cidtest.ID(), g.objSize) -} - -func TestRandObjGenerator(t *testing.T) { - gen := &randObjGenerator{objSize: 10} - for i := 0; i < 10; i++ { - obj := gen.Next() - - require.Equal(t, gen.objSize, uint64(len(obj.Payload()))) - } -} - -// overwriteObjGenerator is an objectGenerator that generates entries with random payloads of size objSize and at most maxObjects distinct IDs. -type overwriteObjGenerator struct { - objSize uint64 - maxObjects uint64 -} - -func (g *overwriteObjGenerator) Next() *objectSDK.Object { - var id oid.ID - binary.LittleEndian.PutUint64(id[:], uint64(1+rand.Int63n(int64(g.maxObjects)))) - return genObject(id, cid.ID{}, g.objSize) -} - -func TestOverwriteObjGenerator(t *testing.T) { - gen := &overwriteObjGenerator{ - objSize: 10, - maxObjects: 4, - } - for i := 0; i < 40; i++ { - obj := gen.Next() - id, isSet := obj.ID() - i := binary.LittleEndian.Uint64(id[:]) - - require.True(t, isSet) - require.Equal(t, gen.objSize, uint64(len(obj.Payload()))) - require.True(t, 1 <= i && i <= gen.maxObjects) - } -} - -// Generates an object with random payload and the given address and size. -// TODO(#86): there's some testing-related dupes in many places. Probably worth -// spending some time cleaning up a bit. -func genObject(id oid.ID, cid cid.ID, sz uint64) *objectSDK.Object { - raw := objectSDK.New() - - raw.SetID(id) - raw.SetContainerID(cid) - - payload := make([]byte, sz) - rand.Read(payload) - raw.SetPayload(payload) - - return raw -} diff --git a/pkg/local_object_storage/engine/control_test.go b/pkg/local_object_storage/engine/control_test.go index 65a8d434..cf23f821 100644 --- a/pkg/local_object_storage/engine/control_test.go +++ b/pkg/local_object_storage/engine/control_test.go @@ -11,6 +11,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" @@ -156,7 +157,7 @@ func TestExecBlocks(t *testing.T) { }) // put some object - obj := generateObjectWithCID(t, cidtest.ID()) + obj := testutil.GenerateObjectWithCID(cidtest.ID()) addr := object.AddressOf(obj) diff --git a/pkg/local_object_storage/engine/delete_test.go b/pkg/local_object_storage/engine/delete_test.go index ff604f66..abe3ea93 100644 --- a/pkg/local_object_storage/engine/delete_test.go +++ b/pkg/local_object_storage/engine/delete_test.go @@ -5,6 +5,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -22,7 +23,7 @@ func TestDeleteBigObject(t *testing.T) { parentID := oidtest.ID() splitID := objectSDK.NewSplitID() - parent := generateObjectWithCID(t, cnr) + parent := testutil.GenerateObjectWithCID(cnr) parent.SetID(parentID) parent.SetPayload(nil) @@ -30,7 +31,7 @@ func TestDeleteBigObject(t *testing.T) { children := make([]*objectSDK.Object, childCount) childIDs := make([]oid.ID, childCount) for i := range children { - children[i] = generateObjectWithCID(t, cnr) + children[i] = testutil.GenerateObjectWithCID(cnr) if i != 0 { children[i].SetPreviousID(childIDs[i-1]) } @@ -42,7 +43,7 @@ func TestDeleteBigObject(t *testing.T) { childIDs[i], _ = children[i].ID() } - link := generateObjectWithCID(t, cnr) + link := testutil.GenerateObjectWithCID(cnr) link.SetParent(parent) link.SetParentID(parentID) link.SetSplitID(splitID) diff --git a/pkg/local_object_storage/engine/engine_test.go b/pkg/local_object_storage/engine/engine_test.go index a2dced60..19e98ade 100644 --- a/pkg/local_object_storage/engine/engine_test.go +++ b/pkg/local_object_storage/engine/engine_test.go @@ -9,20 +9,15 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" - checksumtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum/test" - cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" - usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "git.frostfs.info/TrueCloudLab/hrw" - "git.frostfs.info/TrueCloudLab/tzhash/tz" "github.com/panjf2000/ants/v2" "github.com/stretchr/testify/require" "go.uber.org/atomic" @@ -61,7 +56,7 @@ func benchmarkExists(b *testing.B, shardNum int) { addr := oidtest.Address() for i := 0; i < 100; i++ { - obj := generateObjectWithCID(b, cidtest.ID()) + obj := testutil.GenerateObjectWithCID(cidtest.ID()) err := Put(e, obj) if err != nil { b.Fatal(err) @@ -170,38 +165,6 @@ func testEngineFromShardOpts(t *testing.T, num int, extraOpts []shard.Option) *S return engine } -func generateObjectWithCID(t testing.TB, cnr cid.ID) *object.Object { - var ver version.Version - ver.SetMajor(2) - ver.SetMinor(1) - - csum := checksumtest.Checksum() - - var csumTZ checksum.Checksum - csumTZ.SetTillichZemor(tz.Sum(csum.Value())) - - obj := object.New() - obj.SetID(oidtest.ID()) - obj.SetOwnerID(usertest.ID()) - obj.SetContainerID(cnr) - obj.SetVersion(&ver) - obj.SetPayloadChecksum(csum) - obj.SetPayloadHomomorphicHash(csumTZ) - obj.SetPayload([]byte{1, 2, 3, 4, 5}) - - return obj -} - -func addAttribute(obj *object.Object, key, val string) { - var attr object.Attribute - attr.SetKey(key) - attr.SetValue(val) - - attrs := obj.Attributes() - attrs = append(attrs, attr) - obj.SetAttributes(attrs...) -} - func testNewEngineWithShardNum(t *testing.T, num int) *StorageEngine { shards := make([]*shard.Shard, 0, num) diff --git a/pkg/local_object_storage/engine/error_test.go b/pkg/local_object_storage/engine/error_test.go index bc205d83..f6d46a34 100644 --- a/pkg/local_object_storage/engine/error_test.go +++ b/pkg/local_object_storage/engine/error_test.go @@ -9,6 +9,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" @@ -65,7 +66,7 @@ func TestErrorReporting(t *testing.T) { t.Run("ignore errors by default", func(t *testing.T) { e, dir, id := newEngineWithErrorThreshold(t, "", 0) - obj := generateObjectWithCID(t, cidtest.ID()) + obj := testutil.GenerateObjectWithCID(cidtest.ID()) obj.SetPayload(make([]byte, errSmallSize)) var prm shard.PutPrm @@ -95,7 +96,7 @@ func TestErrorReporting(t *testing.T) { e, dir, id := newEngineWithErrorThreshold(t, "", errThreshold) - obj := generateObjectWithCID(t, cidtest.ID()) + obj := testutil.GenerateObjectWithCID(cidtest.ID()) obj.SetPayload(make([]byte, errSmallSize)) var prm shard.PutPrm @@ -145,7 +146,7 @@ func TestBlobstorFailback(t *testing.T) { objs := make([]*objectSDK.Object, 0, 2) for _, size := range []int{15, errSmallSize + 1} { - obj := generateObjectWithCID(t, cidtest.ID()) + obj := testutil.GenerateObjectWithCID(cidtest.ID()) obj.SetPayload(make([]byte, size)) var prm shard.PutPrm diff --git a/pkg/local_object_storage/engine/evacuate_test.go b/pkg/local_object_storage/engine/evacuate_test.go index a70a70dc..a89f639e 100644 --- a/pkg/local_object_storage/engine/evacuate_test.go +++ b/pkg/local_object_storage/engine/evacuate_test.go @@ -11,6 +11,7 @@ import ( objectCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" @@ -55,7 +56,7 @@ func newEngineEvacuate(t *testing.T, shardNum int, objPerShard int) (*StorageEng objects := make([]*objectSDK.Object, 0, objPerShard*len(ids)) for _, sh := range ids { - obj := generateObjectWithCID(t, cidtest.ID()) + obj := testutil.GenerateObjectWithCID(cidtest.ID()) objects = append(objects, obj) var putPrm shard.PutPrm @@ -65,7 +66,7 @@ func newEngineEvacuate(t *testing.T, shardNum int, objPerShard int) (*StorageEng } for i := 0; ; i++ { - objects = append(objects, generateObjectWithCID(t, cidtest.ID())) + objects = append(objects, testutil.GenerateObjectWithCID(cidtest.ID())) var putPrm PutPrm putPrm.WithObject(objects[len(objects)-1]) diff --git a/pkg/local_object_storage/engine/head_test.go b/pkg/local_object_storage/engine/head_test.go index 47f09f7a..82feaf6f 100644 --- a/pkg/local_object_storage/engine/head_test.go +++ b/pkg/local_object_storage/engine/head_test.go @@ -4,6 +4,7 @@ import ( "os" "testing" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -17,8 +18,8 @@ func TestHeadRaw(t *testing.T) { cnr := cidtest.ID() splitID := object.NewSplitID() - parent := generateObjectWithCID(t, cnr) - addAttribute(parent, "foo", "bar") + parent := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(parent, "foo", "bar") var parentAddr oid.Address parentAddr.SetContainer(cnr) @@ -26,12 +27,12 @@ func TestHeadRaw(t *testing.T) { idParent, _ := parent.ID() parentAddr.SetObject(idParent) - child := generateObjectWithCID(t, cnr) + child := testutil.GenerateObjectWithCID(cnr) child.SetParent(parent) child.SetParentID(idParent) child.SetSplitID(splitID) - link := generateObjectWithCID(t, cnr) + link := testutil.GenerateObjectWithCID(cnr) link.SetParent(parent) link.SetParentID(idParent) diff --git a/pkg/local_object_storage/engine/inhume_test.go b/pkg/local_object_storage/engine/inhume_test.go index 8cf0b166..8f7f6b07 100644 --- a/pkg/local_object_storage/engine/inhume_test.go +++ b/pkg/local_object_storage/engine/inhume_test.go @@ -5,6 +5,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -20,16 +21,16 @@ func TestStorageEngine_Inhume(t *testing.T) { fs := objectSDK.SearchFilters{} fs.AddRootFilter() - tombstoneID := object.AddressOf(generateObjectWithCID(t, cnr)) - parent := generateObjectWithCID(t, cnr) + tombstoneID := object.AddressOf(testutil.GenerateObjectWithCID(cnr)) + parent := testutil.GenerateObjectWithCID(cnr) - child := generateObjectWithCID(t, cnr) + child := testutil.GenerateObjectWithCID(cnr) child.SetParent(parent) idParent, _ := parent.ID() child.SetParentID(idParent) child.SetSplitID(splitID) - link := generateObjectWithCID(t, cnr) + link := testutil.GenerateObjectWithCID(cnr) link.SetParent(parent) link.SetParentID(idParent) idChild, _ := child.ID() diff --git a/pkg/local_object_storage/engine/list_test.go b/pkg/local_object_storage/engine/list_test.go index 1771cf08..39ae1fba 100644 --- a/pkg/local_object_storage/engine/list_test.go +++ b/pkg/local_object_storage/engine/list_test.go @@ -7,6 +7,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" @@ -29,7 +30,7 @@ func TestListWithCursor(t *testing.T) { for i := 0; i < total; i++ { containerID := cidtest.ID() - obj := generateObjectWithCID(t, containerID) + obj := testutil.GenerateObjectWithCID(containerID) var prm PutPrm prm.WithObject(obj) diff --git a/pkg/local_object_storage/engine/lock_test.go b/pkg/local_object_storage/engine/lock_test.go index 4d3ade8e..fbaf76ef 100644 --- a/pkg/local_object_storage/engine/lock_test.go +++ b/pkg/local_object_storage/engine/lock_test.go @@ -9,6 +9,7 @@ import ( objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" @@ -41,7 +42,7 @@ func TestLockUserScenario(t *testing.T) { const lockerExpiresAfter = 13 cnr := cidtest.ID() - tombObj := generateObjectWithCID(t, cnr) + tombObj := testutil.GenerateObjectWithCID(cnr) tombForLockID := oidtest.ID() tombObj.SetID(tombForLockID) @@ -79,7 +80,7 @@ func TestLockUserScenario(t *testing.T) { a.SetKey(objectV2.SysAttributeExpEpoch) a.SetValue(strconv.Itoa(lockerExpiresAfter)) - lockerObj := generateObjectWithCID(t, cnr) + lockerObj := testutil.GenerateObjectWithCID(cnr) lockerObj.SetID(lockerID) lockerObj.SetAttributes(a) @@ -88,7 +89,7 @@ func TestLockUserScenario(t *testing.T) { tombForLockAddr.SetObject(tombForLockID) // 1. - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) id, _ := obj.ID() objAddr.SetObject(id) @@ -166,7 +167,7 @@ func TestLockExpiration(t *testing.T) { var err error // 1. - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) err = Put(e, obj) require.NoError(t, err) @@ -176,7 +177,7 @@ func TestLockExpiration(t *testing.T) { a.SetKey(objectV2.SysAttributeExpEpoch) a.SetValue(strconv.Itoa(lockerExpiresAfter)) - lock := generateObjectWithCID(t, cnr) + lock := testutil.GenerateObjectWithCID(cnr) lock.SetType(object.TypeLock) lock.SetAttributes(a) @@ -237,13 +238,13 @@ func TestLockForceRemoval(t *testing.T) { var err error // 1. - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) err = Put(e, obj) require.NoError(t, err) // 2. - lock := generateObjectWithCID(t, cnr) + lock := testutil.GenerateObjectWithCID(cnr) lock.SetType(object.TypeLock) err = Put(e, lock) diff --git a/pkg/local_object_storage/engine/tree_test.go b/pkg/local_object_storage/engine/tree_test.go index 0312e018..ca0c7c74 100644 --- a/pkg/local_object_storage/engine/tree_test.go +++ b/pkg/local_object_storage/engine/tree_test.go @@ -4,6 +4,7 @@ import ( "strconv" "testing" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -28,8 +29,8 @@ func benchmarkTreeVsSearch(b *testing.B, objCount int) { treeID := "someTree" for i := 0; i < objCount; i++ { - obj := generateObjectWithCID(b, cid) - addAttribute(obj, pilorama.AttributeFilename, strconv.Itoa(i)) + obj := testutil.GenerateObjectWithCID(cid) + testutil.AddAttribute(obj, pilorama.AttributeFilename, strconv.Itoa(i)) err := Put(e, obj) if err != nil { b.Fatal(err) diff --git a/pkg/local_object_storage/internal/testutil/generators.go b/pkg/local_object_storage/internal/testutil/generators.go new file mode 100644 index 00000000..65b2d990 --- /dev/null +++ b/pkg/local_object_storage/internal/testutil/generators.go @@ -0,0 +1,110 @@ +package testutil + +import ( + "encoding/binary" + + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "go.uber.org/atomic" + "golang.org/x/exp/rand" +) + +// AddressGenerator is the interface of types that generate object addresses. +type AddressGenerator interface { + Next() oid.Address +} + +// SeqAddrGenerator is an AddressGenerator that generates addresses sequentially and wraps around the given max ID. +type SeqAddrGenerator struct { + cnt atomic.Uint64 + MaxID uint64 +} + +var _ AddressGenerator = &SeqAddrGenerator{} + +func (g *SeqAddrGenerator) Next() oid.Address { + var id oid.ID + binary.LittleEndian.PutUint64(id[:], ((g.cnt.Inc()-1)%g.MaxID)+1) + var addr oid.Address + addr.SetContainer(cid.ID{}) + addr.SetObject(id) + return addr +} + +// RandAddrGenerator is an addressGenerator that generates random addresses in the given range. +type RandAddrGenerator uint64 + +func (g RandAddrGenerator) Next() oid.Address { + var id oid.ID + binary.LittleEndian.PutUint64(id[:], uint64(1+int(rand.Int63n(int64(g))))) + var addr oid.Address + addr.SetContainer(cid.ID{}) + addr.SetObject(id) + return addr +} + +// ObjectGenerator is the interface of types that generate object entries. +type ObjectGenerator interface { + Next() *object.Object +} + +// SeqObjGenerator is an ObjectGenerator that generates entries with random payloads of size objSize and sequential IDs. +type SeqObjGenerator struct { + cnt atomic.Uint64 + ObjSize uint64 +} + +var _ ObjectGenerator = &SeqObjGenerator{} + +func generateObjectWithOIDWithCIDWithSize(oid oid.ID, cid cid.ID, sz uint64) *object.Object { + data := make([]byte, sz) + rand.Read(data) + obj := GenerateObjectWithCIDWithPayload(cid, data) + obj.SetID(oid) + return obj +} + +func (g *SeqObjGenerator) Next() *object.Object { + var id oid.ID + binary.LittleEndian.PutUint64(id[:], g.cnt.Inc()) + return generateObjectWithOIDWithCIDWithSize(id, cid.ID{}, g.ObjSize) +} + +// RandObjGenerator is an ObjectGenerator that generates entries with random IDs and payloads of size objSize. +type RandObjGenerator struct { + ObjSize uint64 +} + +var _ ObjectGenerator = &RandObjGenerator{} + +func (g *RandObjGenerator) Next() *object.Object { + return generateObjectWithOIDWithCIDWithSize(oid.ID{}, cid.ID{}, g.ObjSize) +} + +// OverwriteObjGenerator is an ObjectGenerator that generates entries with random payloads of size objSize and at most maxObjects distinct IDs. +type OverwriteObjGenerator struct { + ObjSize uint64 + MaxObjects uint64 +} + +func (g *OverwriteObjGenerator) Next() *object.Object { + var id oid.ID + binary.LittleEndian.PutUint64(id[:], uint64(1+rand.Int63n(int64(g.MaxObjects)))) + return generateObjectWithOIDWithCIDWithSize(id, cid.ID{}, g.ObjSize) +} + +func AddressFromObject(obj *object.Object) oid.Address { + var addr oid.Address + if id, isSet := obj.ID(); isSet { + addr.SetObject(id) + } else { + panic("object ID is not set") + } + if cid, isSet := obj.ContainerID(); isSet { + addr.SetContainer(cid) + } else { + panic("container ID is not set") + } + return addr +} diff --git a/pkg/local_object_storage/internal/testutil/generators_test.go b/pkg/local_object_storage/internal/testutil/generators_test.go new file mode 100644 index 00000000..996848d3 --- /dev/null +++ b/pkg/local_object_storage/internal/testutil/generators_test.go @@ -0,0 +1,70 @@ +package testutil + +import ( + "encoding/binary" + "testing" + + "github.com/stretchr/testify/require" + "golang.org/x/exp/slices" +) + +func TestOverwriteObjGenerator(t *testing.T) { + gen := &OverwriteObjGenerator{ + ObjSize: 10, + MaxObjects: 4, + } + for i := 0; i < 40; i++ { + obj := gen.Next() + id, isSet := obj.ID() + i := binary.LittleEndian.Uint64(id[:]) + + require.True(t, isSet) + require.Equal(t, gen.ObjSize, uint64(len(obj.Payload()))) + require.True(t, 1 <= i && i <= gen.MaxObjects) + } +} + +func TestRandObjGenerator(t *testing.T) { + gen := &RandObjGenerator{ObjSize: 10} + for i := 0; i < 10; i++ { + obj := gen.Next() + + require.Equal(t, gen.ObjSize, uint64(len(obj.Payload()))) + } +} + +func TestSeqObjGenerator(t *testing.T) { + gen := &SeqObjGenerator{ObjSize: 10} + var addrs []string + for i := 1; i <= 10; i++ { + obj := gen.Next() + id, isSet := obj.ID() + addrs = append(addrs, AddressFromObject(obj).EncodeToString()) + + require.True(t, isSet) + require.Equal(t, gen.ObjSize, uint64(len(obj.Payload()))) + require.Equal(t, uint64(i), binary.LittleEndian.Uint64(id[:])) + } + require.True(t, slices.IsSorted(addrs)) +} + +func TestRandAddrGenerator(t *testing.T) { + gen := RandAddrGenerator(5) + for i := 0; i < 50; i++ { + addr := gen.Next() + id := addr.Object() + k := binary.LittleEndian.Uint64(id[:]) + + require.True(t, 1 <= k && k <= uint64(gen)) + } +} + +func TestSeqAddrGenerator(t *testing.T) { + gen := &SeqAddrGenerator{MaxID: 10} + for i := 1; i <= 20; i++ { + addr := gen.Next() + id := addr.Object() + + require.Equal(t, uint64((i-1)%int(gen.MaxID)+1), binary.LittleEndian.Uint64(id[:])) + } +} diff --git a/pkg/local_object_storage/internal/testutil/object.go b/pkg/local_object_storage/internal/testutil/object.go new file mode 100644 index 00000000..7ef5e0b7 --- /dev/null +++ b/pkg/local_object_storage/internal/testutil/object.go @@ -0,0 +1,68 @@ +package testutil + +import ( + "crypto/sha256" + + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" + "git.frostfs.info/TrueCloudLab/tzhash/tz" + "golang.org/x/exp/rand" +) + +const defaultDataSize = 32 + +func GenerateObject() *object.Object { + return GenerateObjectWithCID(cidtest.ID()) +} + +func GenerateObjectWithCID(cnr cid.ID) *object.Object { + data := make([]byte, defaultDataSize) + rand.Read(data) + return GenerateObjectWithCIDWithPayload(cnr, data) +} + +func GenerateObjectWithCIDWithPayload(cnr cid.ID, data []byte) *object.Object { + var ver version.Version + ver.SetMajor(2) + ver.SetMinor(1) + + var csum checksum.Checksum + csum.SetSHA256(sha256.Sum256(data)) + + var csumTZ checksum.Checksum + csumTZ.SetTillichZemor(tz.Sum(csum.Value())) + + obj := object.New() + obj.SetID(oidtest.ID()) + obj.SetOwnerID(usertest.ID()) + obj.SetContainerID(cnr) + obj.SetVersion(&ver) + obj.SetPayload(data) + obj.SetPayloadChecksum(csum) + obj.SetPayloadHomomorphicHash(csumTZ) + + return obj +} + +func AddAttribute(obj *object.Object, key, val string) { + var attr object.Attribute + attr.SetKey(key) + attr.SetValue(val) + + attrs := obj.Attributes() + attrs = append(attrs, attr) + obj.SetAttributes(attrs...) +} + +func AddPayload(obj *object.Object, size int) { + buf := make([]byte, size) + _, _ = rand.Read(buf) + + obj.SetPayload(buf) + obj.SetPayloadSize(uint64(size)) +} diff --git a/pkg/local_object_storage/metabase/containers_test.go b/pkg/local_object_storage/metabase/containers_test.go index 0e2aacab..ef2bba63 100644 --- a/pkg/local_object_storage/metabase/containers_test.go +++ b/pkg/local_object_storage/metabase/containers_test.go @@ -6,6 +6,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -21,7 +22,7 @@ func TestDB_Containers(t *testing.T) { cids := make(map[string]int, N) for i := 0; i < N; i++ { - obj := generateObject(t) + obj := testutil.GenerateObject() cnr, _ := obj.ContainerID() @@ -53,7 +54,7 @@ func TestDB_Containers(t *testing.T) { } t.Run("Inhume", func(t *testing.T) { - obj := generateObject(t) + obj := testutil.GenerateObject() require.NoError(t, putBig(db, obj)) @@ -71,7 +72,7 @@ func TestDB_Containers(t *testing.T) { }) t.Run("ToMoveIt", func(t *testing.T) { - obj := generateObject(t) + obj := testutil.GenerateObject() require.NoError(t, putBig(db, obj)) @@ -107,7 +108,7 @@ func TestDB_ContainersCount(t *testing.T) { for _, upload := range uploadObjects { for i := 0; i < upload.amount; i++ { - obj := generateObject(t) + obj := testutil.GenerateObject() obj.SetType(upload.typ) err := putBig(db, obj) @@ -150,10 +151,10 @@ func TestDB_ContainerSize(t *testing.T) { for j := 0; j < N; j++ { size := rand.Intn(1024) - parent := generateObjectWithCID(t, cnr) + parent := testutil.GenerateObjectWithCID(cnr) parent.SetPayloadSize(uint64(size / 2)) - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) obj.SetPayloadSize(uint64(size)) idParent, _ := parent.ID() obj.SetParentID(idParent) diff --git a/pkg/local_object_storage/metabase/control_test.go b/pkg/local_object_storage/metabase/control_test.go index a98b4510..17f3b389 100644 --- a/pkg/local_object_storage/metabase/control_test.go +++ b/pkg/local_object_storage/metabase/control_test.go @@ -4,6 +4,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" @@ -16,7 +17,7 @@ func TestReset(t *testing.T) { err := db.Reset() require.NoError(t, err) - obj := generateObject(t) + obj := testutil.GenerateObject() addr := object.AddressOf(obj) addrToInhume := oidtest.Address() diff --git a/pkg/local_object_storage/metabase/counter_test.go b/pkg/local_object_storage/metabase/counter_test.go index 9729deb2..d93bc436 100644 --- a/pkg/local_object_storage/metabase/counter_test.go +++ b/pkg/local_object_storage/metabase/counter_test.go @@ -4,6 +4,7 @@ import ( "testing" objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" @@ -29,7 +30,7 @@ func TestCounters(t *testing.T) { t.Run("put", func(t *testing.T) { oo := make([]*object.Object, 0, objCount) for i := 0; i < objCount; i++ { - oo = append(oo, generateObject(t)) + oo = append(oo, testutil.GenerateObject()) } var prm meta.PutPrm @@ -102,12 +103,12 @@ func TestCounters(t *testing.T) { require.NoError(t, db.Reset()) t.Run("put_split", func(t *testing.T) { - parObj := generateObject(t) + parObj := testutil.GenerateObject() // put objects and check that parent info // does not affect the counter for i := 0; i < objCount; i++ { - o := generateObject(t) + o := testutil.GenerateObject() if i < objCount/2 { // half of the objs will have the parent o.SetParent(parObj) } @@ -271,11 +272,11 @@ func TestCounters_Expired(t *testing.T) { func putObjs(t *testing.T, db *meta.DB, count int, withParent bool) []*object.Object { var prm meta.PutPrm var err error - parent := generateObject(t) + parent := testutil.GenerateObject() oo := make([]*object.Object, 0, count) for i := 0; i < count; i++ { - o := generateObject(t) + o := testutil.GenerateObject() if withParent { o.SetParent(parent) } diff --git a/pkg/local_object_storage/metabase/db_test.go b/pkg/local_object_storage/metabase/db_test.go index 3e70a30b..cdb90cc1 100644 --- a/pkg/local_object_storage/metabase/db_test.go +++ b/pkg/local_object_storage/metabase/db_test.go @@ -6,18 +6,12 @@ import ( "testing" objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" - checksumtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum/test" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" - oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" - usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" - "git.frostfs.info/TrueCloudLab/tzhash/tz" "github.com/stretchr/testify/require" ) @@ -68,49 +62,13 @@ func newDB(t testing.TB, opts ...meta.Option) *meta.DB { return bdb } -func generateObject(t testing.TB) *object.Object { - return generateObjectWithCID(t, cidtest.ID()) -} - -func generateObjectWithCID(t testing.TB, cnr cid.ID) *object.Object { - var ver version.Version - ver.SetMajor(2) - ver.SetMinor(1) - - csum := checksumtest.Checksum() - - var csumTZ checksum.Checksum - csumTZ.SetTillichZemor(tz.Sum(csum.Value())) - - obj := object.New() - obj.SetID(oidtest.ID()) - obj.SetOwnerID(usertest.ID()) - obj.SetContainerID(cnr) - obj.SetVersion(&ver) - obj.SetPayloadChecksum(csum) - obj.SetPayloadHomomorphicHash(csumTZ) - obj.SetPayload([]byte{1, 2, 3, 4, 5}) - - return obj -} - -func addAttribute(obj *object.Object, key, val string) { - var attr object.Attribute - attr.SetKey(key) - attr.SetValue(val) - - attrs := obj.Attributes() - attrs = append(attrs, attr) - obj.SetAttributes(attrs...) -} - func checkExpiredObjects(t *testing.T, db *meta.DB, f func(exp, nonExp *objectSDK.Object)) { - expObj := generateObject(t) + expObj := testutil.GenerateObject() setExpiration(expObj, currEpoch-1) require.NoError(t, metaPut(db, expObj, nil)) - nonExpObj := generateObject(t) + nonExpObj := testutil.GenerateObject() setExpiration(nonExpObj, currEpoch) require.NoError(t, metaPut(db, nonExpObj, nil)) diff --git a/pkg/local_object_storage/metabase/delete_test.go b/pkg/local_object_storage/metabase/delete_test.go index 3cd314dc..eae8b1c6 100644 --- a/pkg/local_object_storage/metabase/delete_test.go +++ b/pkg/local_object_storage/metabase/delete_test.go @@ -5,6 +5,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -18,10 +19,10 @@ func TestDB_Delete(t *testing.T) { db := newDB(t) cnr := cidtest.ID() - parent := generateObjectWithCID(t, cnr) - addAttribute(parent, "foo", "bar") + parent := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(parent, "foo", "bar") - child := generateObjectWithCID(t, cnr) + child := testutil.GenerateObjectWithCID(cnr) child.SetParent(parent) idParent, _ := parent.ID() child.SetParentID(idParent) @@ -44,7 +45,7 @@ func TestDB_Delete(t *testing.T) { require.NoError(t, err) // inhume parent and child so they will be on graveyard - ts := generateObjectWithCID(t, cnr) + ts := testutil.GenerateObjectWithCID(cnr) err = metaInhume(db, object.AddressOf(child), object.AddressOf(ts)) require.NoError(t, err) @@ -75,15 +76,15 @@ func TestDeleteAllChildren(t *testing.T) { cnr := cidtest.ID() // generate parent object - parent := generateObjectWithCID(t, cnr) + parent := testutil.GenerateObjectWithCID(cnr) // generate 2 children - child1 := generateObjectWithCID(t, cnr) + child1 := testutil.GenerateObjectWithCID(cnr) child1.SetParent(parent) idParent, _ := parent.ID() child1.SetParentID(idParent) - child2 := generateObjectWithCID(t, cnr) + child2 := testutil.GenerateObjectWithCID(cnr) child2.SetParent(parent) child2.SetParentID(idParent) diff --git a/pkg/local_object_storage/metabase/exists_test.go b/pkg/local_object_storage/metabase/exists_test.go index ddc1f47b..66f8c2bb 100644 --- a/pkg/local_object_storage/metabase/exists_test.go +++ b/pkg/local_object_storage/metabase/exists_test.go @@ -5,6 +5,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -19,14 +20,14 @@ func TestDB_Exists(t *testing.T) { db := newDB(t, meta.WithEpochState(epochState{currEpoch})) t.Run("no object", func(t *testing.T) { - nonExist := generateObject(t) + nonExist := testutil.GenerateObject() exists, err := metaExists(db, object.AddressOf(nonExist)) require.NoError(t, err) require.False(t, exists) }) t.Run("regular object", func(t *testing.T) { - regular := generateObject(t) + regular := testutil.GenerateObject() err := putBig(db, regular) require.NoError(t, err) @@ -45,7 +46,7 @@ func TestDB_Exists(t *testing.T) { }) t.Run("tombstone object", func(t *testing.T) { - ts := generateObject(t) + ts := testutil.GenerateObject() ts.SetType(objectSDK.TypeTombstone) err := putBig(db, ts) @@ -57,7 +58,7 @@ func TestDB_Exists(t *testing.T) { }) t.Run("storage group object", func(t *testing.T) { - sg := generateObject(t) + sg := testutil.GenerateObject() sg.SetType(objectSDK.TypeStorageGroup) err := putBig(db, sg) @@ -69,7 +70,7 @@ func TestDB_Exists(t *testing.T) { }) t.Run("lock object", func(t *testing.T) { - lock := generateObject(t) + lock := testutil.GenerateObject() lock.SetType(objectSDK.TypeLock) err := putBig(db, lock) @@ -82,9 +83,9 @@ func TestDB_Exists(t *testing.T) { t.Run("virtual object", func(t *testing.T) { cnr := cidtest.ID() - parent := generateObjectWithCID(t, cnr) + parent := testutil.GenerateObjectWithCID(cnr) - child := generateObjectWithCID(t, cnr) + child := testutil.GenerateObjectWithCID(cnr) child.SetParent(parent) idParent, _ := parent.ID() child.SetParentID(idParent) @@ -102,16 +103,16 @@ func TestDB_Exists(t *testing.T) { cnr := cidtest.ID() splitID := objectSDK.NewSplitID() - parent := generateObjectWithCID(t, cnr) - addAttribute(parent, "foo", "bar") + parent := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(parent, "foo", "bar") - child := generateObjectWithCID(t, cnr) + child := testutil.GenerateObjectWithCID(cnr) child.SetParent(parent) idParent, _ := parent.ID() child.SetParentID(idParent) child.SetSplitID(splitID) - link := generateObjectWithCID(t, cnr) + link := testutil.GenerateObjectWithCID(cnr) link.SetParent(parent) link.SetParentID(idParent) idChild, _ := child.ID() diff --git a/pkg/local_object_storage/metabase/get_test.go b/pkg/local_object_storage/metabase/get_test.go index 0cfef27f..d647910d 100644 --- a/pkg/local_object_storage/metabase/get_test.go +++ b/pkg/local_object_storage/metabase/get_test.go @@ -9,6 +9,7 @@ import ( "time" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -21,11 +22,11 @@ import ( func TestDB_Get(t *testing.T) { db := newDB(t, meta.WithEpochState(epochState{currEpoch})) - raw := generateObject(t) + raw := testutil.GenerateObject() // equal fails on diff of attributes and <{}> attributes, /* so we make non empty attribute slice in parent*/ - addAttribute(raw, "foo", "bar") + testutil.AddAttribute(raw, "foo", "bar") t.Run("object not found", func(t *testing.T) { _, err := metaGet(db, object.AddressOf(raw), false) @@ -81,10 +82,10 @@ func TestDB_Get(t *testing.T) { cnr := cidtest.ID() splitID := objectSDK.NewSplitID() - parent := generateObjectWithCID(t, cnr) - addAttribute(parent, "foo", "bar") + parent := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(parent, "foo", "bar") - child := generateObjectWithCID(t, cnr) + child := testutil.GenerateObjectWithCID(cnr) child.SetParent(parent) idParent, _ := parent.ID() child.SetParentID(idParent) @@ -195,7 +196,7 @@ func benchmarkGet(b *testing.B, numOfObj int) { addrs := make([]oid.Address, 0, numOfObj) for i := 0; i < numOfObj; i++ { - raw := generateObject(b) + raw := testutil.GenerateObject() addrs = append(addrs, object.AddressOf(raw)) err := putBig(db, raw) diff --git a/pkg/local_object_storage/metabase/graveyard_test.go b/pkg/local_object_storage/metabase/graveyard_test.go index e18ef911..b8b66554 100644 --- a/pkg/local_object_storage/metabase/graveyard_test.go +++ b/pkg/local_object_storage/metabase/graveyard_test.go @@ -4,6 +4,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" @@ -39,8 +40,8 @@ func TestDB_IterateDeletedObjects_EmptyDB(t *testing.T) { func TestDB_Iterate_OffsetNotFound(t *testing.T) { db := newDB(t) - obj1 := generateObject(t) - obj2 := generateObject(t) + obj1 := testutil.GenerateObject() + obj2 := testutil.GenerateObject() var addr1 oid.Address err := addr1.DecodeString("AUSF6rhReoAdPVKYUZWW9o2LbtTvekn54B3JXi7pdzmn/2daLhLB7yVXbjBaKkckkuvjX22BxRYuSHy9RPxuH9PZS") @@ -110,10 +111,10 @@ func TestDB_IterateDeletedObjects(t *testing.T) { db := newDB(t) // generate and put 4 objects - obj1 := generateObject(t) - obj2 := generateObject(t) - obj3 := generateObject(t) - obj4 := generateObject(t) + obj1 := testutil.GenerateObject() + obj2 := testutil.GenerateObject() + obj3 := testutil.GenerateObject() + obj4 := testutil.GenerateObject() var err error @@ -196,10 +197,10 @@ func TestDB_IterateOverGraveyard_Offset(t *testing.T) { db := newDB(t) // generate and put 4 objects - obj1 := generateObject(t) - obj2 := generateObject(t) - obj3 := generateObject(t) - obj4 := generateObject(t) + obj1 := testutil.GenerateObject() + obj2 := testutil.GenerateObject() + obj3 := testutil.GenerateObject() + obj4 := testutil.GenerateObject() var err error @@ -294,10 +295,10 @@ func TestDB_IterateOverGarbage_Offset(t *testing.T) { db := newDB(t) // generate and put 4 objects - obj1 := generateObject(t) - obj2 := generateObject(t) - obj3 := generateObject(t) - obj4 := generateObject(t) + obj1 := testutil.GenerateObject() + obj2 := testutil.GenerateObject() + obj3 := testutil.GenerateObject() + obj4 := testutil.GenerateObject() var err error @@ -385,8 +386,8 @@ func TestDB_DropGraves(t *testing.T) { db := newDB(t) // generate and put 2 objects - obj1 := generateObject(t) - obj2 := generateObject(t) + obj1 := testutil.GenerateObject() + obj2 := testutil.GenerateObject() var err error diff --git a/pkg/local_object_storage/metabase/inhume_test.go b/pkg/local_object_storage/metabase/inhume_test.go index 09b101ad..b7ee5ef2 100644 --- a/pkg/local_object_storage/metabase/inhume_test.go +++ b/pkg/local_object_storage/metabase/inhume_test.go @@ -4,6 +4,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" @@ -14,8 +15,8 @@ import ( func TestDB_Inhume(t *testing.T) { db := newDB(t) - raw := generateObject(t) - addAttribute(raw, "foo", "bar") + raw := testutil.GenerateObject() + testutil.AddAttribute(raw, "foo", "bar") tombstoneID := oidtest.Address() diff --git a/pkg/local_object_storage/metabase/iterators_test.go b/pkg/local_object_storage/metabase/iterators_test.go index 3c3d0ea5..6b3a3612 100644 --- a/pkg/local_object_storage/metabase/iterators_test.go +++ b/pkg/local_object_storage/metabase/iterators_test.go @@ -6,6 +6,7 @@ import ( objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" object2 "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" @@ -56,9 +57,9 @@ func TestDB_IterateExpired(t *testing.T) { } func putWithExpiration(t *testing.T, db *meta.DB, typ object.Type, expiresAt uint64) oid.Address { - obj := generateObject(t) + obj := testutil.GenerateObject() obj.SetType(typ) - addAttribute(obj, objectV2.SysAttributeExpEpoch, strconv.FormatUint(expiresAt, 10)) + testutil.AddAttribute(obj, objectV2.SysAttributeExpEpoch, strconv.FormatUint(expiresAt, 10)) require.NoError(t, putBig(db, obj)) diff --git a/pkg/local_object_storage/metabase/list_test.go b/pkg/local_object_storage/metabase/list_test.go index d18f101a..ab2d9d75 100644 --- a/pkg/local_object_storage/metabase/list_test.go +++ b/pkg/local_object_storage/metabase/list_test.go @@ -6,6 +6,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -32,7 +33,7 @@ func listWithCursorPrepareDB(b *testing.B) *meta.DB { NoSync: true, })) // faster single-thread generation - obj := generateObject(b) + obj := testutil.GenerateObject() for i := 0; i < 100_000; i++ { // should be a multiple of all batch sizes obj.SetID(oidtest.ID()) if i%9 == 0 { // let's have 9 objects per container @@ -79,47 +80,47 @@ func TestLisObjectsWithCursor(t *testing.T) { containerID := cidtest.ID() // add one regular object - obj := generateObjectWithCID(t, containerID) + obj := testutil.GenerateObjectWithCID(containerID) obj.SetType(objectSDK.TypeRegular) err := putBig(db, obj) require.NoError(t, err) expected = append(expected, object.AddressWithType{Address: object.AddressOf(obj), Type: objectSDK.TypeRegular}) // add one tombstone - obj = generateObjectWithCID(t, containerID) + obj = testutil.GenerateObjectWithCID(containerID) obj.SetType(objectSDK.TypeTombstone) err = putBig(db, obj) require.NoError(t, err) expected = append(expected, object.AddressWithType{Address: object.AddressOf(obj), Type: objectSDK.TypeTombstone}) // add one storage group - obj = generateObjectWithCID(t, containerID) + obj = testutil.GenerateObjectWithCID(containerID) obj.SetType(objectSDK.TypeStorageGroup) err = putBig(db, obj) require.NoError(t, err) expected = append(expected, object.AddressWithType{Address: object.AddressOf(obj), Type: objectSDK.TypeStorageGroup}) // add one lock - obj = generateObjectWithCID(t, containerID) + obj = testutil.GenerateObjectWithCID(containerID) obj.SetType(objectSDK.TypeLock) err = putBig(db, obj) require.NoError(t, err) expected = append(expected, object.AddressWithType{Address: object.AddressOf(obj), Type: objectSDK.TypeLock}) // add one inhumed (do not include into expected) - obj = generateObjectWithCID(t, containerID) + obj = testutil.GenerateObjectWithCID(containerID) obj.SetType(objectSDK.TypeRegular) err = putBig(db, obj) require.NoError(t, err) - ts := generateObjectWithCID(t, containerID) + ts := testutil.GenerateObjectWithCID(containerID) err = metaInhume(db, object.AddressOf(obj), object.AddressOf(ts)) require.NoError(t, err) // add one child object (do not include parent into expected) splitID := objectSDK.NewSplitID() - parent := generateObjectWithCID(t, containerID) - addAttribute(parent, "foo", "bar") - child := generateObjectWithCID(t, containerID) + parent := testutil.GenerateObjectWithCID(containerID) + testutil.AddAttribute(parent, "foo", "bar") + child := testutil.GenerateObjectWithCID(containerID) child.SetParent(parent) idParent, _ := parent.ID() child.SetParentID(idParent) @@ -173,7 +174,7 @@ func TestAddObjectDuringListingWithCursor(t *testing.T) { // fill metabase with objects for i := 0; i < total; i++ { - obj := generateObject(t) + obj := testutil.GenerateObject() err := putBig(db, obj) require.NoError(t, err) expected[object.AddressOf(obj).EncodeToString()] = 0 @@ -190,7 +191,7 @@ func TestAddObjectDuringListingWithCursor(t *testing.T) { // add new objects for i := 0; i < total; i++ { - obj := generateObject(t) + obj := testutil.GenerateObject() err = putBig(db, obj) require.NoError(t, err) } diff --git a/pkg/local_object_storage/metabase/lock_test.go b/pkg/local_object_storage/metabase/lock_test.go index 9cfa9c5b..d815b711 100644 --- a/pkg/local_object_storage/metabase/lock_test.go +++ b/pkg/local_object_storage/metabase/lock_test.go @@ -4,6 +4,7 @@ import ( "testing" objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -242,7 +243,7 @@ func putAndLockObj(t *testing.T, db *meta.DB, numOfLockedObjs int) ([]*object.Ob lockedObjIDs := make([]oid.ID, 0, numOfLockedObjs) for i := 0; i < numOfLockedObjs; i++ { - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) err := putBig(db, obj) require.NoError(t, err) @@ -252,7 +253,7 @@ func putAndLockObj(t *testing.T, db *meta.DB, numOfLockedObjs int) ([]*object.Ob lockedObjIDs = append(lockedObjIDs, id) } - lockObj := generateObjectWithCID(t, cnr) + lockObj := testutil.GenerateObjectWithCID(cnr) lockID, _ := lockObj.ID() lockObj.SetType(object.TypeLock) diff --git a/pkg/local_object_storage/metabase/movable_test.go b/pkg/local_object_storage/metabase/movable_test.go index 7564f81b..6918dec2 100644 --- a/pkg/local_object_storage/metabase/movable_test.go +++ b/pkg/local_object_storage/metabase/movable_test.go @@ -4,6 +4,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" @@ -12,8 +13,8 @@ import ( func TestDB_Movable(t *testing.T) { db := newDB(t) - raw1 := generateObject(t) - raw2 := generateObject(t) + raw1 := testutil.GenerateObject() + raw2 := testutil.GenerateObject() // put two objects in metabase err := putBig(db, raw1) diff --git a/pkg/local_object_storage/metabase/put_test.go b/pkg/local_object_storage/metabase/put_test.go index 89b0a53b..837d931a 100644 --- a/pkg/local_object_storage/metabase/put_test.go +++ b/pkg/local_object_storage/metabase/put_test.go @@ -7,6 +7,7 @@ import ( "time" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/rand" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -21,7 +22,7 @@ func prepareObjects(t testing.TB, n int) []*objectSDK.Object { parentID := objecttest.ID() objs := make([]*objectSDK.Object, n) for i := range objs { - objs[i] = generateObjectWithCID(t, cnr) + objs[i] = testutil.GenerateObjectWithCID(cnr) // FKBT indices. attrs := make([]objectSDK.Attribute, 20) @@ -78,7 +79,7 @@ func BenchmarkPut(b *testing.B) { func TestDB_PutBlobovnicaUpdate(t *testing.T) { db := newDB(t) - raw1 := generateObject(t) + raw1 := testutil.GenerateObject() storageID := []byte{1, 2, 3, 4} // put one object with storageID @@ -101,7 +102,7 @@ func TestDB_PutBlobovnicaUpdate(t *testing.T) { }) t.Run("update storageID on bad object", func(t *testing.T) { - raw2 := generateObject(t) + raw2 := testutil.GenerateObject() err := putBig(db, raw2) require.NoError(t, err) diff --git a/pkg/local_object_storage/metabase/select_test.go b/pkg/local_object_storage/metabase/select_test.go index 685432bb..5d4cc75e 100644 --- a/pkg/local_object_storage/metabase/select_test.go +++ b/pkg/local_object_storage/metabase/select_test.go @@ -7,6 +7,7 @@ import ( v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -22,40 +23,40 @@ func TestDB_SelectUserAttributes(t *testing.T) { cnr := cidtest.ID() - raw1 := generateObjectWithCID(t, cnr) - addAttribute(raw1, "foo", "bar") - addAttribute(raw1, "x", "y") + raw1 := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(raw1, "foo", "bar") + testutil.AddAttribute(raw1, "x", "y") err := putBig(db, raw1) require.NoError(t, err) - raw2 := generateObjectWithCID(t, cnr) - addAttribute(raw2, "foo", "bar") - addAttribute(raw2, "x", "z") + raw2 := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(raw2, "foo", "bar") + testutil.AddAttribute(raw2, "x", "z") err = putBig(db, raw2) require.NoError(t, err) - raw3 := generateObjectWithCID(t, cnr) - addAttribute(raw3, "a", "b") + raw3 := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(raw3, "a", "b") err = putBig(db, raw3) require.NoError(t, err) - raw4 := generateObjectWithCID(t, cnr) - addAttribute(raw4, "path", "test/1/2") + raw4 := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(raw4, "path", "test/1/2") err = putBig(db, raw4) require.NoError(t, err) - raw5 := generateObjectWithCID(t, cnr) - addAttribute(raw5, "path", "test/1/3") + raw5 := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(raw5, "path", "test/1/3") err = putBig(db, raw5) require.NoError(t, err) - raw6 := generateObjectWithCID(t, cnr) - addAttribute(raw6, "path", "test/2/3") + raw6 := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(raw6, "path", "test/2/3") err = putBig(db, raw6) require.NoError(t, err) @@ -146,40 +147,40 @@ func TestDB_SelectRootPhyParent(t *testing.T) { // prepare - small := generateObjectWithCID(t, cnr) + small := testutil.GenerateObjectWithCID(cnr) err := putBig(db, small) require.NoError(t, err) - ts := generateObjectWithCID(t, cnr) + ts := testutil.GenerateObjectWithCID(cnr) ts.SetType(objectSDK.TypeTombstone) err = putBig(db, ts) require.NoError(t, err) - sg := generateObjectWithCID(t, cnr) + sg := testutil.GenerateObjectWithCID(cnr) sg.SetType(objectSDK.TypeStorageGroup) err = putBig(db, sg) require.NoError(t, err) - leftChild := generateObjectWithCID(t, cnr) + leftChild := testutil.GenerateObjectWithCID(cnr) leftChild.InitRelations() err = putBig(db, leftChild) require.NoError(t, err) - lock := generateObjectWithCID(t, cnr) + lock := testutil.GenerateObjectWithCID(cnr) lock.SetType(objectSDK.TypeLock) err = putBig(db, lock) require.NoError(t, err) - parent := generateObjectWithCID(t, cnr) + parent := testutil.GenerateObjectWithCID(cnr) - rightChild := generateObjectWithCID(t, cnr) + rightChild := testutil.GenerateObjectWithCID(cnr) rightChild.SetParent(parent) idParent, _ := parent.ID() rightChild.SetParentID(idParent) err = putBig(db, rightChild) require.NoError(t, err) - link := generateObjectWithCID(t, cnr) + link := testutil.GenerateObjectWithCID(cnr) link.SetParent(parent) link.SetParentID(idParent) idLeftChild, _ := leftChild.ID() @@ -326,11 +327,11 @@ func TestDB_SelectInhume(t *testing.T) { cnr := cidtest.ID() - raw1 := generateObjectWithCID(t, cnr) + raw1 := testutil.GenerateObjectWithCID(cnr) err := putBig(db, raw1) require.NoError(t, err) - raw2 := generateObjectWithCID(t, cnr) + raw2 := testutil.GenerateObjectWithCID(cnr) err = putBig(db, raw2) require.NoError(t, err) @@ -358,11 +359,11 @@ func TestDB_SelectPayloadHash(t *testing.T) { cnr := cidtest.ID() - raw1 := generateObjectWithCID(t, cnr) + raw1 := testutil.GenerateObjectWithCID(cnr) err := putBig(db, raw1) require.NoError(t, err) - raw2 := generateObjectWithCID(t, cnr) + raw2 := testutil.GenerateObjectWithCID(cnr) err = putBig(db, raw2) require.NoError(t, err) @@ -433,14 +434,14 @@ func TestDB_SelectWithSlowFilters(t *testing.T) { v21.SetMajor(2) v21.SetMinor(1) - raw1 := generateObjectWithCID(t, cnr) + raw1 := testutil.GenerateObjectWithCID(cnr) raw1.SetPayloadSize(10) raw1.SetCreationEpoch(11) raw1.SetVersion(v20) err := putBig(db, raw1) require.NoError(t, err) - raw2 := generateObjectWithCID(t, cnr) + raw2 := testutil.GenerateObjectWithCID(cnr) raw2.SetPayloadSize(20) raw2.SetCreationEpoch(21) raw2.SetVersion(&v21) @@ -533,9 +534,9 @@ func TestDB_SelectObjectID(t *testing.T) { // prepare - parent := generateObjectWithCID(t, cnr) + parent := testutil.GenerateObjectWithCID(cnr) - regular := generateObjectWithCID(t, cnr) + regular := testutil.GenerateObjectWithCID(cnr) idParent, _ := parent.ID() regular.SetParentID(idParent) regular.SetParent(parent) @@ -543,23 +544,23 @@ func TestDB_SelectObjectID(t *testing.T) { err := putBig(db, regular) require.NoError(t, err) - ts := generateObjectWithCID(t, cnr) + ts := testutil.GenerateObjectWithCID(cnr) ts.SetType(objectSDK.TypeTombstone) err = putBig(db, ts) require.NoError(t, err) - sg := generateObjectWithCID(t, cnr) + sg := testutil.GenerateObjectWithCID(cnr) sg.SetType(objectSDK.TypeStorageGroup) err = putBig(db, sg) require.NoError(t, err) - lock := generateObjectWithCID(t, cnr) + lock := testutil.GenerateObjectWithCID(cnr) lock.SetType(objectSDK.TypeLock) err = putBig(db, lock) require.NoError(t, err) t.Run("not found objects", func(t *testing.T) { - raw := generateObjectWithCID(t, cnr) + raw := testutil.GenerateObjectWithCID(cnr) id, _ := raw.ID() @@ -671,9 +672,9 @@ func TestDB_SelectSplitID(t *testing.T) { cnr := cidtest.ID() - child1 := generateObjectWithCID(t, cnr) - child2 := generateObjectWithCID(t, cnr) - child3 := generateObjectWithCID(t, cnr) + child1 := testutil.GenerateObjectWithCID(cnr) + child2 := testutil.GenerateObjectWithCID(cnr) + child3 := testutil.GenerateObjectWithCID(cnr) split1 := objectSDK.NewSplitID() split2 := objectSDK.NewSplitID() @@ -725,11 +726,11 @@ func TestDB_SelectContainerID(t *testing.T) { cnr := cidtest.ID() - obj1 := generateObjectWithCID(t, cnr) + obj1 := testutil.GenerateObjectWithCID(cnr) err := putBig(db, obj1) require.NoError(t, err) - obj2 := generateObjectWithCID(t, cnr) + obj2 := testutil.GenerateObjectWithCID(cnr) err = putBig(db, obj2) require.NoError(t, err) @@ -775,7 +776,7 @@ func BenchmarkSelect(b *testing.B) { var attr objectSDK.Attribute attr.SetKey("myHeader") attr.SetValue(strconv.Itoa(i)) - obj := generateObjectWithCID(b, cid) + obj := testutil.GenerateObjectWithCID(cid) obj.SetAttributes(attr) require.NoError(b, metaPut(db, obj, nil)) } diff --git a/pkg/local_object_storage/metabase/storage_id_test.go b/pkg/local_object_storage/metabase/storage_id_test.go index 8ab61a13..f8185abe 100644 --- a/pkg/local_object_storage/metabase/storage_id_test.go +++ b/pkg/local_object_storage/metabase/storage_id_test.go @@ -4,6 +4,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" @@ -12,8 +13,8 @@ import ( func TestDB_StorageID(t *testing.T) { db := newDB(t) - raw1 := generateObject(t) - raw2 := generateObject(t) + raw1 := testutil.GenerateObject() + raw2 := testutil.GenerateObject() storageID := []byte{1, 2, 3, 4} diff --git a/pkg/local_object_storage/shard/delete_test.go b/pkg/local_object_storage/shard/delete_test.go index b1574ab8..9115f3e0 100644 --- a/pkg/local_object_storage/shard/delete_test.go +++ b/pkg/local_object_storage/shard/delete_test.go @@ -4,6 +4,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -26,14 +27,14 @@ func testShardDelete(t *testing.T, hasWriteCache bool) { cnr := cidtest.ID() - obj := generateObjectWithCID(t, cnr) - addAttribute(obj, "foo", "bar") + obj := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(obj, "foo", "bar") var putPrm shard.PutPrm var getPrm shard.GetPrm t.Run("big object", func(t *testing.T) { - addPayload(obj, 1<<20) + testutil.AddPayload(obj, 1<<20) putPrm.SetObject(obj) getPrm.SetAddress(object.AddressOf(obj)) @@ -55,9 +56,9 @@ func testShardDelete(t *testing.T, hasWriteCache bool) { }) t.Run("small object", func(t *testing.T) { - obj := generateObjectWithCID(t, cnr) - addAttribute(obj, "foo", "bar") - addPayload(obj, 1<<5) + obj := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(obj, "foo", "bar") + testutil.AddPayload(obj, 1<<5) putPrm.SetObject(obj) getPrm.SetAddress(object.AddressOf(obj)) diff --git a/pkg/local_object_storage/shard/dump_test.go b/pkg/local_object_storage/shard/dump_test.go index 96802d4a..9ca82a7a 100644 --- a/pkg/local_object_storage/shard/dump_test.go +++ b/pkg/local_object_storage/shard/dump_test.go @@ -14,6 +14,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" @@ -97,7 +98,7 @@ func testDump(t *testing.T, objCount int, hasWriteCache bool) { } data := make([]byte, size) rand.Read(data) - obj := generateObjectWithPayload(cnr, data) + obj := testutil.GenerateObjectWithCIDWithPayload(cnr, data) objects[i] = obj var prm shard.PutPrm @@ -227,7 +228,7 @@ func TestStream(t *testing.T) { objects := make([]*objectSDK.Object, objCount) for i := 0; i < objCount; i++ { cnr := cidtest.ID() - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) objects[i] = obj var prm shard.PutPrm @@ -326,7 +327,7 @@ func TestDumpIgnoreErrors(t *testing.T) { objects := make([]*objectSDK.Object, objCount) for i := 0; i < objCount; i++ { size := (wcSmallObjectSize << (i % 4)) - headerSize - obj := generateObjectWithPayload(cidtest.ID(), make([]byte, size)) + obj := testutil.GenerateObjectWithPayload(cidtest.ID(), make([]byte, size)) objects[i] = obj var prm shard.PutPrm diff --git a/pkg/local_object_storage/shard/get_test.go b/pkg/local_object_storage/shard/get_test.go index 5e1914a0..9d197533 100644 --- a/pkg/local_object_storage/shard/get_test.go +++ b/pkg/local_object_storage/shard/get_test.go @@ -7,6 +7,7 @@ import ( "time" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -32,9 +33,9 @@ func testShardGet(t *testing.T, hasWriteCache bool) { var getPrm shard.GetPrm t.Run("small object", func(t *testing.T) { - obj := generateObject(t) - addAttribute(obj, "foo", "bar") - addPayload(obj, 1<<5) + obj := testutil.GenerateObject() + testutil.AddAttribute(obj, "foo", "bar") + testutil.AddPayload(obj, 1<<5) putPrm.SetObject(obj) @@ -49,10 +50,10 @@ func testShardGet(t *testing.T, hasWriteCache bool) { }) t.Run("big object", func(t *testing.T) { - obj := generateObject(t) - addAttribute(obj, "foo", "bar") + obj := testutil.GenerateObject() + testutil.AddAttribute(obj, "foo", "bar") obj.SetID(oidtest.ID()) - addPayload(obj, 1<<20) // big obj + testutil.AddPayload(obj, 1<<20) // big obj putPrm.SetObject(obj) @@ -67,20 +68,20 @@ func testShardGet(t *testing.T, hasWriteCache bool) { }) t.Run("parent object", func(t *testing.T) { - obj := generateObject(t) - addAttribute(obj, "foo", "bar") + obj := testutil.GenerateObject() + testutil.AddAttribute(obj, "foo", "bar") cnr := cidtest.ID() splitID := objectSDK.NewSplitID() - parent := generateObjectWithCID(t, cnr) - addAttribute(parent, "parent", "attribute") + parent := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(parent, "parent", "attribute") - child := generateObjectWithCID(t, cnr) + child := testutil.GenerateObjectWithCID(cnr) child.SetParent(parent) idParent, _ := parent.ID() child.SetParentID(idParent) child.SetSplitID(splitID) - addPayload(child, 1<<5) + testutil.AddPayload(child, 1<<5) putPrm.SetObject(child) diff --git a/pkg/local_object_storage/shard/head_test.go b/pkg/local_object_storage/shard/head_test.go index a0862bd0..36c8915b 100644 --- a/pkg/local_object_storage/shard/head_test.go +++ b/pkg/local_object_storage/shard/head_test.go @@ -6,6 +6,7 @@ import ( "time" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" @@ -30,8 +31,8 @@ func testShardHead(t *testing.T, hasWriteCache bool) { var headPrm shard.HeadPrm t.Run("regular object", func(t *testing.T) { - obj := generateObject(t) - addAttribute(obj, "foo", "bar") + obj := testutil.GenerateObject() + testutil.AddAttribute(obj, "foo", "bar") putPrm.SetObject(obj) @@ -49,10 +50,10 @@ func testShardHead(t *testing.T, hasWriteCache bool) { cnr := cidtest.ID() splitID := objectSDK.NewSplitID() - parent := generateObjectWithCID(t, cnr) - addAttribute(parent, "foo", "bar") + parent := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(parent, "foo", "bar") - child := generateObjectWithCID(t, cnr) + child := testutil.GenerateObjectWithCID(cnr) child.SetParent(parent) idParent, _ := parent.ID() child.SetParentID(idParent) diff --git a/pkg/local_object_storage/shard/inhume_test.go b/pkg/local_object_storage/shard/inhume_test.go index 8f673c7a..fca61394 100644 --- a/pkg/local_object_storage/shard/inhume_test.go +++ b/pkg/local_object_storage/shard/inhume_test.go @@ -4,6 +4,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -26,10 +27,10 @@ func testShardInhume(t *testing.T, hasWriteCache bool) { cnr := cidtest.ID() - obj := generateObjectWithCID(t, cnr) - addAttribute(obj, "foo", "bar") + obj := testutil.GenerateObjectWithCID(cnr) + testutil.AddAttribute(obj, "foo", "bar") - ts := generateObjectWithCID(t, cnr) + ts := testutil.GenerateObjectWithCID(cnr) var putPrm shard.PutPrm putPrm.SetObject(obj) diff --git a/pkg/local_object_storage/shard/list_test.go b/pkg/local_object_storage/shard/list_test.go index fd669ee9..33c9e489 100644 --- a/pkg/local_object_storage/shard/list_test.go +++ b/pkg/local_object_storage/shard/list_test.go @@ -4,6 +4,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" @@ -38,11 +39,11 @@ func testShardList(t *testing.T, sh *shard.Shard) { cnr := cidtest.ID() for j := 0; j < N; j++ { - obj := generateObjectWithCID(t, cnr) - addPayload(obj, 1<<2) + obj := testutil.GenerateObjectWithCID(cnr) + testutil.AddPayload(obj, 1<<2) // add parent as virtual object, it must be ignored in List() - parent := generateObjectWithCID(t, cnr) + parent := testutil.GenerateObjectWithCID(cnr) idParent, _ := parent.ID() obj.SetParentID(idParent) obj.SetParent(parent) diff --git a/pkg/local_object_storage/shard/lock_test.go b/pkg/local_object_storage/shard/lock_test.go index a16b7f54..0bf1c890 100644 --- a/pkg/local_object_storage/shard/lock_test.go +++ b/pkg/local_object_storage/shard/lock_test.go @@ -9,6 +9,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" @@ -62,10 +63,10 @@ func TestShard_Lock(t *testing.T) { }) cnr := cidtest.ID() - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) objID, _ := obj.ID() - lock := generateObjectWithCID(t, cnr) + lock := testutil.GenerateObjectWithCID(cnr) lock.SetType(object.TypeLock) lockID, _ := lock.ID() @@ -87,7 +88,7 @@ func TestShard_Lock(t *testing.T) { require.NoError(t, err) t.Run("inhuming locked objects", func(t *testing.T) { - ts := generateObjectWithCID(t, cnr) + ts := testutil.GenerateObjectWithCID(cnr) var inhumePrm shard.InhumePrm inhumePrm.SetTarget(objectcore.AddressOf(ts), objectcore.AddressOf(obj)) @@ -101,7 +102,7 @@ func TestShard_Lock(t *testing.T) { }) t.Run("inhuming lock objects", func(t *testing.T) { - ts := generateObjectWithCID(t, cnr) + ts := testutil.GenerateObjectWithCID(cnr) var inhumePrm shard.InhumePrm inhumePrm.SetTarget(objectcore.AddressOf(ts), objectcore.AddressOf(lock)) @@ -145,7 +146,7 @@ func TestShard_IsLocked(t *testing.T) { sh := newShard(t, false) cnr := cidtest.ID() - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) cnrID, _ := obj.ContainerID() objID, _ := obj.ID() diff --git a/pkg/local_object_storage/shard/metrics_test.go b/pkg/local_object_storage/shard/metrics_test.go index 13d839ee..42625910 100644 --- a/pkg/local_object_storage/shard/metrics_test.go +++ b/pkg/local_object_storage/shard/metrics_test.go @@ -7,6 +7,7 @@ import ( objectcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" @@ -82,7 +83,7 @@ func TestCounters(t *testing.T) { const objNumber = 10 oo := make([]*object.Object, objNumber) for i := 0; i < objNumber; i++ { - oo[i] = generateObject(t) + oo[i] = testutil.GenerateObject() } t.Run("defaults", func(t *testing.T) { @@ -139,7 +140,7 @@ func TestCounters(t *testing.T) { t.Run("inhume_TS", func(t *testing.T) { var prm shard.InhumePrm - ts := objectcore.AddressOf(generateObject(t)) + ts := objectcore.AddressOf(testutil.GenerateObject()) phy := mm.objCounters[physical] logic := mm.objCounters[logical] diff --git a/pkg/local_object_storage/shard/range_test.go b/pkg/local_object_storage/shard/range_test.go index 328a217d..6782dca1 100644 --- a/pkg/local_object_storage/shard/range_test.go +++ b/pkg/local_object_storage/shard/range_test.go @@ -9,6 +9,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" @@ -87,9 +88,9 @@ func testShardGetRange(t *testing.T, hasWriteCache bool) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - obj := generateObject(t) - addAttribute(obj, "foo", "bar") - addPayload(obj, tc.payloadSize) + obj := testutil.GenerateObject() + testutil.AddAttribute(obj, "foo", "bar") + testutil.AddPayload(obj, tc.payloadSize) addr := object.AddressOf(obj) payload := slice.Copy(obj.Payload()) diff --git a/pkg/local_object_storage/shard/shard_test.go b/pkg/local_object_storage/shard/shard_test.go index 2a98dabb..5a04058a 100644 --- a/pkg/local_object_storage/shard/shard_test.go +++ b/pkg/local_object_storage/shard/shard_test.go @@ -1,8 +1,6 @@ package shard_test import ( - "crypto/sha256" - "math/rand" "path/filepath" "testing" @@ -14,14 +12,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" - cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" - oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test" - usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test" - "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" - "git.frostfs.info/TrueCloudLab/tzhash/tz" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zaptest" @@ -97,54 +88,3 @@ func newCustomShard(t testing.TB, rootPath string, enableWriteCache bool, wcOpts func releaseShard(s *shard.Shard, t testing.TB) { require.NoError(t, s.Close()) } - -func generateObject(t *testing.T) *object.Object { - return generateObjectWithCID(t, cidtest.ID()) -} - -func generateObjectWithCID(t *testing.T, cnr cid.ID) *object.Object { - data := make([]byte, 32) - rand.Read(data) - return generateObjectWithPayload(cnr, data) -} - -func generateObjectWithPayload(cnr cid.ID, data []byte) *object.Object { - var ver version.Version - ver.SetMajor(2) - ver.SetMinor(1) - - var csum checksum.Checksum - csum.SetSHA256(sha256.Sum256(data)) - - var csumTZ checksum.Checksum - csumTZ.SetTillichZemor(tz.Sum(csum.Value())) - - obj := object.New() - obj.SetID(oidtest.ID()) - obj.SetOwnerID(usertest.ID()) - obj.SetContainerID(cnr) - obj.SetVersion(&ver) - obj.SetPayload(data) - obj.SetPayloadChecksum(csum) - obj.SetPayloadHomomorphicHash(csumTZ) - - return obj -} - -func addAttribute(obj *object.Object, key, val string) { - var attr object.Attribute - attr.SetKey(key) - attr.SetValue(val) - - attrs := obj.Attributes() - attrs = append(attrs, attr) - obj.SetAttributes(attrs...) -} - -func addPayload(obj *object.Object, size int) { - buf := make([]byte, size) - _, _ = rand.Read(buf) - - obj.SetPayload(buf) - obj.SetPayloadSize(uint64(size)) -} diff --git a/pkg/local_object_storage/shard/shutdown_test.go b/pkg/local_object_storage/shard/shutdown_test.go index f7f7b2ca..57a98268 100644 --- a/pkg/local_object_storage/shard/shutdown_test.go +++ b/pkg/local_object_storage/shard/shutdown_test.go @@ -5,6 +5,7 @@ import ( "testing" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" @@ -27,7 +28,7 @@ func TestWriteCacheObjectLoss(t *testing.T) { data := make([]byte, size) rand.Read(data) - objects[i] = generateObjectWithPayload(cidtest.ID(), data) + objects[i] = testutil.GenerateObjectWithCIDWithPayload(cidtest.ID(), data) } dir := t.TempDir() -- 2.45.2 From 34329d67ff9daca21cc6e566a7d6cb7e093b45df Mon Sep 17 00:00:00 2001 From: aarifullin Date: Thu, 23 Mar 2023 12:42:58 +0300 Subject: [PATCH 65/70] [#86] node: Fix unit test and linter errors Signed-off-by: Airat Arifullin --- pkg/local_object_storage/internal/testutil/generators.go | 2 +- pkg/local_object_storage/internal/testutil/object.go | 2 +- pkg/local_object_storage/shard/dump_test.go | 2 +- pkg/local_object_storage/shard/gc_test.go | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/local_object_storage/internal/testutil/generators.go b/pkg/local_object_storage/internal/testutil/generators.go index 65b2d990..9b493753 100644 --- a/pkg/local_object_storage/internal/testutil/generators.go +++ b/pkg/local_object_storage/internal/testutil/generators.go @@ -59,7 +59,7 @@ var _ ObjectGenerator = &SeqObjGenerator{} func generateObjectWithOIDWithCIDWithSize(oid oid.ID, cid cid.ID, sz uint64) *object.Object { data := make([]byte, sz) - rand.Read(data) + _, _ = rand.Read(data) obj := GenerateObjectWithCIDWithPayload(cid, data) obj.SetID(oid) return obj diff --git a/pkg/local_object_storage/internal/testutil/object.go b/pkg/local_object_storage/internal/testutil/object.go index 7ef5e0b7..4f6d9581 100644 --- a/pkg/local_object_storage/internal/testutil/object.go +++ b/pkg/local_object_storage/internal/testutil/object.go @@ -22,7 +22,7 @@ func GenerateObject() *object.Object { func GenerateObjectWithCID(cnr cid.ID) *object.Object { data := make([]byte, defaultDataSize) - rand.Read(data) + _, _ = rand.Read(data) return GenerateObjectWithCIDWithPayload(cnr, data) } diff --git a/pkg/local_object_storage/shard/dump_test.go b/pkg/local_object_storage/shard/dump_test.go index 9ca82a7a..65427dd5 100644 --- a/pkg/local_object_storage/shard/dump_test.go +++ b/pkg/local_object_storage/shard/dump_test.go @@ -327,7 +327,7 @@ func TestDumpIgnoreErrors(t *testing.T) { objects := make([]*objectSDK.Object, objCount) for i := 0; i < objCount; i++ { size := (wcSmallObjectSize << (i % 4)) - headerSize - obj := testutil.GenerateObjectWithPayload(cidtest.ID(), make([]byte, size)) + obj := testutil.GenerateObjectWithCIDWithPayload(cidtest.ID(), make([]byte, size)) objects[i] = obj var prm shard.PutPrm diff --git a/pkg/local_object_storage/shard/gc_test.go b/pkg/local_object_storage/shard/gc_test.go index 8643605e..1e266f51 100644 --- a/pkg/local_object_storage/shard/gc_test.go +++ b/pkg/local_object_storage/shard/gc_test.go @@ -11,6 +11,7 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil" meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util" @@ -83,7 +84,7 @@ func Test_GCDropsLockedExpiredObject(t *testing.T) { objExpirationAttr.SetKey(objectV2.SysAttributeExpEpoch) objExpirationAttr.SetValue("101") - obj := generateObjectWithCID(t, cnr) + obj := testutil.GenerateObjectWithCID(cnr) obj.SetAttributes(objExpirationAttr) objID, _ := obj.ID() @@ -91,7 +92,7 @@ func Test_GCDropsLockedExpiredObject(t *testing.T) { lockExpirationAttr.SetKey(objectV2.SysAttributeExpEpoch) lockExpirationAttr.SetValue("103") - lock := generateObjectWithCID(t, cnr) + lock := testutil.GenerateObjectWithCID(cnr) lock.SetType(object.TypeLock) lock.SetAttributes(lockExpirationAttr) lockID, _ := lock.ID() -- 2.45.2 From d857ffeb2eb0d5b1307523df63b305e43fe7c978 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 24 Mar 2023 10:36:34 +0300 Subject: [PATCH 66/70] [#171] Syncrhonize pre-commit settings across FrostFS repos This change allows to use `[#xx]` placeholders for issue number. This change adds go unit test run if .go files were changed. Signed-off-by: Alex Vanin --- .gitlint | 2 +- .pre-commit-config.yaml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlint b/.gitlint index 7cf8a703..e7218ac5 100644 --- a/.gitlint +++ b/.gitlint @@ -4,7 +4,7 @@ regex-style-search=True contrib=CC1 [title-match-regex] -regex=^\[\#[0-9X]+\]\s +regex=^\[\#[0-9Xx]+\]\s [ignore-by-title] regex=^Release(.*) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b79cc1e7..169b7bf1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,3 +34,12 @@ repos: rev: v1.51.2 hooks: - id: golangci-lint + + - repo: local + hooks: + - id: go-unit-tests + name: go unit tests + entry: make test + pass_filenames: false + types: [go] + language: system -- 2.45.2 From 9ffa0d8fead0fbaa0efff3d37a411b061cea06fd Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 24 Mar 2023 10:50:11 +0300 Subject: [PATCH 67/70] [#171] Remove unit tests from pipeline Unit tests are included as pre-commit hook. They are triggered by the change of .go files. Signed-off-by: Alex Vanin --- .woodpecker/pre-commit.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.woodpecker/pre-commit.yml b/.woodpecker/pre-commit.yml index 23159404..bdf3402d 100644 --- a/.woodpecker/pre-commit.yml +++ b/.woodpecker/pre-commit.yml @@ -9,9 +9,3 @@ pipeline: commands: - export HOME="$(getent passwd $(id -u) | cut '-d:' -f6)" - pre-commit run --hook-stage manual - - unit: - image: git.frostfs.info/truecloudlab/frostfs-ci:v0.36 - commands: - - export HOME="$(getent passwd $(id -u) | cut '-d:' -f6)" - - make test -- 2.45.2 From 533e9f8b750288fc0bf7f7a9cdfe9ef68dfcb233 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Wed, 22 Feb 2023 16:04:58 +0300 Subject: [PATCH 68/70] [#59] morph: Adopt updated `neo-go` client API for subs It does not use deprecated methods anymore but also adds more code that removes. Future refactor that will affect more components will optimize usage of the updated API. Signed-off-by: Pavel Karpy --- pkg/morph/client/client.go | 7 +- pkg/morph/client/constructor.go | 30 ++++--- pkg/morph/client/multi.go | 129 ++++++++++++++++++------------ pkg/morph/client/notifications.go | 115 +++++++++++++++++++------- 4 files changed, 187 insertions(+), 94 deletions(-) diff --git a/pkg/morph/client/client.go b/pkg/morph/client/client.go index 51a030e6..c840a34c 100644 --- a/pkg/morph/client/client.go +++ b/pkg/morph/client/client.go @@ -69,17 +69,12 @@ type Client struct { // on every normal call. switchLock *sync.RWMutex - // channel for ws notifications notifications chan rpcclient.Notification + subsInfo // protected with switchLock // channel for internal stop closeChan chan struct{} - // cached subscription information - subscribedEvents map[util.Uint160]string - subscribedNotaryEvents map[util.Uint160]string - subscribedToNewBlocks bool - // indicates that Client is not able to // establish connection to any of the // provided RPC endpoints diff --git a/pkg/morph/client/constructor.go b/pkg/morph/client/constructor.go index efb3d0bf..e4569ad0 100644 --- a/pkg/morph/client/constructor.go +++ b/pkg/morph/client/constructor.go @@ -9,8 +9,11 @@ import ( "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger" lru "github.com/hashicorp/golang-lru/v2" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/neorpc/result" "github.com/nspcc-dev/neo-go/pkg/rpcclient" "github.com/nspcc-dev/neo-go/pkg/rpcclient/actor" "github.com/nspcc-dev/neo-go/pkg/util" @@ -102,17 +105,22 @@ func New(key *keys.PrivateKey, opts ...Option) (*Client, error) { } cli := &Client{ - cache: newClientCache(), - logger: cfg.logger, - acc: acc, - accAddr: accAddr, - signer: cfg.signer, - cfg: *cfg, - switchLock: &sync.RWMutex{}, - notifications: make(chan rpcclient.Notification), - subscribedEvents: make(map[util.Uint160]string), - subscribedNotaryEvents: make(map[util.Uint160]string), - closeChan: make(chan struct{}), + cache: newClientCache(), + logger: cfg.logger, + acc: acc, + accAddr: accAddr, + signer: cfg.signer, + cfg: *cfg, + switchLock: &sync.RWMutex{}, + notifications: make(chan rpcclient.Notification), + subsInfo: subsInfo{ + blockRcv: make(chan *block.Block), + notificationRcv: make(chan *state.ContainedNotificationEvent), + notaryReqRcv: make(chan *result.NotaryRequestEvent), + subscribedEvents: make(map[util.Uint160]string), + subscribedNotaryEvents: make(map[util.Uint160]string), + }, + closeChan: make(chan struct{}), } cli.endpoints.init(cfg.endpoints) diff --git a/pkg/morph/client/multi.go b/pkg/morph/client/multi.go index e0eecd92..54af56b2 100644 --- a/pkg/morph/client/multi.go +++ b/pkg/morph/client/multi.go @@ -4,6 +4,11 @@ import ( "sort" "time" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/neorpc" + "github.com/nspcc-dev/neo-go/pkg/neorpc/result" + "github.com/nspcc-dev/neo-go/pkg/rpcclient" "go.uber.org/zap" ) @@ -51,7 +56,8 @@ func (c *Client) switchRPC() bool { c.logger.Info("connection to the new RPC node has been established", zap.String("endpoint", newEndpoint)) - if !c.restoreSubscriptions(cli, newEndpoint) { + subs, ok := c.restoreSubscriptions(cli, newEndpoint, false) + if !ok { // new WS client does not allow // restoring subscription, client // could not work correctly => @@ -63,6 +69,7 @@ func (c *Client) switchRPC() bool { c.client = cli c.setActor(act) + c.subsInfo = subs if c.cfg.switchInterval != 0 && !c.switchIsActive.Load() && c.endpoints.list[c.endpoints.curr].Priority != c.endpoints.list[0].Priority { @@ -77,9 +84,14 @@ func (c *Client) switchRPC() bool { } func (c *Client) notificationLoop() { + var e any + var ok bool + for { c.switchLock.RLock() - nChan := c.client.Notifications + bChan := c.blockRcv + nChan := c.notificationRcv + nrChan := c.notaryReqRcv c.switchLock.RUnlock() select { @@ -93,57 +105,74 @@ func (c *Client) notificationLoop() { c.close() return - case n, ok := <-nChan: - // notification channel is used as a connection - // state: if it is closed, the connection is - // considered to be lost - if !ok { - if closeErr := c.client.GetError(); closeErr != nil { - c.logger.Warn("switching to the next RPC node", - zap.String("reason", closeErr.Error()), - ) - } else { - // neo-go client was closed by calling `Close` - // method that happens only when the client has - // switched to the more prioritized RPC - continue - } + case e, ok = <-bChan: + case e, ok = <-nChan: + case e, ok = <-nrChan: + } - if !c.switchRPC() { - c.logger.Error("could not establish connection to any RPC node") + if ok { + c.routeEvent(e) + continue + } - // could not connect to all endpoints => - // switch client to inactive mode - c.inactiveMode() - - return - } - - // TODO(@carpawell): call here some callback retrieved in constructor - // of the client to allow checking chain state since during switch - // process some notification could be lost - - continue - } - - select { - case c.notifications <- n: - continue - case <-c.cfg.ctx.Done(): - _ = c.UnsubscribeAll() - c.close() - - return - case <-c.closeChan: - _ = c.UnsubscribeAll() - c.close() - - return - } + if !c.reconnect() { + return } } } +func (c *Client) routeEvent(e any) { + typedNotification := rpcclient.Notification{Value: e} + + switch e.(type) { + case *block.Block: + typedNotification.Type = neorpc.BlockEventID + case *state.ContainedNotificationEvent: + typedNotification.Type = neorpc.NotificationEventID + case *result.NotaryRequestEvent: + typedNotification.Type = neorpc.NotaryRequestEventID + } + + select { + case c.notifications <- typedNotification: + case <-c.cfg.ctx.Done(): + _ = c.UnsubscribeAll() + c.close() + case <-c.closeChan: + _ = c.UnsubscribeAll() + c.close() + } +} + +func (c *Client) reconnect() bool { + if closeErr := c.client.GetError(); closeErr != nil { + c.logger.Warn("switching to the next RPC node", + zap.String("reason", closeErr.Error()), + ) + } else { + // neo-go client was closed by calling `Close` + // method, that happens only when a client has + // switched to the more prioritized RPC + return true + } + + if !c.switchRPC() { + c.logger.Error("could not establish connection to any RPC node") + + // could not connect to all endpoints => + // switch client to inactive mode + c.inactiveMode() + + return false + } + + // TODO(@carpawell): call here some callback retrieved in constructor + // of the client to allow checking chain state since during switch + // process some notification could be lost + + return true +} + func (c *Client) switchToMostPrioritized() { t := time.NewTicker(c.cfg.switchInterval) defer t.Stop() @@ -156,11 +185,12 @@ mainLoop: return case <-t.C: c.switchLock.RLock() + endpointsCopy := make([]Endpoint, len(c.endpoints.list)) copy(endpointsCopy, c.endpoints.list) - currPriority := c.endpoints.list[c.endpoints.curr].Priority highestPriority := c.endpoints.list[0].Priority + c.switchLock.RUnlock() if currPriority == highestPriority { @@ -186,7 +216,7 @@ mainLoop: continue } - if c.restoreSubscriptions(cli, tryE) { + if subs, ok := c.restoreSubscriptions(cli, tryE, true); ok { c.switchLock.Lock() // higher priority node could have been @@ -201,6 +231,7 @@ mainLoop: c.cache.invalidate() c.client = cli c.setActor(act) + c.subsInfo = subs c.endpoints.curr = i c.switchLock.Unlock() diff --git a/pkg/morph/client/notifications.go b/pkg/morph/client/notifications.go index 2afeebb8..1d287527 100644 --- a/pkg/morph/client/notifications.go +++ b/pkg/morph/client/notifications.go @@ -1,6 +1,10 @@ package client import ( + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/neorpc" + "github.com/nspcc-dev/neo-go/pkg/neorpc/result" "github.com/nspcc-dev/neo-go/pkg/rpcclient" "github.com/nspcc-dev/neo-go/pkg/util" "go.uber.org/zap" @@ -36,7 +40,7 @@ func (c *Client) SubscribeForExecutionNotifications(contract util.Uint160) error return nil } - id, err := c.client.SubscribeForExecutionNotifications(&contract, nil) + id, err := c.client.ReceiveExecutionNotifications(&neorpc.NotificationFilter{Contract: &contract}, c.notificationRcv) if err != nil { return err } @@ -59,17 +63,17 @@ func (c *Client) SubscribeForNewBlocks() error { return ErrConnectionLost } - if c.subscribedToNewBlocks { + if c.subscribedToBlocks { // no need to subscribe one more time return nil } - _, err := c.client.SubscribeForNewBlocks(nil) + _, err := c.client.ReceiveBlocks(nil, c.blockRcv) if err != nil { return err } - c.subscribedToNewBlocks = true + c.subscribedToBlocks = true return nil } @@ -99,7 +103,7 @@ func (c *Client) SubscribeForNotaryRequests(txSigner util.Uint160) error { return nil } - id, err := c.client.SubscribeForNotaryRequests(nil, &txSigner) + id, err := c.client.ReceiveNotaryRequests(&neorpc.TxFilter{Signer: &txSigner}, c.notaryReqRcv) if err != nil { return err } @@ -187,7 +191,7 @@ func (c *Client) UnsubscribeAll() error { // no need to unsubscribe if there are // no active subscriptions if len(c.subscribedEvents) == 0 && len(c.subscribedNotaryEvents) == 0 && - !c.subscribedToNewBlocks { + !c.subscribedToBlocks { return nil } @@ -198,14 +202,32 @@ func (c *Client) UnsubscribeAll() error { c.subscribedEvents = make(map[util.Uint160]string) c.subscribedNotaryEvents = make(map[util.Uint160]string) - c.subscribedToNewBlocks = false + c.subscribedToBlocks = false return nil } -// restoreSubscriptions restores subscriptions according to -// cached information about them. -func (c *Client) restoreSubscriptions(cli *rpcclient.WSClient, endpoint string) bool { +// subsInfo includes channels for ws notifications; +// cached subscription information. +type subsInfo struct { + blockRcv chan *block.Block + notificationRcv chan *state.ContainedNotificationEvent + notaryReqRcv chan *result.NotaryRequestEvent + + subscribedToBlocks bool + subscribedEvents map[util.Uint160]string + subscribedNotaryEvents map[util.Uint160]string +} + +// restoreSubscriptions restores subscriptions according to cached +// information about them. +// +// If it is NOT a background operation switchLock MUST be held. +// Returns a pair: the second is a restoration status and the first +// one contains subscription information applied to the passed cli +// and receivers for the updated subscriptions. +// Does not change Client instance. +func (c *Client) restoreSubscriptions(cli *rpcclient.WSClient, endpoint string, background bool) (si subsInfo, ok bool) { var ( err error id string @@ -214,72 +236,109 @@ func (c *Client) restoreSubscriptions(cli *rpcclient.WSClient, endpoint string) stopCh := make(chan struct{}) defer close(stopCh) + blockRcv := make(chan *block.Block) + notificationRcv := make(chan *state.ContainedNotificationEvent) + notaryReqRcv := make(chan *result.NotaryRequestEvent) + // neo-go WS client says to _always_ read notifications // from its channel. Subscribing to any notification // while not reading them in another goroutine may // lead to a dead-lock, thus that async side notification // listening while restoring subscriptions go func() { + var e any + var ok bool + for { select { case <-stopCh: return - case n, ok := <-cli.Notifications: - if !ok { - return - } - - c.notifications <- n + case e, ok = <-blockRcv: + case e, ok = <-notificationRcv: + case e, ok = <-notaryReqRcv: } + + if !ok { + return + } + + if background { + // background client (test) switch, no need to send + // any notification, just preventing dead-lock + continue + } + + c.routeEvent(e) } }() + if background { + c.switchLock.RLock() + defer c.switchLock.RUnlock() + } + + si.subscribedToBlocks = c.subscribedToBlocks + si.subscribedEvents = copySubsMap(c.subscribedEvents) + si.subscribedNotaryEvents = copySubsMap(c.subscribedNotaryEvents) + si.blockRcv = blockRcv + si.notificationRcv = notificationRcv + si.notaryReqRcv = notaryReqRcv + // new block events restoration - if c.subscribedToNewBlocks { - _, err = cli.SubscribeForNewBlocks(nil) + if si.subscribedToBlocks { + _, err = cli.ReceiveBlocks(nil, blockRcv) if err != nil { c.logger.Error("could not restore block subscription after RPC switch", zap.String("endpoint", endpoint), zap.Error(err), ) - return false + return } } // notification events restoration - for contract := range c.subscribedEvents { + for contract := range si.subscribedEvents { contract := contract // See https://github.com/nspcc-dev/neo-go/issues/2890 - id, err = cli.SubscribeForExecutionNotifications(&contract, nil) + id, err = cli.ReceiveExecutionNotifications(&neorpc.NotificationFilter{Contract: &contract}, notificationRcv) if err != nil { c.logger.Error("could not restore notification subscription after RPC switch", zap.String("endpoint", endpoint), zap.Error(err), ) - return false + return } - c.subscribedEvents[contract] = id + si.subscribedEvents[contract] = id } // notary notification events restoration if c.notary != nil { - for signer := range c.subscribedNotaryEvents { + for signer := range si.subscribedNotaryEvents { signer := signer // See https://github.com/nspcc-dev/neo-go/issues/2890 - id, err = cli.SubscribeForNotaryRequests(nil, &signer) + id, err = cli.ReceiveNotaryRequests(&neorpc.TxFilter{Signer: &signer}, notaryReqRcv) if err != nil { c.logger.Error("could not restore notary notification subscription after RPC switch", zap.String("endpoint", endpoint), zap.Error(err), ) - return false + return } - c.subscribedNotaryEvents[signer] = id + si.subscribedNotaryEvents[signer] = id } } - return true + return si, true +} + +func copySubsMap(m map[util.Uint160]string) map[util.Uint160]string { + newM := make(map[util.Uint160]string, len(m)) + for k, v := range m { + newM[k] = v + } + + return newM } -- 2.45.2 From f3ff9fd251c6e8be87b559bb2057b00ed188db39 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Wed, 22 Feb 2023 16:06:42 +0300 Subject: [PATCH 69/70] [#73] morph: Rename vars that collide with package names Signed-off-by: Pavel Karpy --- pkg/morph/client/client.go | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkg/morph/client/client.go b/pkg/morph/client/client.go index c840a34c..1f32fc54 100644 --- a/pkg/morph/client/client.go +++ b/pkg/morph/client/client.go @@ -414,43 +414,43 @@ func (c *Client) roleList(r noderoles.Role) (keys.PublicKeys, error) { // // Wraps any error to frostfsError. func toStackParameter(value any) (sc.Parameter, error) { - var result = sc.Parameter{ + var res = sc.Parameter{ Value: value, } switch v := value.(type) { case []byte: - result.Type = sc.ByteArrayType + res.Type = sc.ByteArrayType case int: - result.Type = sc.IntegerType - result.Value = big.NewInt(int64(v)) + res.Type = sc.IntegerType + res.Value = big.NewInt(int64(v)) case int64: - result.Type = sc.IntegerType - result.Value = big.NewInt(v) + res.Type = sc.IntegerType + res.Value = big.NewInt(v) case uint64: - result.Type = sc.IntegerType - result.Value = new(big.Int).SetUint64(v) + res.Type = sc.IntegerType + res.Value = new(big.Int).SetUint64(v) case [][]byte: arr := make([]sc.Parameter, 0, len(v)) for i := range v { elem, err := toStackParameter(v[i]) if err != nil { - return result, err + return res, err } arr = append(arr, elem) } - result.Type = sc.ArrayType - result.Value = arr + res.Type = sc.ArrayType + res.Value = arr case string: - result.Type = sc.StringType + res.Type = sc.StringType case util.Uint160: - result.Type = sc.ByteArrayType - result.Value = v.BytesBE() + res.Type = sc.ByteArrayType + res.Value = v.BytesBE() case noderoles.Role: - result.Type = sc.IntegerType - result.Value = big.NewInt(int64(v)) + res.Type = sc.IntegerType + res.Value = big.NewInt(int64(v)) case keys.PublicKeys: arr := make([][]byte, 0, len(v)) for i := range v { @@ -459,13 +459,13 @@ func toStackParameter(value any) (sc.Parameter, error) { return toStackParameter(arr) case bool: - result.Type = sc.BoolType - result.Value = v + res.Type = sc.BoolType + res.Value = v default: - return result, wrapFrostFSError(fmt.Errorf("chain/client: unsupported parameter %v", value)) + return res, wrapFrostFSError(fmt.Errorf("chain/client: unsupported parameter %v", value)) } - return result, nil + return res, nil } // MagicNumber returns the magic number of the network @@ -509,7 +509,7 @@ func (c *Client) MsPerBlock() (res int64, err error) { } // IsValidScript returns true if invocation script executes with HALT state. -func (c *Client) IsValidScript(script []byte, signers []transaction.Signer) (res bool, err error) { +func (c *Client) IsValidScript(script []byte, signers []transaction.Signer) (valid bool, err error) { c.switchLock.RLock() defer c.switchLock.RUnlock() @@ -517,12 +517,12 @@ func (c *Client) IsValidScript(script []byte, signers []transaction.Signer) (res return false, ErrConnectionLost } - result, err := c.client.InvokeScript(script, signers) + res, err := c.client.InvokeScript(script, signers) if err != nil { return false, fmt.Errorf("invokeScript: %w", err) } - return result.State == vmstate.Halt.String(), nil + return res.State == vmstate.Halt.String(), nil } // NotificationChannel returns channel than receives subscribed -- 2.45.2 From 2ff962f174d012f6fe2524fff6732fc9de7308f3 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 24 Mar 2023 21:21:40 +0300 Subject: [PATCH 70/70] test commit message (auto creation) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 81701c44..c7d00487 100644 --- a/README.md +++ b/README.md @@ -94,3 +94,4 @@ Please see [CREDITS](CREDITS.md) for details. # License - [GNU General Public License v3.0](LICENSE) +123 -- 2.45.2