TrueCloudLab
/
frostfs-node
18
1
Fork 20
Code Issues 88 Pull Requests 8 Actions Releases Activity

[#86] node: Move testing utils to one package #150

Merged
fyrchik merged 1 commits from aarifullin/frostfs-node:refactor/86-move_test_utils into master 2023-03-23 08:19:16 +00:00
Conversation 0 Commits 1 Files Changed 41
aarifullin commented 2023-03-20 16:17:59 +00:00
Collaborator

Move testing utils from tests in local_object_storage package to
unified testutil package

Signed-off-by: Airat Arifullin aarifullin@yadro.com

Move testing utils from tests in local_object_storage package to unified testutil package Signed-off-by: Airat Arifullin <aarifullin@yadro.com>
acid-ant approved these changes 2023-03-20 17:44:21 +00:00
aarifullin force-pushed refactor/86-move_test_utils from b1a06a5084 to 98bf8ef58f 2023-03-21 07:14:12 +00:00 Compare
fyrchik was assigned by aarifullin 2023-03-21 07:16:30 +00:00
ale64bit was assigned by aarifullin 2023-03-21 07:16:31 +00:00
aarifullin requested review from acid-ant 2023-03-21 07:22:30 +00:00
fyrchik added the due date 2023-03-22 2023-03-21 07:30:51 +00:00
ale64bit requested changes 2023-03-21 08:00:27 +00:00
pkg/local_object_storage/internal/testutil/object.go Outdated
@ -0,0 +1,66 @@
package testutil
import (
"crypto/rand"
ale64bit commented 2023-03-21 07:52:34 +00:00
Collaborator

crypto/rand seems like overkill here. Maybe use golang.org/x/exp/rand instead.

`crypto/rand` seems like overkill here. Maybe use `golang.org/x/exp/rand` instead.
👍 1
aarifullin marked this conversation as resolved
pkg/local_object_storage/internal/testutil/object.go Outdated
@ -0,0 +19,4 @@
}
func GenerateObjectWithCID(cnr cid.ID) *object.Object {
data := make([]byte, 32)
ale64bit commented 2023-03-21 07:53:03 +00:00
Collaborator

the data size should probably be a parameter.

the data size should probably be a parameter.
aarifullin commented 2023-03-21 11:14:20 +00:00
Poster
Collaborator

Fow now the package contains two methods: GenerateObject that generates an object with default size 32 and GenerateObjectWithSize to create it with given size. IMHO, this will make the refactoring not so cumbersome

Fow now the package contains two methods: `GenerateObject` that generates an object with default size `32` and `GenerateObjectWithSize` to create it with given size. IMHO, this will make the refactoring not so cumbersome
👍 1
ale64bit marked this conversation as resolved
pkg/local_object_storage/internal/testutil/object.go Outdated
@ -0,0 +63,4 @@
obj.SetPayload(buf)
obj.SetPayloadSize(uint64(size))
}
ale64bit commented 2023-03-21 07:54:49 +00:00
Collaborator

Consider moving the generators here and remove the TODO from https://git.frostfs.info/TrueCloudLab/frostfs-node/src/branch/master/pkg/local_object_storage/blobstor/perf_test.go#L257-L402

Consider moving the generators here and remove the TODO from https://git.frostfs.info/TrueCloudLab/frostfs-node/src/branch/master/pkg/local_object_storage/blobstor/perf_test.go#L257-L402
aarifullin commented 2023-03-21 11:16:46 +00:00
Poster
Collaborator

I've moved the generators to testutil and reused GenerateObject... methods. Hope it looks good

I've moved the generators to `testutil` and reused `GenerateObject...` methods. Hope it looks good
👍 1
ale64bit marked this conversation as resolved
aarifullin force-pushed refactor/86-move_test_utils from 98bf8ef58f to 0a85874664 2023-03-21 11:08:49 +00:00 Compare
aarifullin force-pushed refactor/86-move_test_utils from 0a85874664 to 9922546cb2 2023-03-21 12:44:11 +00:00 Compare
aarifullin force-pushed refactor/86-move_test_utils from 9922546cb2 to f893683b02 2023-03-21 13:41:27 +00:00 Compare
fyrchik reviewed 2023-03-21 14:46:20 +00:00
pkg/local_object_storage/internal/testutil/object.go Outdated
@ -0,0 +28,4 @@
return GenerateObjectWithCIDWithSize(cnr, defaultDataSize)
}
func GenerateObjectWithSize(sz uint64) *object.Object {
fyrchik commented 2023-03-21 14:44:17 +00:00
Owner

It seems to be used only 3 times and only privately, do we need this function?

It seems to be used only 3 times and only privately, do we need this function?
fyrchik commented 2023-03-21 14:44:17 +00:00
Owner

It seems to be used only 3 times and only privately, do we need this function?

It seems to be used only 3 times and only privately, do we need this function?
aarifullin commented 2023-03-21 17:06:17 +00:00
Poster
Collaborator

Followed this suggestion: #150 (comment)

Anyway, let's keep it but I'll make it private?

Followed this suggestion: https://git.frostfs.info/TrueCloudLab/frostfs-node/pulls/150#issuecomment-2679 Anyway, let's keep it but I'll make it private?
fyrchik commented 2023-03-22 07:27:29 +00:00
Owner

To me it is an unnecessary abstraction, given that providing freshly generated CID is trivial.

To me it is an unnecessary abstraction, given that providing freshly generated CID is trivial.
aarifullin commented 2023-03-22 10:12:03 +00:00
Poster
Collaborator

Okay. I removed GenerateObjectWithSize

Okay. I removed `GenerateObjectWithSize`
fyrchik marked this conversation as resolved
pkg/local_object_storage/internal/testutil/object.go Outdated
@ -0,0 +86,4 @@
}
// AddressGenerator is the interface of types that generate object addresses.
type AddressGenerator interface {
fyrchik commented 2023-03-21 14:44:54 +00:00
Owner

Can we move generators to a separate file?

Can we move generators to a separate file?
aarifullin marked this conversation as resolved
dstepanov-yadro reviewed 2023-03-21 14:53:43 +00:00
pkg/local_object_storage/internal/testutil/object.go Outdated
@ -0,0 +6,4 @@
"go.uber.org/atomic"
"golang.org/x/exp/rand"
dstepanov-yadro commented 2023-03-21 14:48:21 +00:00
Collaborator

Why are the import blocks separated?

Why are the import blocks separated?
aarifullin commented 2023-03-21 17:04:47 +00:00
Poster
Collaborator

Sorry, I just did the same on my previous work :)
The reason for the separate group: these are third-party packages (neither std's nor frostfs')

