[#1312] Drop handling of system attributes with NeoFS prefix
All checks were successful
DCO action / DCO (pull_request) Successful in 1m3s
Tests and linters / Run gofumpt (pull_request) Successful in 1m15s
Vulncheck / Vulncheck (pull_request) Successful in 1m15s
Pre-commit hooks / Pre-commit (pull_request) Successful in 2m8s
Build / Build Components (pull_request) Successful in 2m18s
Tests and linters / gopls check (pull_request) Successful in 2m36s
Tests and linters / Staticcheck (pull_request) Successful in 2m48s
Tests and linters / Lint (pull_request) Successful in 3m34s
Tests and linters / Tests (pull_request) Successful in 4m10s
Tests and linters / Tests with -race (pull_request) Successful in 5m59s
All checks were successful
DCO action / DCO (pull_request) Successful in 1m3s
Tests and linters / Run gofumpt (pull_request) Successful in 1m15s
Vulncheck / Vulncheck (pull_request) Successful in 1m15s
Pre-commit hooks / Pre-commit (pull_request) Successful in 2m8s
Build / Build Components (pull_request) Successful in 2m18s
Tests and linters / gopls check (pull_request) Successful in 2m36s
Tests and linters / Staticcheck (pull_request) Successful in 2m48s
Tests and linters / Lint (pull_request) Successful in 3m34s
Tests and linters / Tests (pull_request) Successful in 4m10s
Tests and linters / Tests with -race (pull_request) Successful in 5m59s
Signed-off-by: Aleksey Savchuk <a.savchuk@yadro.com>
This commit is contained in:
parent
96308a26c6
commit
eedae67612
5 changed files with 4 additions and 8 deletions
|
@ -70,7 +70,7 @@ var listContainerObjectsCmd = &cobra.Command{
|
|||
attrs := resHead.Header().Attributes()
|
||||
for i := range attrs {
|
||||
attrKey := attrs[i].Key()
|
||||
if !strings.HasPrefix(attrKey, v2object.SysAttributePrefix) && !strings.HasPrefix(attrKey, v2object.SysAttributePrefixNeoFS) {
|
||||
if !strings.HasPrefix(attrKey, v2object.SysAttributePrefix) {
|
||||
// FIXME(@cthulhu-rider): https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go/issues/97
|
||||
// Use dedicated method to skip system attributes.
|
||||
cmd.Printf(" %s: %s\n", attrKey, attrs[i].Value())
|
||||
|
|
|
@ -361,7 +361,7 @@ func (v *FormatValidator) checkIfExpired(ctx context.Context, obj *objectSDK.Obj
|
|||
|
||||
func expirationEpochAttribute(obj *objectSDK.Object) (uint64, error) {
|
||||
for _, a := range obj.Attributes() {
|
||||
if a.Key() != objectV2.SysAttributeExpEpoch && a.Key() != objectV2.SysAttributeExpEpochNeoFS {
|
||||
if a.Key() != objectV2.SysAttributeExpEpoch {
|
||||
continue
|
||||
}
|
||||
|
||||
|
|
|
@ -387,10 +387,6 @@ func hasExpirationEpoch(obj *objectSDK.Object) (uint64, bool) {
|
|||
attributes = ech.ParentAttributes()
|
||||
}
|
||||
for _, attr := range attributes {
|
||||
if attr.Key() == objectV2.SysAttributeExpEpochNeoFS {
|
||||
expEpoch, err := strconv.ParseUint(attr.Value(), 10, 64)
|
||||
return expEpoch, err == nil
|
||||
}
|
||||
if attr.Key() == objectV2.SysAttributeExpEpoch {
|
||||
expEpoch, err := strconv.ParseUint(attr.Value(), 10, 64)
|
||||
return expEpoch, err == nil
|
||||
|
|
|
@ -252,7 +252,7 @@ func getNextObjectsWithExpirationEpochBatch(ctx context.Context, db *bbolt.DB, i
|
|||
continue
|
||||
}
|
||||
attributeKey := string(attrKey[1+cidSize:])
|
||||
if attributeKey != objectV2.SysAttributeExpEpochNeoFS && attributeKey != objectV2.SysAttributeExpEpoch {
|
||||
if attributeKey != objectV2.SysAttributeExpEpoch {
|
||||
continue
|
||||
}
|
||||
var containerID cid.ID
|
||||
|
|
|
@ -74,7 +74,7 @@ func (g *ExpirationChecker) IsTombstoneAvailable(ctx context.Context, a oid.Addr
|
|||
|
||||
func (g *ExpirationChecker) handleTS(addr string, ts *objectSDK.Object, reqEpoch uint64) bool {
|
||||
for _, atr := range ts.Attributes() {
|
||||
if atr.Key() == objectV2.SysAttributeExpEpoch || atr.Key() == objectV2.SysAttributeExpEpochNeoFS {
|
||||
if atr.Key() == objectV2.SysAttributeExpEpoch {
|
||||
epoch, err := strconv.ParseUint(atr.Value(), 10, 64)
|
||||
if err != nil {
|
||||
g.log.Warn(
|
||||
|
|
Loading…
Reference in a new issue