[#1237] getSvc: Return error if EC object found in REP container
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
parent
4fff95a386
commit
1a289745a4
2 changed files with 7 additions and 21 deletions
|
@ -107,7 +107,7 @@ const (
|
||||||
GetUnableToGetAllPartsECObject = "unable to get all parts, continue to reconstruct with existed"
|
GetUnableToGetAllPartsECObject = "unable to get all parts, continue to reconstruct with existed"
|
||||||
GetUnableToGetPartECObject = "unable to get part of the erasure-encoded object"
|
GetUnableToGetPartECObject = "unable to get part of the erasure-encoded object"
|
||||||
GetUnableToHeadPartECObject = "unable to head part of the erasure-encoded object"
|
GetUnableToHeadPartECObject = "unable to head part of the erasure-encoded object"
|
||||||
GetUnableToGetECObjectContainer = "unable to get container for erasure-coded object"
|
GetECObjectInRepContainer = "found erasure-coded object in REP container"
|
||||||
GetAssemblingSplittedObjectCompleted = "assembling splitted object completed"
|
GetAssemblingSplittedObjectCompleted = "assembling splitted object completed"
|
||||||
GetAssemblingECObjectCompleted = "assembling erasure-coded object completed"
|
GetAssemblingECObjectCompleted = "assembling erasure-coded object completed"
|
||||||
GetFailedToAssembleSplittedObject = "failed to assemble splitted object"
|
GetFailedToAssembleSplittedObject = "failed to assemble splitted object"
|
||||||
|
|
|
@ -7,14 +7,14 @@ import (
|
||||||
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/policy"
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util"
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
|
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
|
||||||
apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
|
apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
|
||||||
objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
|
objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var errECObjectInRepContainer = errors.New("found erasure-coded object in REP container")
|
||||||
|
|
||||||
func (r *request) processNode(ctx context.Context, info client.NodeInfo) bool {
|
func (r *request) processNode(ctx context.Context, info client.NodeInfo) bool {
|
||||||
ctx, span := tracing.StartSpanFromContext(ctx, "getService.processNode")
|
ctx, span := tracing.StartSpanFromContext(ctx, "getService.processNode")
|
||||||
defer span.End()
|
defer span.End()
|
||||||
|
@ -36,11 +36,6 @@ func (r *request) processNode(ctx context.Context, info client.NodeInfo) bool {
|
||||||
switch {
|
switch {
|
||||||
default:
|
default:
|
||||||
r.log.Debug(logs.GetRemoteCallFailed, zap.Error(err))
|
r.log.Debug(logs.GetRemoteCallFailed, zap.Error(err))
|
||||||
if r.status == statusEC {
|
|
||||||
// we need to continue getting another chunks from another nodes
|
|
||||||
// in case of network issue
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
r.status = statusUndefined
|
r.status = statusUndefined
|
||||||
r.err = new(apistatus.ObjectNotFound)
|
r.err = new(apistatus.ObjectNotFound)
|
||||||
case err == nil:
|
case err == nil:
|
||||||
|
@ -65,19 +60,10 @@ func (r *request) processNode(ctx context.Context, info client.NodeInfo) bool {
|
||||||
mergeSplitInfo(r.splitInfo(), errSplitInfo.SplitInfo())
|
mergeSplitInfo(r.splitInfo(), errSplitInfo.SplitInfo())
|
||||||
r.err = objectSDK.NewSplitInfoError(r.infoSplit)
|
r.err = objectSDK.NewSplitInfoError(r.infoSplit)
|
||||||
case errors.As(err, &errECInfo):
|
case errors.As(err, &errECInfo):
|
||||||
r.status = statusEC
|
r.log.Error(logs.GetECObjectInRepContainer, zap.Stringer("address", r.address()))
|
||||||
util.MergeECInfo(r.infoEC, errECInfo.ECInfo())
|
r.status = statusUndefined
|
||||||
r.infoEC = errECInfo.ECInfo()
|
r.err = errECObjectInRepContainer
|
||||||
r.err = objectSDK.NewECInfoError(r.infoEC)
|
return true
|
||||||
if r.isRaw() {
|
|
||||||
return len(r.infoEC.Chunks) == int(r.infoEC.Chunks[0].Total)
|
|
||||||
}
|
|
||||||
cnt, err := r.containerSource.Get(r.address().Container())
|
|
||||||
if err == nil {
|
|
||||||
return len(r.infoEC.Chunks) == policy.ECDataCount(cnt.Value.PlacementPolicy())
|
|
||||||
}
|
|
||||||
r.log.Debug(logs.GetUnableToGetECObjectContainer, zap.Error(err))
|
|
||||||
return len(r.infoEC.Chunks) == int(r.infoEC.Chunks[0].Total)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return r.status != statusUndefined
|
return r.status != statusUndefined
|
||||||
|
|
Loading…
Reference in a new issue