diff --git a/.dockerignore b/.dockerignore index ea5f32935..6f1699bf0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,4 +5,5 @@ docker-compose.yml Dockerfile temp .dockerignore -docker \ No newline at end of file +docker +.cache diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index f007b327d..000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @TrueCloudLab/storage-core @TrueCloudLab/committers diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml deleted file mode 100644 index 5dab3d914..000000000 --- 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 a24c6981b..000000000 --- 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 0e5c3efbd..000000000 --- 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 c98199335..000000000 --- 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 diff --git a/.gitlint b/.gitlint new file mode 100644 index 000000000..9ce883f49 --- /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/.golangci.yml b/.golangci.yml index 54a2261cb..4c4fccc9b 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: @@ -53,4 +55,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 000000000..88fde1b6a --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,35 @@ +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$" + + - 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a6324756..7e9ba6d06 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 @@ -23,6 +24,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) @@ -45,6 +47,8 @@ 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) +- Adding of public key for nns group `group.frostfs` at init step (#130) ### Removed ### Updated @@ -197,7 +201,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 @@ -235,7 +239,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 @@ -263,7 +267,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. @@ -273,7 +277,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. @@ -568,15 +572,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 @@ -592,7 +596,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 @@ -628,8 +632,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. @@ -695,7 +699,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. @@ -772,7 +776,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) @@ -789,13 +793,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 @@ -825,7 +829,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) @@ -839,16 +843,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 (우도, 牛島) @@ -858,7 +862,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) @@ -912,7 +916,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 (문갑도, 文甲島) @@ -920,7 +924,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) @@ -928,7 +932,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) @@ -937,7 +941,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 @@ -972,7 +976,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. @@ -981,12 +985,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`. @@ -1005,7 +1009,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) @@ -1067,7 +1071,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 @@ -1134,9 +1138,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)). @@ -1164,7 +1168,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 @@ -1184,7 +1188,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). @@ -1192,7 +1196,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. @@ -1202,8 +1206,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. @@ -1214,7 +1218,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). @@ -1227,7 +1231,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 @@ -1245,11 +1249,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. @@ -1257,7 +1261,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. @@ -1267,7 +1271,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. @@ -1284,7 +1288,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. @@ -1296,7 +1300,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 @@ -1315,7 +1319,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. @@ -1346,39 +1350,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. @@ -1396,7 +1400,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 @@ -1410,13 +1414,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 14b9648bf..ce4050b71 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 index 1355b6fbb..242a7ed1c --- 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 @@ -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 "; \ @@ -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 diff --git a/README.md b/README.md index d906f4269..81701c441 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 82b777838..dac264239 100644 --- a/cmd/frostfs-adm/README.md +++ b/cmd/frostfs-adm/README.md @@ -3,23 +3,22 @@ ## 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 -[frostfs-contract repository](https://github.com/TrueCloudLab/frostfs-contract/releases). - +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 @@ -27,7 +26,7 @@ contracts. Find them in the latest release of 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 da3aa7078..a1923bb2c 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 0c969028f..5ada94387 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 6bfa4d187..0d505b3a4 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-adm/internal/modules/config/config.go b/cmd/frostfs-adm/internal/modules/config/config.go index 5f4ebc428..13e575933 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 c49b2cb50..292fe76da 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 72022aa3d..72485eef9 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 26ff90e9a..5c0b18e05 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 62170f098..2aaddce12 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 030542fb9..69db5c7bd 100644 --- a/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go +++ b/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go @@ -7,7 +7,8 @@ import ( "strings" "text/tabwriter" - "github.com/TrueCloudLab/frostfs-contract/nns" + "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 } diff --git a/cmd/frostfs-adm/internal/modules/morph/generate.go b/cmd/frostfs-adm/internal/modules/morph/generate.go index 52ffddb60..23637fed3 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 d2478c02f..39cfc5718 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 cd30e1bea..3fdffd4e6 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 dc4208c03..bab8e12c7 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 d12b2a528..1be94bf11 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 3c6d05a75..b43c2da33 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" @@ -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) @@ -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. diff --git a/cmd/frostfs-adm/internal/modules/morph/initialize_test.go b/cmd/frostfs-adm/internal/modules/morph/initialize_test.go index e4927ce5a..3c6adfc3c 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 49cce0aeb..6754bf66e 100644 --- a/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go +++ b/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go @@ -83,13 +83,13 @@ var file_cmd_frostfs_adm_internal_modules_morph_internal_types_proto_rawDesc = [ 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x65, 0x66, 0x73, 0x22, 0x2b, 0x0a, 0x13, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x07, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x56, 0x5a, 0x54, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, - 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, - 0x64, 0x65, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x61, - 0x64, 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, - 0x6c, 0x65, 0x73, 0x2f, 0x6d, 0x6f, 0x72, 0x70, 0x68, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x07, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x5c, 0x5a, 0x5a, 0x67, 0x69, + 0x74, 0x2e, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x54, + 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, + 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x66, 0x72, 0x6f, + 0x73, 0x74, 0x66, 0x73, 0x2d, 0x61, 0x64, 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x6d, 0x6f, 0x72, 0x70, 0x68, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cmd/frostfs-adm/internal/modules/morph/internal/types.proto b/cmd/frostfs-adm/internal/modules/morph/internal/types.proto index 8f5ce70d1..2ce61b3c0 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 241e274a4..222b9902a 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 481ea58ab..df67433c4 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 6b6def2ec..229a2cea6 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 67584e921..4e30d5e62 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 be795ed7e..682350bad 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 11db74504..eb91e3ab9 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 718110322..cbf19eb4b 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 c98c612a2..e5c1b41c9 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 27ca356d1..4cf0b0a34 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 7efb3ff86..0a623b0e8 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 abe162658..102a2d59e 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 0d45b1dca..2f95626ff 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 563cd9545..e3127a3fe 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 ceea935fa..4b5591a86 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 26178c27d..991c6633d 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 40dfbe0a6..b2fa1dadd 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 bb80a2b3c..bec40f1ff 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 98d564f88..8ab8aa125 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 7d76251a3..cb037bbbd 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 dc38f9faf..7da26f8eb 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" ) @@ -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 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. -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/acl/extended/create_test.go b/cmd/frostfs-cli/modules/acl/extended/create_test.go index 213bc8aa8..71f41e589 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 0008a1233..3e46a70ba 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 61443cda5..3f3189144 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 d6b331695..2f1623d9b 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 bfcc3146a..618317e0b 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 407309e97..410663e84 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" ) @@ -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 617da2a45..52ee5d4fb 100644 --- a/cmd/frostfs-cli/modules/container/delete.go +++ b/cmd/frostfs-cli/modules/container/delete.go @@ -4,20 +4,20 @@ 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" ) 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/cmd/frostfs-cli/modules/container/get.go b/cmd/frostfs-cli/modules/container/get.go index 9a72c5ad0..2db1f7c8d 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 94c9d5a1f..bc04a84fc 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 e0c45e90b..1dd0fe8cd 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 063595505..35649a08c 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 c273f3cba..d89772fcc 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 fe789e186..30a82954a 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 3d3f14570..0b781589f 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 6ea35acee..48265f785 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 fc8afd0fb..9de3ae8a3 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 d7dad460a..02ee88ce0 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 d86c91cb8..48be393dc 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 deb54454f..8d18a5c11 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 dd3560111..d3b656392 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 8c1d2b28f..3aa741689 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 ff5afb980..c0d0aca95 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 8faf5f6e3..ec515e6b4 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 8ea069ef2..edf97a731 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 c514c1f96..4f6e24082 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 60f06b3bc..2287344d6 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 8177d4a85..fdf17244b 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 2f5f85df8..6e05721ff 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 bd8e5e94c..f34456c71 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 7bf9cb172..4a94d9e70 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 bdb34f73d..aaa83f12f 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 709e38e88..0878f5ceb 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 4ac8d243f..25d5703de 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 fc3c4dea3..b077610f8 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 0bc35443a..c7d734e67 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 795fe3558..fc2e7c9c6 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 650359943..7f7da959d 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 11bfedbdd..ef3b6dcb2 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 7a4d3a381..a594204f0 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 f79bb433d..886153075 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 d378abdb0..de4a8a3b4 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 7832db44a..25adffc1e 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 4bc317ba0..cf6d1d40b 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 61691b574..e1c951b93 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 91945c96a..83751de7d 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 dcebdb6d5..c59d3c51c 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 973822a91..4c12453d5 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 d6bad729b..f4024a833 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 f19d9b31a..413310420 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 70c41b775..5ca61a58e 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 819307709..707a4d8ee 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 33edc5847..e83408a89 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 82cfdfca3..f379de41b 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 cc735bb8d..75acbaedf 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 ffc7d8b5d..8e4d2bd4c 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 9dad9d527..c70e6f5e2 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 9314e223a..c8366e5be 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" @@ -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 { diff --git a/cmd/frostfs-cli/modules/util/convert_eacl.go b/cmd/frostfs-cli/modules/util/convert_eacl.go index e1635f51a..1fb76c50e 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 da71b2d6e..53082a15e 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 b2cd1d2c1..319dee1c6 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 2209df97c..e89252dea 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 aff1709fa..3cdd236d4 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 0104a1796..c641cf0ac 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 920c3cc74..2c77ee4df 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 1e09c75d8..fa26eef25 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 2094265fa..e4386a083 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 6d41e2cbf..3f4e8cfe4 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 e1be6ade5..67242a7d1 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 9551b9fe1..0a0cd955d 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 9cc82473d..fb0065a62 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 cae55ffba..3ab9a8f88 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 d6c0f4aa5..db90513eb 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 3ed9b08a1..9f35c26c2 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 d6abe9334..a232409d6 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 0c02a12bd..91f12ed0f 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 776047e4a..f6d0cfff0 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 6cf6c342c..fec298d77 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 c846fa0c0..ab937addc 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 1d3889355..26acc0437 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 97d07850d..64c3beba7 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 ea11cbec5..248c92ef0 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 16204be49..3aabb63df 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 05176f36b..7d82a4a18 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 589f043a0..4d67753bd 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 e3a7f7f16..37ffd2e88 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 931b2cee4..ef48bdc5b 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 8b6069761..12c92306b 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 2db12350d..0450d0d57 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 47032f074..8cfafb5c9 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 b35bf4fb2..6bc06b76d 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 f4ff5432f..0c04cda6f 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 53dd7fdbe..36684f093 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 a797853b4..72e57ee5a 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 36a7b81cb..5595f10bb 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 b827b3f21..a6e34e80f 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 45eeae296..de9f6ba5b 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 4d0db437a..649e4980d 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 11ba913c0..83d4e45c5 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 4ced17995..1dc32fb86 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 9f5fb2b44..1aa01d906 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 02ff7fda6..3730094d9 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 0e2090b69..7ac0eca91 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 ec03940a1..c003cefa6 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 f2ef36084..c25d2e717 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 bb94d7f15..25677ed63 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 8e56b6054..3d1af0715 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 47ca5eac2..78e4377a9 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 c2df2fab9..850f71d74 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 3c2fff99a..1e934ec94 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 ad355e113..ed8509165 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 f87c72ac6..4ab608ef3 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 e719aaa72..e62351017 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 510946e85..a2794422e 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 575f6c38f..303292652 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 9a36980e8..cd969852b 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 b154ed444..e29c86dc9 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 d2cd2aff4..3a4abe195 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 6b5990fb0..51e55c341 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 a67e6f360..97b7bcefd 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 17aabaa80..f891833a6 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 edb457bbb..1b132a886 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 dcff08ea0..0fbac935c 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 64d410c93..1c366df80 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 19012c6b6..ac6d92c4e 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 7007bedf1..f6087c53d 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 670158438..90837d43d 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 28981170b..bfa555db3 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 1ff73812c..ad6b9bbbd 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 b441eb9ef..a56c76606 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 7410b8078..9fa6d2f6a 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 11ee7a97b..57d8bc809 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 249c7e9c0..f18bbe65d 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 34c674241..6c09ae022 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 580da8e0b..d5f3036c4 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 8acc4b43d..9722db3a5 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 23dc62721..df838464a 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" ) @@ -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.engine.IsLocked(address) +} + func (e engineWithoutNotifications) Delete(tombstone oid.Address, toDelete []oid.ID) error { var prm engine.InhumePrm diff --git a/cmd/frostfs-node/pprof.go b/cmd/frostfs-node/pprof.go index 02d376496..9be2dd9df 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 a9a28c54b..e9626b146 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 b527fbf73..0fe0a7fd7 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 f10ce2ae9..c0a5cbc7b 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 1cd61fa92..8bc74324f 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 b69483cdb..fb89c4396 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 56b830c6a..7e6411329 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 fff159add..641a0afe2 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 2b63b1a91..224da9439 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 5eec832d4..0f614d9f2 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 b9cc37c82..79bc3d44f 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 b9a644454..2fa93ff6f 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 952a999a2..92d10dfee 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 1dd9cc230..95e3b8205 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 da2f6419d..2ee2e8656 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 a271fc701..cee32a0b6 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 31fd86647..3896fd6be 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 90cab2d38..e35fc1afd 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 cae477889..9b912ddc0 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 a16b4a944..94964e0d2 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/config/example/README.md b/config/example/README.md index afb594b14..8dd0fe44a 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 5b2ac7ac9..717a9b0ff 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 82cbe3d22..b5faf2b27 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 f38249144..44dc05e0a 100644 --- a/debian/clean +++ b/debian/clean @@ -1,2 +1,2 @@ -man/ +man/ debian/*.bash-completion diff --git a/debian/control b/debian/control index 88e54d381..575a27e33 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 4aae83f6b..61dab665d 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 @@ -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 index cb4a10310..eb9d381c9 --- 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-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 index 0ecce7445..88fa53be5 --- 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 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 8f5a7d5f5..7fca33d09 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 b77253561..16737ab9f 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 f69643d3d..f99225046 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/go.mod b/go.mod index cf21b9025..61cd57647 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 @@ -39,10 +39,12 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) +require golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 + 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 +56,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,7 +91,7 @@ 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/net v0.4.0 // indirect golang.org/x/sync v0.1.0 // indirect diff --git a/go.sum b/go.sum index b81b444f2..93f805d21 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-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= @@ -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 f07dedc06..d74adddcc 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 bdf3fc6da..80c8f49b7 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 066a96027..e3379446f 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 73f79de42..3ed54529c 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 1fd9fdf24..17fccc620 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 44536713a..7770c61c7 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 800fe316f..cd5559d9f 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 6157661fe..804f0bd40 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. @@ -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 817d689bc..563c7827d 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" ) @@ -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/core/object/object.go b/pkg/core/object/object.go index 9824c3d68..8fb656acd 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 8a70fbeac..6474377bb 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 e84ad30ff..eb759a993 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 3d229e922..1ef18c521 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 8bf9ed44b..0e10125c3 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 543ffbf0d..747f36fdf 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 4cac91830..c280eb4bf 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 3d48b2f2b..4a80ebf3b 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 fa56315c5..aeb5b15b0 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" @@ -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 } diff --git a/pkg/innerring/internal/client/client.go b/pkg/innerring/internal/client/client.go index 668af543e..edcbc6ae5 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 5f47e196b..3c749fe61 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 700ebb81c..a9a9498b6 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 a10415714..9961710ca 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 eccfcdc9d..8680066e9 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 927b80612..9d61aa812 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 9dd611840..f57d281ee 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 bed8e5502..8b2354bb8 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 d592dddb7..7feecb7b6 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 2a6234377..cb514b165 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 6e32c5d6c..dd660d4e1 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 c7fd46b23..51461beb7 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 39683f779..4c5a2ddc6 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 197ce5550..754dda34a 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 b4a4d7498..2527b7ec3 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 07920d08b..bfbf6c782 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 6f26d1af3..f9f8b5841 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 9f4acc5de..8b244aa5d 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 0f3b6e71c..e8bbb5db6 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 d12f7f211..ae0d28729 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 588e5b8c9..bc0dbec7f 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 d6330fac8..b28efaa33 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 d1c28fcfe..0abce5827 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 05492e356..ecc90332f 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 ff9eeb958..e9504cdb4 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 4d6776cdf..bfa88d3f0 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 705165d40..913ad3d78 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 1c0a6ee99..9397186ee 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 38b9ffb37..e4024e95f 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 8bf44a5b6..959710393 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 846d96434..54e4ea3ab 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 8e3f5b5a5..d071a7792 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 5a6921230..6697391e8 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 0a6b00853..e6332261e 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 0e864577a..126f36582 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 7db7e518b..4094e50a5 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 876019440..a557628f0 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 9d32f9f7a..4c859703d 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 04ad89174..f9ae4e614 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 bf9c84385..e9b24e024 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 3b7ac6291..e4425ef17 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 fca2a4c95..48de528e1 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 eba59cb17..3734bae01 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 220c41cfa..de145d48c 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 50ddf1035..36c9579e5 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 1183a2639..31e93763b 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 c5f64df8d..990358257 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 585c4b2a9..d819865d8 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 239860b78..fb8d82071 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 ebd8be5d4..d357f0d4f 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 6b00b98b7..72f4eb8dd 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 0047821ee..a605c053b 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 258cb607a..a2baa36af 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 91262ce35..b4f44543e 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 ee4ae59cd..9dca0fd0d 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 6374f2d8c..6f40fb577 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 d20c91c6a..37d7955ad 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 6e4eaae26..a47a3e89b 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 4eed411e9..f73b61983 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 de59510dc..b344f98d6 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 e656e6f91..e86666d5c 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 b40f2bdc2..2026c8641 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 3986352a4..23e61a44a 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 338eeab09..ba1588756 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 4380a6d4a..dda6ee90a 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 949c08b86..013023b09 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 839fa720f..08e7a9f4d 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 ccc8cae03..903d9c876 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" @@ -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/innerring/subnet.go b/pkg/innerring/subnet.go index c6f9da5f6..5375029d4 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 8cc0581c0..a49324406 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 43b359d69..43dbe1b98 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 a64dbc58c..3912deac0 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 371f54600..1f885bd8e 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 dba86298b..2b0575c92 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 733a0ae50..8ac45c4aa 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 665a2d00e..776f08d2b 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 7f6b1806c..98097e9c8 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 5187d2e07..1adfacbc0 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 8d51a3a4e..6ecb20c77 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 00da5a84a..37ed57e1c 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 27ae81546..c628c96be 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 1c8a5e85b..e7e890e50 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 01e8b044f..7e14d6d8d 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 ef6612dac..4ef053d54 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 df2dbc434..e13e49351 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 024f68a5d..8b6db9fa7 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 88cbbfabf..f1bc0b225 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 3c7998f97..89ea9b641 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 4eab32157..29df23944 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 a36d34e4b..9918801b9 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 a231e2119..95ef8635a 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 8da731d58..614d66fe9 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 3f8344c57..a6fe9935e 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 ed9316e8a..e6d680cb7 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 9afc3348c..1b04eab1a 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 a709a6d36..46a84c736 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 48f7173f0..d9bdbd33a 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 09eb0064e..0d036219f 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 543246bd4..1c4f95c02 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 3cec9f684..a6f0da26b 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 34947ac63..51bb9624e 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 aac88da19..76dd6d96e 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 6cab3c29c..79e37f8ae 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 48d11788a..8c5a7aba6 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 09ce0ebc8..7a5a00957 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 492ab4188..54f3eb1f7 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 3fd14f606..1ff74893d 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 0446cfcc7..3265e68f3 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 97fd6032a..0e5525e77 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 0abc74c67..49f487d35 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 2f34969ea..533efcb55 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 3f9fa9962..6caa61b84 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 7666927f6..93939cabb 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 798c9bf18..b2663be21 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 c5ebb8595..0a74495d7 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 b13498a41..f3bb4c3f2 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 744ccdbf8..ee16ddcb3 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 4b7110e6a..cc3da6b4b 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 01ddc6ea5..9e4b1a449 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 a598098f7..231df3eff 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 4583b62b5..0461dd803 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 c2c1c05d5..b2a7ddfb9 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 d21e0500d..f201f18d7 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/memstore/control.go b/pkg/local_object_storage/blobstor/memstore/control.go new file mode 100644 index 000000000..4deb9f6e2 --- /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 000000000..12a812975 --- /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 000000000..531a7d9e7 --- /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 000000000..3d67b1e9c --- /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/mode.go b/pkg/local_object_storage/blobstor/mode.go index 42a4afc5a..e6d0edc03 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/perf_test.go b/pkg/local_object_storage/blobstor/perf_test.go new file mode 100644 index 000000000..96d902662 --- /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 +} diff --git a/pkg/local_object_storage/blobstor/put.go b/pkg/local_object_storage/blobstor/put.go index 9d94d7b1c..a4009ae43 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 ea508ab64..034837110 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 b9a831359..c5e51a7f0 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 c2d7a3211..65a8d4348 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 9a355b56f..a49b1e8fa 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 6aefde088..ff604f660 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 0b7c48641..f5cf8c32e 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 cacb23b8e..4d154d289 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 69514b532..a2dced607 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 0444dde1d..bc205d836 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 6ff61ed01..59965ba4f 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 907e011e3..a70a70dc4 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 0248cf944..a43c7f23f 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 3db3e7c63..264ace58e 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 6f4b3b36b..689b46de8 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 4d19b15ae..47f09f7a2 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 da0d50b6a..41b75af60 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 3e65343f6..151820ab2 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" ) @@ -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 diff --git a/pkg/local_object_storage/engine/inhume_test.go b/pkg/local_object_storage/engine/inhume_test.go index e48a68736..8cf0b1667 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 92cf2abf7..8644a7f7e 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 43e177e64..1771cf084 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 9b5652e9b..20a4d68e8 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 03ba5a415..4d3ade8ee 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 9adb19b98..68a4467f2 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 12984b042..d6e6b08ff 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 fd4ec456e..84c750cd0 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 35a80cc13..7b9b8be60 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 2b8226e73..34210d835 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 c52e345f7..0d6f49eea 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" ) @@ -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/engine/tree_test.go b/pkg/local_object_storage/engine/tree_test.go index 3c85002ba..0312e0180 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 a9bb51fd1..26600a3eb 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 b8eff90fa..82024ffa7 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 658ff71da..74400a981 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" ) @@ -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()) }) } diff --git a/pkg/local_object_storage/metabase/VERSION.md b/pkg/local_object_storage/metabase/VERSION.md index c9707c007..97e514db1 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/local_object_storage/metabase/containers.go b/pkg/local_object_storage/metabase/containers.go index 6fab579b8..3d69649a9 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 08fcef030..0e2aacabc 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 10f42d320..1a19c3e2a 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 634be90f4..a98b45103 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 d36e994f8..a07328026 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 ca92460b7..9729deb29 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 d5036553b..5a9ca3aa9 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 fd97150ca..3e70a30ba 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 511300b19..79f870372 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 ab46c3ee4..3cd314dc2 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 9772971fa..bc16dc01e 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 d9b1ed520..59bd9f4f2 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 122ac53aa..ddc1f47b8 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 54da0bf6e..227aa9f8d 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 d3a3ad466..c0feda06c 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 3f7c6fab5..0cfef27fe 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 bcd67bc79..393c9f4d0 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 a7b6629a4..e18ef9114 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 2d2107b67..ce772576f 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 2d69ffde3..09b101ad8 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 5a9e9dc25..9741225df 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 a8b07323d..3c3d0ea50 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 5220e48f9..93b7efb99 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 a873216f8..d18f101ad 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 68ce0a89d..0ecd8cfee 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 d7c6a153f..9cfa9c5bc 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 1bd59a04c..dd1cdc900 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 bdc1b5938..e6990dc54 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 67b6cd565..7564f81bd 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 c534c9269..06b1d3ac8 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 1593c4c08..89b0a53b8 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 5ca731492..20985f47a 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 848b701f6..685432bb0 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 4cda0b256..ae309d4b2 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 e72611a61..8ab61a13d 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 701d4f691..b60c97fd7 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 c8cfc08f2..5748b64ee 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 43375ba1b..3065c8370 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 247d07d28..b47fa16e8 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" ) @@ -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() { @@ -845,19 +885,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 5b1896e20..743096c81 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. @@ -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 cbd7f5143..9fe372b36 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" ) @@ -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/generic_test.go b/pkg/local_object_storage/pilorama/generic_test.go index 204efbb9b..cac03c4e1 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/inmemory.go b/pkg/local_object_storage/pilorama/inmemory.go index fbd84162c..92dc9b6aa 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 238843dd5..c2143de24 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. @@ -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/pilorama/types.go b/pkg/local_object_storage/pilorama/types.go index 88369db45..99918683d 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 182525d56..24090e8d8 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 2f698c694..6d17114bf 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 ad0de6d69..1c258cb8c 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 0c2cfa265..6ae3bf7dd 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 468e80ad9..b1574ab8b 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 1607af460..8d9fe0f71 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 2e5b233b4..96802d4ab 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 d188bd308..3e5224eb9 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 5bb930b62..35b9cba9b 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 11a190e79..a8910561e 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 934684655..4231c01db 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 64aa29159..5e1914a06 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 0e51da737..6913d3162 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 079f96a71..a0862bd01 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 6e6242c4a..992a86c01 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 98e2b3ead..a5b9c1a7d 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 bdb2c1ec8..199bb8b3f 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 119d5b2b5..8f673c7a8 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 724a190a7..9efca8983 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 84d8e3da6..fd669ee9d 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 dd1d05658..d8113cf30 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 278b60a76..a16b7f547 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 ad76fb804..13d839eee 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 0ca2609fe..17ed3f3c8 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 fbe4051d7..c6bf8409e 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 311759dab..48dbe1be2 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 0ff10f6e6..c9106c235 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 21f233ab4..328a217dd 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 f0816ce83..fbe4d6121 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 0faeb5519..73dc1d178 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 b03626601..4bb467d48 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 b1116d8f3..a0fd077c7 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 2159bdb5c..a6da53918 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 7618a0937..f7f7b2ca4 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 124988479..b9f909997 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) @@ -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) +} diff --git a/pkg/local_object_storage/util/splitinfo.go b/pkg/local_object_storage/util/splitinfo.go index f2a4a24f3..4a6d22268 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 3b7cf9022..a0626db28 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 e580317f8..dcfea8dd0 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 f4fce0d0a..0437367e7 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" @@ -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 6049b79af..e6de8a028 100644 --- a/pkg/local_object_storage/writecache/flush_test.go +++ b/pkg/local_object_storage/writecache/flush_test.go @@ -4,22 +4,23 @@ import ( "os" "path/filepath" "testing" + "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" - "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" @@ -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/generic_test.go b/pkg/local_object_storage/writecache/generic_test.go index 82d602ac1..53d6624b7 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 ff71dedbd..a15f42e18 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 2c8bcf9c8..56b27ec4b 100644 --- a/pkg/local_object_storage/writecache/init.go +++ b/pkg/local_object_storage/writecache/init.go @@ -2,21 +2,69 @@ package writecache import ( "errors" + "sync" - "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" ) 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/iterate.go b/pkg/local_object_storage/writecache/iterate.go index ae3efffd1..228dd2597 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 b790cc56c..997310d9e 100644 --- a/pkg/local_object_storage/writecache/mode.go +++ b/pkg/local_object_storage/writecache/mode.go @@ -4,13 +4,16 @@ 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. 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/options.go b/pkg/local_object_storage/writecache/options.go index 6db4ae0ff..638508528 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 9396f3a68..7791e93dc 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" ) @@ -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 da533880e..02c79d380 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" @@ -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 fa52c08a0..2fe7d44bc 100644 --- a/pkg/local_object_storage/writecache/writecache.go +++ b/pkg/local_object_storage/writecache/writecache.go @@ -3,13 +3,14 @@ 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/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() diff --git a/pkg/metrics/innerring.go b/pkg/metrics/innerring.go index 487edc192..55b0aa089 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)) +} diff --git a/pkg/morph/client/audit/client.go b/pkg/morph/client/audit/client.go index bd673f17d..b922fc792 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 533f7f6fb..9e1b75db4 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 12a3989b7..ace01d15b 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 e75422d12..f8e233b26 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 e6bcdb0a1..a0137e3b8 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 a81211ab4..aae245acd 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 d1544301d..88a1aa8f1 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 b56684d41..b05c526dc 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 88daa95ed..39e4b28e5 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 f14a23363..7b270808e 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 e0d99bdb3..cda78c077 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 0b514f335..5206f69fa 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 fb43c4b2d..4aae6dbfd 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 5adc1c2fc..01fd30f70 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 46c33fc2e..f93fd6686 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 d2a8fed87..c9105a3ca 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 f418d634e..56c36c179 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 d62fb0186..86eae4c2b 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 6895a6650..6adf67476 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 a5c6ac242..8d68141a5 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 d79e2a588..8f165f4b1 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 b9876d1b5..dcf89f73e 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 f4f48832e..2c97446c6 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 937b14062..5b15d5c7b 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 072b306de..e8f4f7f18 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 b7f9315a5..3e3e70ec0 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 7680e65c6..cbbd05142 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 c8f56af6b..dded61aff 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 9c1255d4d..3bae7adfb 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 9b26bf45a..dc6c25540 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 6e24e6b16..eafa097e9 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 67ab436d7..6b721cdfb 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 222ece45d..92d569ae2 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 d28a299ca..742165b9a 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 3943e8bc7..61bbf5f17 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 da3d36728..d6172a682 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 cd57c4621..0b4d31b1d 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 fc13a8eff..ba2c26af7 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 383fae8a3..02967453b 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 68696a5c0..0a23aa47a 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 30e55171e..a1980e2d9 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 2cd86ebd7..cdaf191ad 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 abd6cc2d2..8f1d24176 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 036a2f1b6..0090efb10 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 20f563bc6..02b47defe 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 28941253a..387da656d 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 bc3c51fac..8cbae8f95 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 9b6b47da2..1c855496e 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 d531be18b..f7f8bb2c9 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 314188cf5..5cd7c39a0 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 b878f5ac5..134b92943 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 cdbfab188..68725a016 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 3df5d98a7..2046e79c2 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 c99c6f2fc..062a2a886 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 ecda69b7e..9199bcd55 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 5f3da4bcf..398466f51 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 c17df3dd4..371f18733 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 8dc328b3c..8bf894791 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 a852f426f..8ef6a71af 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 dcd994549..112065b42 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 24b122ae4..2f0598597 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 47e4d8401..9fd21e2b5 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 54933d0a3..be46e62c4 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 596e2b68d..d163c6836 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 6992e9d31..f5779ced6 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 5030ef7b0..2ccea296f 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 ce5cb2827..49d10d3c3 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 53421ae99..38a82b8d4 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 192c0a98e..239ddb1a4 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 0c2b14d88..861f05a68 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 6db54f7e4..1b9824b39 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 c50b3d05b..b56c8ecb2 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 ac0ee68c6..b9467d112 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 29ad08e5e..0f52e2119 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 687555f0f..62203540f 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 c7ee00faf..8ce6fdc36 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 9a0a08ea1..f88d67994 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 393534f54..4b79d7c48 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 5718adad6..3bbf76c2c 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 42891364a..5544283ef 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 0506d87b2..13ad868e4 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 3468aa728..87cf94082 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 48be88994..a506b052d 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 6e1818bc4..1b8bcf40a 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 0032098e7..0eaa9f285 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 603efc16a..b175b5275 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 a2f4058fb..535d57e4d 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 4fb0e1bb9..b7a251f98 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 878783a6b..1772c88a7 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 e354b14a1..f661268f7 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 397fcefd5..d0463348d 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 a85a38f76..a182bf26c 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 167955374..f3cd749fc 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 2a016cad2..46356b317 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 460fa1dc2..28c968046 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 11f7d80d9..f46658b58 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 0b47b0242..fc68bb227 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 f31575899..3b1f5297d 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 f7a7ac7dc..8a75b62c8 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 0a5829181..67bfb8918 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 fc4008742..70fff4dc8 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 9ae87852e..355fd5b4d 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 6be890006..6229e6f30 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 bf00adc85..93bb04de5 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 aaac8c3a0..020882980 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 56d33859c..549e98b65 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 e459ae42a..39c191b78 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 0cc523795..c18feac27 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 98b92f065..2144a3001 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 4cb86cdf6..ed514d6d4 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 de99f456b..7a3aec86c 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 93bffb2a7..e1655c183 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 65d4808b8..391536e8e 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 cd00000fa..a151ced09 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 e8e9812e2..82e323a3c 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 05e55b41e..bb9074324 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 595dcd2d5..e0dc74942 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 be0224828..92f650119 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 17e6d9140..7d3cb9577 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 d71980d25..402845957 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 0e7a65c8d..434c89508 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 970c18dad..a78ac6fd6 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 89b6a3f3a..72833c46c 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 998f6a76c..e98d9b3af 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 b4ef45a27..528a3bbb5 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 89fbe9855..beb2fdcf8 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 8e6f0b3d0..f8a16cb0a 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 9ab8cec8a..432826acf 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 e5a7469a9..5f8685534 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 d3c608a95..f16f97384 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 5e76bfdbb..554aab6c4 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 ed8bb208f..4e8a3df68 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 69e8a344e..bf7698799 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 ea8b84b61..13f8fd12d 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 205f66b4c..54eb7e07c 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 19aa075e4..1737921a2 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 67dba49f2..953ea452b 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 2a6ae8d83..29148def0 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 c954f7475..fb356393d 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 d145dad6b..989120b40 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 72155542b..429cda3eb 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 0fad64305..ab140ab4c 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 5a952c724..3db0d967c 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 3aa2586d3..43339eb47 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 8db3882d9..6169a2aee 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 d0b06ae45..fca1e5796 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 0478b7370..70d82fc4e 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 83407991e..20e73627d 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 78da59d76..b4705d258 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 0702ddad6..42035c8d0 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 3a7dd7cda..a270ee856 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 37b1eee59..138974537 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 301b0bce6..052a8c945 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 fec2d327c..9e77e2e21 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 540e43b51..833288bb7 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 6b12d78e1..01bc48724 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 3082ae01e..a8b16b607 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 8be0bd042..986da90f1 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 6c84852da..0c2de5300 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 5dc909a60..4ada98468 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 d3826c61f..9f2834706 100644 --- a/pkg/services/control/ir/service.pb.go +++ b/pkg/services/control/ir/service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: pkg/services/control/ir/service.proto package control @@ -261,12 +261,12 @@ var file_pkg_services_control_ir_service_proto_rawDesc = []byte{ 0x2e, 0x69, 0x72, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x69, 0x72, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, - 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3e, 0x5a, - 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x54, 0x72, 0x75, 0x65, - 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, - 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x73, 0x2f, 0x69, 0x72, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x44, 0x5a, + 0x42, 0x67, 0x69, 0x74, 0x2e, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2e, 0x69, 0x6e, 0x66, + 0x6f, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, + 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x72, 0x2f, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/services/control/ir/service.proto b/pkg/services/control/ir/service.proto index 9e45f961c..5f99be16b 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 d4cbffa52..f6dd94b3a 100644 --- a/pkg/services/control/ir/service_frostfs.pb.go +++ b/pkg/services/control/ir/service_frostfs.pb.go @@ -2,7 +2,7 @@ package control -import "github.com/TrueCloudLab/frostfs-api-go/v2/util/proto" +import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/proto" // StableSize returns the size of x in protobuf format. // diff --git a/pkg/services/control/ir/service_grpc.pb.go b/pkg/services/control/ir/service_grpc.pb.go index 92751b614..b6bc6fdba 100644 --- a/pkg/services/control/ir/service_grpc.pb.go +++ b/pkg/services/control/ir/service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.12.4 +// - protoc v3.21.12 // source: pkg/services/control/ir/service.proto package control diff --git a/pkg/services/control/ir/service_test.go b/pkg/services/control/ir/service_test.go index 896217563..54eef5148 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 79e0f2903..c89cd5a0d 100644 --- a/pkg/services/control/ir/types.pb.go +++ b/pkg/services/control/ir/types.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: pkg/services/control/ir/types.proto package control @@ -150,11 +150,11 @@ var file_pkg_services_control_ir_types_proto_rawDesc = []byte{ 0x4e, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x54, 0x41, 0x52, 0x54, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x52, 0x45, 0x41, 0x44, 0x59, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x48, 0x55, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x10, - 0x03, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, - 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x72, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x03, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x2e, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, + 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, + 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, + 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x72, 0x2f, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/services/control/ir/types.proto b/pkg/services/control/ir/types.proto index ddf5e8273..a6897fad1 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 293f81cca..50679e785 100644 --- a/pkg/services/control/ir/types_frostfs.pb.go +++ b/pkg/services/control/ir/types_frostfs.pb.go @@ -2,7 +2,7 @@ package control -import "github.com/TrueCloudLab/frostfs-api-go/v2/util/proto" +import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/proto" // StableSize returns the size of x in protobuf format. // diff --git a/pkg/services/control/rpc.go b/pkg/services/control/rpc.go index b94285a3b..0779e177b 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 66dca3e4a..28be02aa4 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 d00e9b3a6..6c064efa3 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 8f196bc6e..fdfd136a6 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 46f30a549..ea1f626f6 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 06127290e..9e87caa49 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 178e61afc..25e54cd98 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 955d587d2..a020547a2 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 3a55bf6f6..0e6367951 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 0b4453885..a0ad44e23 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 5225b41f6..ba7e682c6 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 5bdf6b366..274e2f65d 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 ec90cb038..726cdf341 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 9d61624fa..dce3e8831 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 1e25d95d8..78e7b0598 100644 --- a/pkg/services/control/service.pb.go +++ b/pkg/services/control/service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: pkg/services/control/service.proto package control @@ -2443,11 +2443,11 @@ var file_pkg_services_control_service_proto_rawDesc = []byte{ 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x43, 0x61, 0x63, 0x68, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x43, 0x61, 0x63, 0x68, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, - 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x54, 0x72, - 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, - 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x2e, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2e, 0x69, + 0x6e, 0x66, 0x6f, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, + 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x70, 0x6b, + 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/services/control/service.proto b/pkg/services/control/service.proto index 18adc8ed5..5a09a74a5 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 2529d5a80..5bb119090 100644 --- a/pkg/services/control/service_frostfs.pb.go +++ b/pkg/services/control/service_frostfs.pb.go @@ -2,7 +2,7 @@ package control -import "github.com/TrueCloudLab/frostfs-api-go/v2/util/proto" +import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/proto" // StableSize returns the size of x in protobuf format. // diff --git a/pkg/services/control/service_grpc.pb.go b/pkg/services/control/service_grpc.pb.go index 77f43e314..2cfddd7f5 100644 --- a/pkg/services/control/service_grpc.pb.go +++ b/pkg/services/control/service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.12.4 +// - protoc v3.21.12 // source: pkg/services/control/service.proto package control diff --git a/pkg/services/control/service_test.go b/pkg/services/control/service_test.go index 70b7d6eb1..f39a304f9 100644 --- a/pkg/services/control/service_test.go +++ b/pkg/services/control/service_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control" ) func TestHealthCheckResponse_Body_StableMarshal(t *testing.T) { diff --git a/pkg/services/control/types.pb.go b/pkg/services/control/types.pb.go index 581ac2f45..735517d3d 100644 --- a/pkg/services/control/types.pb.go +++ b/pkg/services/control/types.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: pkg/services/control/types.proto package control @@ -725,11 +725,11 @@ var file_pkg_services_control_types_proto_rawDesc = []byte{ 0x0a, 0x09, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x45, 0x47, 0x52, 0x41, 0x44, 0x45, 0x44, 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x44, 0x45, 0x47, 0x52, 0x41, 0x44, 0x45, 0x44, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, - 0x59, 0x10, 0x04, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, - 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x59, 0x10, 0x04, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x2e, 0x66, 0x72, 0x6f, 0x73, 0x74, + 0x66, 0x73, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, + 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, + 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/services/control/types.proto b/pkg/services/control/types.proto index 3a17b4364..c85d672c2 100644 --- a/pkg/services/control/types.proto +++ b/pkg/services/control/types.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package control; -option go_package = "github.com/TrueCloudLab/frostfs-node/pkg/services/control"; +option go_package = "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control"; // Signature of some message. message Signature { diff --git a/pkg/services/control/types_frostfs.pb.go b/pkg/services/control/types_frostfs.pb.go index 3594ca97a..1d05102b3 100644 --- a/pkg/services/control/types_frostfs.pb.go +++ b/pkg/services/control/types_frostfs.pb.go @@ -2,7 +2,7 @@ package control -import "github.com/TrueCloudLab/frostfs-api-go/v2/util/proto" +import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/proto" // StableSize returns the size of x in protobuf format. // diff --git a/pkg/services/control/types_test.go b/pkg/services/control/types_test.go index 09d7dbbc0..1505a985c 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 159645db0..9fa3d767f 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 14f6dcd06..8b035e461 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 593c2a3d1..0a09c9f44 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 b2a935e44..85b19d862 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 aea20e7a7..ded4b4b7d 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 97f6552e4..c9ba2ed26 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 b9034b968..54eb373ec 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 c44ce8724..096618300 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 906708d4a..6734f9f74 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 b0550d29d..d3ad1e6fd 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 2019bb2d5..4570e271a 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 856823d23..31188fbfd 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 63020cbc1..40271f1cd 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 5fc549eab..0a63981cb 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 b6f86520b..7657e8780 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 a7c3b7c35..246714af7 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 f9fe76f59..2bf5a3958 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 db4306e4f..70c1ae991 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 281ce3d38..7e937da06 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 f74a0b3b6..0cf734d7a 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 62f7917f2..6bae0d0ca 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 8c40cbe2a..061cd26b6 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 7afbd1444..5e3be6e52 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 49593f67d..394feef4e 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 c627af168..e797f1a64 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 8dd16d6df..4a9c476d0 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 d3fc3db97..112796f27 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 225ef2d74..36af96448 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 b054095ae..92eb5dcb6 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 76024a173..f2ea384de 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 765c5a2f1..a8ebb3065 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 8f7b715c0..51759c5df 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 a21b25a44..d0db1f543 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 89d400087..ed77b5693 100644 --- a/pkg/services/object/get/assemble.go +++ b/pkg/services/object/get/assemble.go @@ -1,9 +1,12 @@ 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" + "context" + "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" "go.uber.org/zap" ) @@ -33,222 +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 - - 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 new file mode 100644 index 000000000..4ae1981b1 --- /dev/null +++ b/pkg/services/object/get/assembler.go @@ -0,0 +1,288 @@ +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) +} + +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 +} diff --git a/pkg/services/object/get/container.go b/pkg/services/object/get/container.go index f892ab1b7..882861129 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 5755973f7..09ff9a82f 100644 --- a/pkg/services/object/get/exec.go +++ b/pkg/services/object/get/exec.go @@ -3,16 +3,14 @@ package getsvc import ( "context" "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/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" ) @@ -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 @@ -128,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() } func (exec *execCtx) splitInfo() *objectSDK.SplitInfo { @@ -199,74 +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 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.log.Debug("parent address in child object differs") - } 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) @@ -303,6 +222,7 @@ func (exec *execCtx) writeCollectedHeader() bool { } err := exec.prm.objWriter.WriteHeader( + exec.context(), exec.collectedObject.CutPayload(), ) @@ -327,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.go b/pkg/services/object/get/get.go index 829deaffa..f3d5f8a5f 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 6167ad180..09d0c38fa 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" ) @@ -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(_ context.Context, _ *objectSDK.Object) error { + return &writeHeaderError{} +} + +func (w *writeHeaderErrorObjectWriter) WriteChunk(_ context.Context, _ []byte) error { + return nil +} + +type writePayloadError struct{} + +func (whe *writePayloadError) Error() string { + return "write payload error" +} + +type writePayloadErrorObjectWriter struct { +} + +func (w *writePayloadErrorObjectWriter) WriteHeader(_ context.Context, _ *objectSDK.Object) error { + return nil +} + +func (w *writePayloadErrorObjectWriter) WriteChunk(_ context.Context, _ []byte) error { + return &writePayloadError{} +} + func TestGetLocalOnly(t *testing.T) { ctx := context.Background() @@ -214,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 } @@ -476,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 @@ -902,6 +934,337 @@ 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.ErrorIs(t, err, errParentAddressDiffers) + + 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.ErrorIs(t, err, errParentAddressDiffers) + }) + + 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.Error(t, err) + 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.Error(t, err) + 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 +1388,93 @@ 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.ErrorIs(t, err, errParentAddressDiffers) + + 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.ErrorIs(t, err, errParentAddressDiffers) + }) + t.Run("OK", func(t *testing.T) { addr := oidtest.Address() addr.SetContainer(idCnr) @@ -1115,6 +1565,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)) + }) }) } @@ -1153,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/local.go b/pkg/services/object/get/local.go index c0ad1b2a1..f526af4e6 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 1050a8958..88848264e 100644 --- a/pkg/services/object/get/prm.go +++ b/pkg/services/object/get/prm.go @@ -1,14 +1,15 @@ package getsvc import ( + "context" "crypto/ecdsa" "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. @@ -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/remote.go b/pkg/services/object/get/remote.go index ea7bf2393..da310d249 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 70ceadf9f..e69ab4f0f 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" ) @@ -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 { diff --git a/pkg/services/object/get/util.go b/pkg/services/object/get/util.go index abda3d0bf..dc98e6c58 100644 --- a/pkg/services/object/get/util.go +++ b/pkg/services/object/get/util.go @@ -1,17 +1,18 @@ package getsvc import ( + "context" "crypto/ecdsa" "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 { @@ -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/service.go b/pkg/services/object/get/v2/service.go index 029671813..3fd8cd04a 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 26f260413..4347ef416 100644 --- a/pkg/services/object/get/v2/streamer.go +++ b/pkg/services/object/get/v2/streamer.go @@ -1,9 +1,11 @@ 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" + "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" ) type streamObjectWriter struct { @@ -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 1907ae808..e0393e56f 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") @@ -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/head/prm.go b/pkg/services/object/head/prm.go index 604eeb3c9..5566e48fe 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 3db2a7e6e..f50c3422a 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 0ed9a8355..8f2483bc0 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 c0efe5913..98cdfcf95 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 0f1a6423f..7ab5f082c 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 43c636e2c..9f15e834a 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 40a42a33a..8d47e63be 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 592d40cde..f344f77e9 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. @@ -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/prm.go b/pkg/services/object/put/prm.go index 2583410b2..aea5926f4 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 181c3229f..0f0dc355a 100644 --- a/pkg/services/object/put/remote.go +++ b/pkg/services/object/put/remote.go @@ -2,22 +2,23 @@ package putsvc import ( "context" + "crypto/ecdsa" "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 { 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/res.go b/pkg/services/object/put/res.go index c350eed53..c77e535fd 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 7e72df18a..b74c97d49 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" ) @@ -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)) } } diff --git a/pkg/services/object/put/streamer.go b/pkg/services/object/put/streamer.go index e5942d099..ae1a2f451 100644 --- a/pkg/services/object/put/streamer.go +++ b/pkg/services/object/put/streamer.go @@ -2,17 +2,18 @@ package putsvc import ( "context" + "crypto/ecdsa" "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 { @@ -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, } diff --git a/pkg/services/object/put/v2/service.go b/pkg/services/object/put/v2/service.go index 5bcb9a683..7d0dfc613 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 348bdf84a..85827cd4c 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 c1eef4370..790f061f1 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 75a3a7a77..2d6ada5a1 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 697ac7782..4da2b23a7 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 b9db02827..fffcba42a 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 92f1edd18..18700b254 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 8f3fb45be..c80257bd3 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 c4eb49fec..bb3d422b3 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 1a1cb4c1c..aebcfca0f 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 f1e890214..741a224af 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 f73233d39..17e1bc7e0 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 d89d9c983..15e2d53d5 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 f2f73a8f8..a2acb48f3 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 cd5e81ecf..d95c6c906 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 dbb116dd8..585fc659a 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 24b508883..3836103de 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 b35d8445b..33bcd6c11 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 dfac5e553..e2ece5849 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 ad20b3e7b..76e320e0c 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 72b6b5450..beda45c0c 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 04526505a..6cd3856f4 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 9619ab7ec..c09c07cc1 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 eb2a0f2f1..01d607020 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 c1b1b1fed..75d5fbfd1 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 4bb219900..66fd8afe0 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 aa3dc5132..d9578dea3 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 ec3fe6464..39019aa6d 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 d03f5ae4e..379dad0f5 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 829ed9a1b..9d33e8179 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 2b6796c35..8dd0dcabb 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 @@ -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 } diff --git a/pkg/services/object_manager/transformer/fmt.go b/pkg/services/object_manager/transformer/fmt.go index a4706ebd7..c9b5dc967 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 cfd70980d..7b717d3df 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 72e6a742a..0fa3b6436 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 e683f7776..1da07f45d 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" ) @@ -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 } } diff --git a/pkg/services/policer/check_test.go b/pkg/services/policer/check_test.go index 0974b3b61..b40ee90d2 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 20c3d00f8..dba0c1cba 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 eeb9fe491..687216407 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 e2f694036..b8af44049 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 38a65067f..476a5bc0a 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 995be7c78..493982100 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 a103c854b..ec1b55788 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 e420eda25..ebb227b5e 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 ce43994ca..ef11b8122 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 bae0ea4ab..75cdf56ea 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 9922a49f9..36aecb59f 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 f7a7a898e..1b3454412 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 2b3c0f263..b80f6ce52 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 fa88c93aa..aa3190d2b 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 782cbed99..bfa274fea 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 47bfd7321..09286d798 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 2dd878fd1..66d3fd301 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 1d06886f2..e1e572361 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 83f4632ba..87d23c7f2 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 17d58941e..fe9150bcf 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 3b81824dd..16bc61c2f 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 3408eafeb..90a214ebc 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 3410d1738..ddd5a2ae0 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 1a9b23797..c4d9688a9 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 5b928a4a4..55a4d6f3d 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 806f74af7..eb229365e 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 a46cc4c8b..d4e122b0e 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 c4c2ff4d1..7bf56be89 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 522f9482b..3ab72eb5c 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 0b65135ad..385a4243b 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 2c4d19b03..97b9e3a65 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 3410d1738..ddd5a2ae0 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 2c9be7ca2..f0eae16fe 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 a2b3d078f..14acbb64f 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 dc1dba35b..808a0a476 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 5f81ad62b..78af30ea7 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 054069a25..9db06ff1e 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 78255e456..8c5d9091a 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 a9ca74da8..237a13962 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 0678c2dec..cbf93fb1f 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 5f623b597..9e44ae667 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 086b0c3ca..1156dc538 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 9a678a372..f59e312c4 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 ed549a480..860b95897 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 e1606695c..411734ea1 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 316ef5b0c..ded33d1ec 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 e9454635e..dff090078 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 dad3d0113..aa64d796b 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 c4b5836b4..370499e06 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 52f3c6471..73745e1b1 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 98ec2903e..435257550 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 b564d0343..c0750cbdc 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 9833455a5..5feeace91 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 8a3fd6fda..d60bc14c5 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 ee4240880..1671d2511 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 2b5580893..0c3c35f7b 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 acec01f62..3176858e2 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" ) @@ -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/service.pb.go b/pkg/services/tree/service.pb.go index a0aeed7e4..6b5571c3a 100644 --- a/pkg/services/tree/service.pb.go +++ b/pkg/services/tree/service.pb.go @@ -2791,11 +2791,11 @@ var file_pkg_services_tree_service_proto_rawDesc = []byte{ 0x18, 0x2e, 0x74, 0x72, 0x65, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x74, 0x72, 0x65, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, - 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x70, 0x6b, 0x67, - 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x65, 0x65, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x2e, 0x66, 0x72, 0x6f, 0x73, + 0x74, 0x66, 0x73, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, + 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, + 0x64, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, + 0x74, 0x72, 0x65, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/services/tree/service.proto b/pkg/services/tree/service.proto index 804ae2c9d..182d8adb2 100644 --- a/pkg/services/tree/service.proto +++ b/pkg/services/tree/service.proto @@ -7,7 +7,7 @@ package tree; import "pkg/services/tree/types.proto"; -option go_package = "github.com/TrueCloudLab/frostfs-node/pkg/services/tree"; +option go_package = "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"; service TreeService { /* Client API */ diff --git a/pkg/services/tree/service_frostfs.pb.go b/pkg/services/tree/service_frostfs.pb.go index 0eba010a7..42b7ba3fc 100644 --- a/pkg/services/tree/service_frostfs.pb.go +++ b/pkg/services/tree/service_frostfs.pb.go @@ -2,7 +2,7 @@ package tree -import "github.com/TrueCloudLab/frostfs-api-go/v2/util/proto" +import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/proto" // StableSize returns the size of x in protobuf format. // diff --git a/pkg/services/tree/signature.go b/pkg/services/tree/signature.go index 880e1b1ca..7a5a95c4c 100644 --- a/pkg/services/tree/signature.go +++ b/pkg/services/tree/signature.go @@ -7,16 +7,16 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - core "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/client" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + core "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" + "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" + cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "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" "go.uber.org/zap" ) diff --git a/pkg/services/tree/signature_test.go b/pkg/services/tree/signature_test.go index 79ee0a0be..b336e60a2 100644 --- a/pkg/services/tree/signature_test.go +++ b/pkg/services/tree/signature_test.go @@ -6,18 +6,18 @@ import ( "errors" "testing" - aclV2 "github.com/TrueCloudLab/frostfs-api-go/v2/acl" - containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" - "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" - eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + aclV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl" + containercore "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/util/logger" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "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" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + eaclSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index 88dd37b7e..a1bab61de 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -10,11 +10,11 @@ import ( "math/rand" "sync" - "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" - "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" - "github.com/TrueCloudLab/frostfs-node/pkg/network" - cid "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/morph/client/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network" + cid "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" "google.golang.org/grpc" @@ -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 } @@ -288,7 +281,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 } diff --git a/pkg/services/tree/types.pb.go b/pkg/services/tree/types.pb.go index 8cf8fe760..f3f64180a 100644 --- a/pkg/services/tree/types.pb.go +++ b/pkg/services/tree/types.pb.go @@ -154,7 +154,7 @@ type Signature struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Serialized public key as defined in NeoFS API. + // Serialized public key as defined in FrostFS API. Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` // Signature of a message body. Sign []byte `protobuf:"bytes,2,opt,name=sign,json=signature,proto3" json:"sign,omitempty"` @@ -223,11 +223,11 @@ var file_pkg_services_tree_types_proto_rawDesc = []byte{ 0x22, 0x36, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x17, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, - 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, - 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, - 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x72, - 0x65, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x2e, + 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x54, 0x72, 0x75, + 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, + 0x73, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x65, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/services/tree/types.proto b/pkg/services/tree/types.proto index 590fbf3ef..23d73b9ad 100644 --- a/pkg/services/tree/types.proto +++ b/pkg/services/tree/types.proto @@ -5,7 +5,7 @@ syntax = "proto3"; package tree; -option go_package = "github.com/TrueCloudLab/frostfs-node/pkg/services/tree"; +option go_package = "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"; // KeyValue represents key-value pair attached to an object. message KeyValue { diff --git a/pkg/services/tree/types_frostfs.pb.go b/pkg/services/tree/types_frostfs.pb.go index cc18b1c99..8e3c6a026 100644 --- a/pkg/services/tree/types_frostfs.pb.go +++ b/pkg/services/tree/types_frostfs.pb.go @@ -2,7 +2,7 @@ package tree -import "github.com/TrueCloudLab/frostfs-api-go/v2/util/proto" +import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/proto" // StableSize returns the size of x in protobuf format. // diff --git a/pkg/services/util/response/client_stream.go b/pkg/services/util/response/client_stream.go index 8f0a8e038..f167f005a 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 b3b14afcb..8a19fc4e7 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 8a81d66b4..87cc8383d 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 8dbe0a8ab..29cb95314 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 761eaee2a..2478e6256 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 9b3b8ae83..8016c0160 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 d56d36ac7..547c8d50b 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/autocomplete/autocomplete.go b/pkg/util/autocomplete/autocomplete.go index 1343c30a3..4da8ecbfc 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 ` @@ -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": diff --git a/pkg/util/locode/column/coordinates.go b/pkg/util/locode/column/coordinates.go index 462c58e3e..5e32c016e 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 6535c9683..7b29a97c5 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 90acd3ef6..4303228fb 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 fa8d4ead5..dac8cce8b 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 4aabb277a..171808af2 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 0429f99ba..34467d5a2 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 ccc108c17..2d13c6ef9 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 27bf5fc24..2a0f26689 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 9b6d6252f..d22979170 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 c9d7b6677..72daebb2c 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 9673692a1..f91c0cf87 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 37c0812d6..4c414079f 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 7602b2e21..5f40865be 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 aa3d458fa..b2f0f3eb7 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 76ac6c89c..264e90b3c 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 f2ccf32f9..c17a2ec86 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 abac3dbba..031fa883b 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" )