TrueCloudLab
/
frostfs-node
17
1
Fork 22
Code Issues 90 Pull Requests 8 Actions Projects Releases Activity

Fix Search for EC-splitted objects #1144

Merged
fyrchik merged 3 commits from aarifullin/frostfs-node:feat/ec_search into master 2024-05-31 18:43:18 +00:00
Conversation 0 Commits 3 Files Changed 7
aarifullin commented 2024-05-21 11:32:01 +00:00
Collaborator
  • Support ec parent filter for Search

Proprely choose root OID for EC-splitted objects:

  • If EC-parent is a part of Split itself, then save to root bucket its parent (if it is not nil);
  • If EC-parent is not a part of Split itself, then save to root bucket OID of this EC-parent.

The container is created with EC-policy:

frostfs-cli container create -r s01.frostfs.devenv:8080 --wallet wallet.json --await --policy 'EC 3.1 CBF 1' --basic-acl 0

Let's make search with --root

frostfs-cli object search -r s01.frostfs.devenv:8080 --wallet wallet.json --cid G6zyDxdkyWhboZq12j8CbZBHVMRGPPjRnt6z3zLeaQQu --root

ROOT

Search with --root should return only user objects.
If an object is small, then EC-parent's OID must be listed.
If an object is big, then the object is Split-ted, and then the parts of Split are EC-splitted. That means, then no EC-parent is listed but only the last part of Split (user object)

frostfs-cli object put -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke --file big_object

Output:

OID: 79xGoKYwhyJQhrDNb7bHhY1WCvN6trHJPTjKkw24c6W9
CID: 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke

Let's search with --root

frostfs-cli object search -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke --root

Output:

Found 1 objects.
79xGoKYwhyJQhrDNb7bHhY1WCvN6trHJPTjKkw24c6W9

Putting small object

frostfs-cli object put -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke --file random_binary_small

frostfs-cli object search -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke --root

Output

79xGoKYwhyJQhrDNb7bHhY1WCvN6trHJPTjKkw24c6W9 # Split
AM5Kx5QnsnbUHHLW37xWiPszn6eTd45irx28vcSqcZjE # EC-parent

Filter ec.parent

frostfs-cli object put -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 7ygY2uqM6eVwBaaM2K3wNn9A434FhnUQEavRA2CDbgKj --file random_binary_small

Output:

OID: AgFKsq3AUbCRw7Dz6nuDBGUHZMkWw36sfBFH4V5YMxJK
CID: 7ygY2uqM6eVwBaaM2K3wNn9A434FhnUQEavRA2CDbgKj

Then

frostfs-cli object search -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 7ygY2uqM6eVwBaaM2K3wNn9A434FhnUQEavRA2CDbgKj --filters '$Object:ec.parent EQ AgFKsq3AUbCRw7Dz6nuDBGUHZMkWw36sfBFH4V5YMxJK'

Output (EC-chunks with this EC-parent):