If it's unnecessary, I can unite them with third group

Sorry, I just did the same on my previous work :) The reason for the separate group: these are third-party packages (neither std's nor frostfs') If it's unnecessary, I can unite them with third group
carpawell commented 2023-03-21 19:07:19 +00:00
Collaborator

i think they should be either separated or be merged through the whole repo

i think they should be either separated or be merged through the whole repo
fyrchik commented 2023-03-22 07:16:11 +00:00
Owner

Across the repo we use 2 groups: stdlib and everything else.

Across the repo we use 2 groups: stdlib and everything else.
aarifullin commented 2023-03-22 07:25:51 +00:00
Poster
Collaborator

Okay. Fixed

Okay. Fixed
fyrchik marked this conversation as resolved
pkg/local_object_storage/internal/testutil/object.go Outdated
@ -0,0 +90,4 @@
Next() oid.Address
}
// seqAddrGenerator is an AddressGenerator that generates addresses sequentially and wraps around the given max ID.
dstepanov-yadro commented 2023-03-21 14:50:29 +00:00
Collaborator

I think that these comments should either be deleted or formated correctly. I like the first option better.

I think that these comments should either be deleted or formated correctly. I like the first option better.
aarifullin commented 2023-03-21 17:50:17 +00:00
Poster
Collaborator

I am not the author of these comments but I suggest just to reformat comments in correct way :) (already edited)

I am not the author of these comments but I suggest just to reformat comments in correct way :) (already edited)
aarifullin force-pushed refactor/86-move_test_utils from f893683b02 to 753cdd6147 2023-03-21 17:59:23 +00:00 Compare
carpawell requested review from ale64bit 2023-03-21 19:07:38 +00:00
carpawell requested review from storage-core-committers 2023-03-21 19:07:47 +00:00
carpawell requested review from storage-core-developers 2023-03-21 19:07:47 +00:00
carpawell reviewed 2023-03-21 19:12:13 +00:00
carpawell left a comment
Collaborator

Can you, please, capitalize "Move" word in the commit message? It is widely adopted format in our repos.

Can you, please, capitalize "Move" word in the commit message? It is widely adopted format in our repos.
👍 1
aarifullin force-pushed refactor/86-move_test_utils from 753cdd6147 to 92fd33a6aa 2023-03-22 07:13:12 +00:00 Compare
aarifullin force-pushed refactor/86-move_test_utils from 92fd33a6aa to e706f82f8f 2023-03-22 07:22:53 +00:00 Compare
aarifullin force-pushed refactor/86-move_test_utils from e706f82f8f to e3433cc3d9 2023-03-22 07:23:46 +00:00 Compare
aarifullin changed title from [#86] node: move testing utils to one package to [#86] node: Move testing utils to one package 2023-03-22 07:23:58 +00:00
aarifullin force-pushed refactor/86-move_test_utils from e3433cc3d9 to 2efa3b8f0d 2023-03-22 07:25:33 +00:00 Compare
dstepanov-yadro approved these changes 2023-03-22 07:55:56 +00:00
aarifullin force-pushed refactor/86-move_test_utils from 2efa3b8f0d to 15585e85dc 2023-03-22 10:10:19 +00:00 Compare
fyrchik approved these changes 2023-03-23 06:21:42 +00:00
aarifullin force-pushed refactor/86-move_test_utils from 15585e85dc to 54fb265598 2023-03-23 07:16:52 +00:00 Compare
aarifullin requested review from dstepanov-yadro 2023-03-23 07:30:42 +00:00
aarifullin requested review from fyrchik 2023-03-23 07:30:45 +00:00
dstepanov-yadro approved these changes 2023-03-23 08:11:40 +00:00
fyrchik approved these changes 2023-03-23 08:12:00 +00:00
fyrchik merged commit 9808dec591 into master 2023-03-23 08:19:16 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
acid-ant
ale64bit
dstepanov-yadro
fyrchik
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
Assignees
Clear assignees
No Assignees
fyrchik
ale64bit
6 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

2023-03-22

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#150
There is no content yet.
Delete Branch "aarifullin/frostfs-node:refactor/86-move_test_utils"

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?