TrueCloudLab/xk6-frostfs
42
1
Fork 20
Code Issues 35 Pull requests 2 Releases Activity Actions

Allow registry exporter to work with gRPC objects #142

Merged
fyrchik merged 1 commit from elebedeva/xk6-frostfs:fix/registry-export-grpc-obj into master 2024-06-04 12:17:23 +00:00
Conversation 0 Commits 1 Files changed 1 +45 -6
elebedeva commented 2024-05-31 18:32:04 +00:00
Member
Copy link

Close #139

Added CID and OID keys export if S3Bucket or S3Key is empty.

Signed-off-by: Ekaterina Lebedeva ekaterina.lebedeva@yadro.com

Close #139 Added `CID` and `OID` keys export if `S3Bucket` or `S3Key` is empty. Signed-off-by: Ekaterina Lebedeva <ekaterina.lebedeva@yadro.com>
elebedeva requested review from storage-core-committers 2024-05-31 18:32:16 +00:00
elebedeva requested review from storage-core-developers 2024-05-31 18:32:17 +00:00
fyrchik approved these changes 2024-05-31 18:48:27 +00:00
Dismissed
internal/registry/obj_exporter.go Outdated
@ -69,3 +64,1 @@
comma = ""
for bucket := range bucketMap {
if _, err = f.WriteString(fmt.Sprintf(`%s"%s"`, comma, bucket)); err != nil {
if len(bucketMap) > 1 {
fyrchik commented 2024-05-31 18:48:00 +00:00
Owner
Copy link

This is wrong: len(bucketMap) can happily be 1 if we have exactly 1 S3 bucket, and in this case we need to print it.

What we might do instead is to have 2 maps (bucketMap and containerMap) and add only nonzero keys to them.

This is wrong: `len(bucketMap)` can happily be 1 if we have exactly 1 S3 bucket, and in this case we need to print it. What we might do instead is to have 2 maps (`bucketMap` and `containerMap`) and add only nonzero keys to them.
elebedeva commented 2024-06-03 20:18:11 +00:00
Author
Member
Copy link

fixed

fixed
fyrchik marked this conversation as resolved
internal/registry/obj_exporter.go Outdated
@ -83,0 +85,4 @@
func writeObjectInfo(comma string, info *ObjectInfo, f *os.File) (err error) {
var res string
if info.S3Bucket != "" || info.S3Key != "" {
res += fmt.Sprintf(`%s{"bucket":"%s","object":"%s"}`, comma, info.S3Bucket, info.S3Key)
fyrchik commented 2024-05-31 18:44:55 +00:00
Owner
Copy link

Why is it res += and not res = ?

Why is it `res += ` and not `res = `?
elebedeva commented 2024-06-03 20:19:13 +00:00
Author
Member
Copy link

Didn't notice, fixed

Didn't notice, fixed
fyrchik marked this conversation as resolved
fyrchik dismissed fyrchik's review 2024-05-31 18:48:57 +00:00
Reason:

Approved accidentally

elebedeva force-pushed fix/registry-export-grpc-obj from 91aa27972b to ba769db1e3 2024-06-03 20:16:22 +00:00 Compare
elebedeva requested review from storage-core-committers 2024-06-03 20:19:35 +00:00
acid-ant requested changes 2024-06-04 09:09:24 +00:00
internal/registry/obj_exporter.go Outdated
@ -62,3 +67,3 @@
}
if _, err = f.WriteString(`],"buckets":[`); err != nil {
if len(bucketMap) > 0 {
acid-ant commented 2024-06-04 09:07:07 +00:00
Member
Copy link

Can be shortened to:

if len(bucketMap) > 0 {
  err = writeContainerInfo("buckets", bucketMap, f)
} else {
  err = writeContainerInfo("containers", containerMap, f)
}
return err
Can be shortened to: ``` if len(bucketMap) > 0 { err = writeContainerInfo("buckets", bucketMap, f) } else { err = writeContainerInfo("containers", containerMap, f) } return err ```
elebedeva commented 2024-06-04 09:15:50 +00:00
Author
Member
Copy link

fixed

fixed
elebedeva force-pushed fix/registry-export-grpc-obj from ba769db1e3 to 84f698bbdf 2024-06-04 09:15:06 +00:00 Compare
dstepanov-yadro approved these changes 2024-06-04 09:15:55 +00:00
achuprov approved these changes 2024-06-04 09:45:02 +00:00
fyrchik reviewed 2024-06-04 11:05:03 +00:00
internal/registry/obj_exporter.go Outdated
@ -65,0 +69,4 @@
if len(bucketMap) > 0 {
err = writeContainerInfo("buckets", bucketMap, f)
} else {
err = writeContainerInfo("containers", containerMap, f)
fyrchik commented 2024-06-04 11:05:03 +00:00
Owner
Copy link

This is tricky: each object was either put via gRPC or via S3.
But both can be in the registry at the same time, so we should print both maps, I believe.

This is tricky: each object was either put via gRPC or via S3. But both can be in the registry at the same time, so we should print both maps, I believe.
elebedeva commented 2024-06-04 12:07:09 +00:00
Author
Member
Copy link

fixed

fixed
fyrchik marked this conversation as resolved
fyrchik reviewed 2024-06-04 11:06:03 +00:00
internal/registry/obj_exporter.go Outdated
@ -70,2 +94,2 @@
for bucket := range bucketMap {
if _, err = f.WriteString(fmt.Sprintf(`%s"%s"`, comma, bucket)); err != nil {
comma := ""
for cnr := range cnrMap {
fyrchik commented 2024-06-04 11:06:03 +00:00
Owner
Copy link

This change seems unnecessary and pollutes diff (it was bucketMap, we could continue to accept bucketMap).

This change seems unnecessary and pollutes diff (it was `bucketMap`, we could continue to accept `bucketMap`).
👍 1
fyrchik marked this conversation as resolved
elebedeva force-pushed fix/registry-export-grpc-obj from 84f698bbdf to ebdadf2868 2024-06-04 11:24:24 +00:00 Compare
fyrchik reviewed 2024-06-04 11:33:50 +00:00
internal/registry/obj_exporter.go Outdated
@ -63,2 +69,3 @@
if _, err = f.WriteString(`],"buckets":[`); err != nil {
if len(bucketMap) > 0 {
err = errors.Join(err, writeContainerInfo("buckets", bucketMap, f))
fyrchik commented 2024-06-04 11:33:41 +00:00
Owner
Copy link

Why do you use errors.Join?
Error on write most likely will result in corrupted file (invalid JSON), we should just return the error.

Why do you use `errors.Join`? Error on write most likely will result in corrupted file (invalid JSON), we should just return the error.
elebedeva commented 2024-06-04 11:51:58 +00:00
Author
Member
Copy link

accidentally pushed, will fix

accidentally pushed, will fix
fyrchik marked this conversation as resolved
elebedeva force-pushed fix/registry-export-grpc-obj from ebdadf2868 to 5a547e6d58 2024-06-04 12:03:24 +00:00 Compare
elebedeva force-pushed fix/registry-export-grpc-obj from 5a547e6d58 to 3dd559a7b1 2024-06-04 12:06:16 +00:00 Compare
fyrchik approved these changes 2024-06-04 12:17:02 +00:00
fyrchik merged commit 3dd559a7b1 into master 2024-06-04 12:17:23 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
acid-ant
dstepanov-yadro
achuprov
fyrchik
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
good first issue

Good for newcomers

  
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 labels
P0
P1
P2
P3
good first issue
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 items
No project
Assignees
Clear assignees
No assignees
5 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/xk6-frostfs#142
No description provided.
Delete branch "elebedeva/xk6-frostfs:fix/registry-export-grpc-obj"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?