49bWaPXRVyc3pScj8FUmD83hre9oqbo9Gcm3VEFx2wah
4Q185J53EvL2BWNcK4juU4HKeChLKpmXVxm25orpzws7
4cPj4pg5JLYokTATpRyAH55nAbAAKUwPnCyE8ZXghJ8W
5cTZ7H2dUJs8KBKutENgT8SEtHv5Av8HPmGB2rLbDfop
* Support ec parent filter for `Search` Proprely choose root OID for EC-splitted objects: * If EC-parent is a part of Split itself, then save to root bucket its parent (if it is not nil); * If EC-parent is not a part of Split itself, then save to root bucket OID of this EC-parent. The container is created with `EC`-policy: ```bash frostfs-cli container create -r s01.frostfs.devenv:8080 --wallet wallet.json --await --policy 'EC 3.1 CBF 1' --basic-acl 0 ``` Let's make `search` with `--root` ```bash frostfs-cli object search -r s01.frostfs.devenv:8080 --wallet wallet.json --cid G6zyDxdkyWhboZq12j8CbZBHVMRGPPjRnt6z3zLeaQQu --root ``` ### ROOT Search with `--root` should return only user objects. If an object is small, then EC-parent's OID must be listed. If an object is big, then the object is **Split**-ted, and then the parts of Split are **EC-splitted**. That means, then no EC-parent is listed but only the last part of `Split` (user object) ```bash frostfs-cli object put -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke --file big_object ``` Output: ```bash OID: 79xGoKYwhyJQhrDNb7bHhY1WCvN6trHJPTjKkw24c6W9 CID: 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke ``` Let's search with `--root` ```bash frostfs-cli object search -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke --root ``` Output: ```bash Found 1 objects. 79xGoKYwhyJQhrDNb7bHhY1WCvN6trHJPTjKkw24c6W9 ``` Putting small object ```bash frostfs-cli object put -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke --file random_binary_small ``` ```bash frostfs-cli object search -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 4SJMJNPC4jCVwJBFwzc1SKYqXJCpX8u8yCjmBdsyWQke --root ``` Output ``` 79xGoKYwhyJQhrDNb7bHhY1WCvN6trHJPTjKkw24c6W9 # Split AM5Kx5QnsnbUHHLW37xWiPszn6eTd45irx28vcSqcZjE # EC-parent ``` ### Filter ec.parent ``` frostfs-cli object put -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 7ygY2uqM6eVwBaaM2K3wNn9A434FhnUQEavRA2CDbgKj --file random_binary_small ``` Output: ``` OID: AgFKsq3AUbCRw7Dz6nuDBGUHZMkWw36sfBFH4V5YMxJK CID: 7ygY2uqM6eVwBaaM2K3wNn9A434FhnUQEavRA2CDbgKj ``` Then ```bash frostfs-cli object search -r s01.frostfs.devenv:8080 --wallet wallet.json --cid 7ygY2uqM6eVwBaaM2K3wNn9A434FhnUQEavRA2CDbgKj --filters '$Object:ec.parent EQ AgFKsq3AUbCRw7Dz6nuDBGUHZMkWw36sfBFH4V5YMxJK' ``` Output (EC-chunks with this EC-parent): ``` 49bWaPXRVyc3pScj8FUmD83hre9oqbo9Gcm3VEFx2wah 4Q185J53EvL2BWNcK4juU4HKeChLKpmXVxm25orpzws7 4cPj4pg5JLYokTATpRyAH55nAbAAKUwPnCyE8ZXghJ8W 5cTZ7H2dUJs8KBKutENgT8SEtHv5Av8HPmGB2rLbDfop ```
aarifullin added 2 commits 2024-05-21 11:32:11 +00:00
466078fa55 [#XX] metabase: Support ec parent filter for `Search` 
Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
Tests and linters / Tests (1.21) (pull_request) Failing after 19s Details
Tests and linters / Lint (pull_request) Failing after 2m34s Details
DCO action / DCO (pull_request) Failing after 2m46s Details
Vulncheck / Vulncheck (pull_request) Successful in 3m53s Details
Build / Build Components (1.22) (pull_request) Successful in 6m18s Details
Build / Build Components (1.21) (pull_request) Successful in 6m22s Details
Tests and linters / gopls check (pull_request) Successful in 8m5s Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 11m2s Details
Tests and linters / Staticcheck (pull_request) Successful in 10m36s Details
Tests and linters / Tests (1.22) (pull_request) Successful in 13m31s Details
Tests and linters / Tests with -race (pull_request) Successful in 14m42s Details
ed49239407 [#XX] metabase: Proprely choose root OID for EC-splitted objects 
* If EC-parent is a part of Split itself, then save to root bucket
  its parent;
* If EC-parent is not a part of Split itself, then save to root bucket
  OID of this EC-parent.

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
aarifullin force-pushed feat/ec_search from ed49239407 to e7f09aea0a 2024-05-21 11:32:50 +00:00 Compare
aarifullin requested review from storage-core-committers 2024-05-21 11:32:57 +00:00
aarifullin requested review from storage-core-developers 2024-05-21 11:34:16 +00:00
aarifullin force-pushed feat/ec_search from e7f09aea0a to dac3cc891c 2024-05-21 12:39:18 +00:00 Compare
aarifullin force-pushed feat/ec_search from dac3cc891c to 59fa9bafd4 2024-05-21 12:47:23 +00:00 Compare
aarifullin force-pushed feat/ec_search from 59fa9bafd4 to a2894350a4 2024-05-23 07:47:33 +00:00 Compare
aarifullin added 1 commit 2024-05-29 11:11:08 +00:00
Build / Build Components (1.21) (pull_request) Successful in 2m0s Details
DCO action / DCO (pull_request) Successful in 2m35s Details
Vulncheck / Vulncheck (pull_request) Successful in 2m59s Details
Build / Build Components (1.22) (pull_request) Successful in 3m48s Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 5m41s Details
Tests and linters / gopls check (pull_request) Successful in 6m13s Details
Tests and linters / Staticcheck (pull_request) Successful in 6m33s Details
Tests and linters / Lint (pull_request) Successful in 7m53s Details
Tests and linters / Tests (1.21) (pull_request) Successful in 10m10s Details
Tests and linters / Tests (1.22) (pull_request) Successful in 10m11s Details
Tests and linters / Tests with -race (pull_request) Successful in 10m18s Details
ef3ca4dc36 [#1144] metabase: Save parent attributes for ec-chunks 
Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
acid-ant approved these changes 2024-05-31 08:30:38 +00:00
pkg/local_object_storage/metabase/put.go Outdated
@ -325,1 +344,4 @@
if ech := obj.ECHeader(); ech != nil {
err := f(tx, namedBucketItem{
name: ecParentToChunksBucketName(cnr, bucketName),
acid-ant commented 2024-05-31 08:30:30 +00:00
Collaborator

Am I right that this bucket will be removed automatically here?

Am I right that this bucket will be removed automatically [here](https://git.frostfs.info/TrueCloudLab/frostfs-node/src/commit/92e19feb577242aea36639e554b3cf71fc7085d1/pkg/local_object_storage/metabase/delete.go#L335)?
aarifullin commented 2024-05-31 09:10:34 +00:00
Poster
Collaborator

Yes, it should be

Yes, it should be
aarifullin changed title from Fix Search for EC-splitted objects to WIP: Fix Search for EC-splitted objects 2024-05-31 10:55:29 +00:00
aarifullin force-pushed feat/ec_search from ef3ca4dc36 to 5aacb8fc86 2024-05-31 16:56:21 +00:00 Compare
aarifullin changed title from WIP: Fix Search for EC-splitted objects to Fix Search for EC-splitted objects 2024-05-31 16:56:43 +00:00
aarifullin requested review from acid-ant 2024-05-31 17:02:25 +00:00
acid-ant approved these changes 2024-05-31 17:22:21 +00:00
fyrchik approved these changes 2024-05-31 18:43:07 +00:00
pkg/local_object_storage/metabase/put.go Outdated
@ -346,0 +374,4 @@
var attrs []objectSDK.Attribute
if obj.ECHeader() != nil {
attrs = obj.ECHeader().ParentAttributes()
objKey = objectKey(obj.ECHeader().Parent(), make([]byte, objectKeySize))
fyrchik commented 2024-05-29 11:16:01 +00:00
Owner

We can probably reuse the slice in the second argument, no?

We can probably reuse the slice in the second argument, no?
fyrchik merged commit 5aacb8fc86 into master 2024-05-31 18:43:18 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
acid-ant
fyrchik
TrueCloudLab/storage-core-developers
Labels
Clear labels   
P0

Highest   
P1

High   
P2

Medium   
P3

Low   
badger

Badger DB related issues   
frostfs-adm
   
frostfs-cli
   
frostfs-ir
   
frostfs-lens
   
frostfs-node
   
good first issue

Good for newcomers   
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff   
blocked

The issue or PR is blocked by something   
bug

Something is not working   
config

Configuration format update or breaking change   
discussion

Talking about something in order to reach a decision or to exchange ideas   
documentation

Documentation related   
duplicate

This issue or pull request already exists   
enhancement

New feature   
go

Language features adoption   
help wanted

Extra attention is needed   
internal
   
invalid

Something is wrong   
kludge

This is a kludge and we know it   
observability

Related to metrics, tracing and logs   
perfomance

Perfomance related   
question

More information is needed   
refactoring

Refactoring   
wontfix

This won't be fixed
No Label
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#1144
There is no content yet.
Delete Branch "aarifullin/frostfs-node:feat/ec_search"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?