Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: pick new gvg when retry failed replicate piece task #1393

Closed
wants to merge 1 commit into from
Closed

fix: pick new gvg when retry failed replicate piece task #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions modular/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,23 +508,25 @@ func (m *ManageModular) LoadTaskFromDB() error {
replicateTask.InitReplicatePieceTask(objectInfo, storageParams, m.baseApp.TaskPriority(replicateTask),
m.baseApp.TaskTimeout(replicateTask, objectInfo.GetPayloadSize()), m.baseApp.TaskMaxRetry(replicateTask), meta.IsAgentUpload)

if meta.GlobalVirtualGroupID == 0 {
bucketInfo, err := m.baseApp.GfSpClient().GetBucketByBucketName(context.Background(), objectInfo.BucketName, true)
if err != nil || bucketInfo == nil {
log.Errorw("failed to get bucket by bucket name", "bucket", bucketInfo, "error", err)
return err
}
gvgMeta, err := m.pickGlobalVirtualGroup(context.Background(), bucketInfo.BucketInfo.GlobalVirtualGroupFamilyId, storageParams)
log.Infow("pick global virtual group", "gvg_meta", gvgMeta, "error", err)
if err != nil {
return err
}
replicateTask.GlobalVirtualGroupId = gvgMeta.ID
replicateTask.SecondaryEndpoints = gvgMeta.SecondarySPEndpoints
} else {
replicateTask.GlobalVirtualGroupId = meta.GlobalVirtualGroupID
replicateTask.SecondaryEndpoints = meta.SecondaryEndpoints
//retrieve objects from the database that have not completed the replicate piece, reselect gvg, and then add them to the replicate queue
bucketInfo, err := m.baseApp.GfSpClient().GetBucketByBucketName(context.Background(), objectInfo.BucketName, true)
if err != nil || bucketInfo == nil {
log.Errorw("failed to get bucket by bucket name", "bucket", bucketInfo, "error", err)
return err
}
gvgMeta, err := m.pickGlobalVirtualGroup(context.Background(), bucketInfo.BucketInfo.GlobalVirtualGroupFamilyId, storageParams)
log.Infow("pick global virtual group", "gvg_meta", gvgMeta, "error", err)
if err != nil {
return err
}
replicateTask.GlobalVirtualGroupId = gvgMeta.ID
replicateTask.SecondaryEndpoints = gvgMeta.SecondarySPEndpoints
meta.GlobalVirtualGroupID = gvgMeta.ID
meta.SecondaryEndpoints = gvgMeta.SecondarySPEndpoints
if err = m.baseApp.GfSpDB().UpdateUploadProgress(meta); err != nil {
log.Errorw("failed to update object task state", "task_info", replicateTask.Info(), "error", err)
}

pushErr := m.replicateQueue.Push(replicateTask)
if pushErr != nil {
log.Errorw("failed to push replicate piece task to queue", "object_info", objectInfo, "error", pushErr)
Expand Down
5 changes: 4 additions & 1 deletion modular/manager/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,10 @@ func TestManageModular_LoadTaskFromDB(t *testing.T) {
m3.EXPECT().GetBucketByBucketName(gomock.Any(), gomock.Any(), gomock.Any()).Return(
&types.Bucket{BucketInfo: &types0.BucketInfo{
GlobalVirtualGroupFamilyId: 1,
}}, nil)
}}, nil).AnyTimes()

m1.EXPECT().UpdateUploadProgress(gomock.Any()).Return(
nil).AnyTimes()

vgm := vgmgr.NewMockVirtualGroupManager(ctrl)
manage.virtualGroupManager = vgm
Expand Down
38 changes: 18 additions & 20 deletions modular/manager/task_retry_scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import (
"time"

"github.com/bnb-chain/greenfield-common/go/hash"
"github.com/bnb-chain/greenfield-storage-provider/core/piecestore"

"github.com/bnb-chain/greenfield-storage-provider/base/gfspapp"
"github.com/bnb-chain/greenfield-storage-provider/base/gfsptqueue"
"github.com/bnb-chain/greenfield-storage-provider/base/types/gfsptask"
"github.com/bnb-chain/greenfield-storage-provider/core/piecestore"
"github.com/bnb-chain/greenfield-storage-provider/core/spdb"
"github.com/bnb-chain/greenfield-storage-provider/pkg/log"
"github.com/bnb-chain/greenfield-storage-provider/store/sqldb"
Expand Down Expand Up @@ -212,24 +211,23 @@ func (s *TaskRetryScheduler) retryReplicateTask(meta *spdb.UploadObjectMeta) err
replicateTask.InitReplicatePieceTask(objectInfo, storageParams, s.manager.baseApp.TaskPriority(replicateTask),
s.manager.baseApp.TaskTimeout(replicateTask, objectInfo.GetPayloadSize()), s.manager.baseApp.TaskMaxRetry(replicateTask), meta.IsAgentUpload)

// for objects that have been uploaded but not starting the replication yet, it doesn't have the GVG info the UploadObjectMeta,
// so it needs to pick one to start the replicate task.
if meta.GlobalVirtualGroupID == 0 {
bucketInfo, err := s.manager.baseApp.GfSpClient().GetBucketByBucketName(context.Background(), objectInfo.BucketName, true)
if err != nil || bucketInfo == nil {
log.Errorw("failed to get bucket by bucket name", "bucket", bucketInfo, "error", err)
return err
}
gvgMeta, err := s.manager.pickGlobalVirtualGroup(context.Background(), bucketInfo.BucketInfo.GlobalVirtualGroupFamilyId, storageParams)
log.Infow("pick global virtual group", "gvg_meta", gvgMeta, "error", err)
if err != nil {
return err
}
replicateTask.GlobalVirtualGroupId = gvgMeta.ID
replicateTask.SecondaryEndpoints = gvgMeta.SecondarySPEndpoints
} else {
replicateTask.GlobalVirtualGroupId = meta.GlobalVirtualGroupID
replicateTask.SecondaryEndpoints = meta.SecondaryEndpoints
//retrieve objects from the database that have not completed the replicate piece, reselect gvg, and then add them to the replicate queue
bucketInfo, err := s.manager.baseApp.GfSpClient().GetBucketByBucketName(context.Background(), objectInfo.BucketName, true)
if err != nil || bucketInfo == nil {
log.Errorw("failed to get bucket by bucket name", "bucket", bucketInfo, "error", err)
return err
}
gvgMeta, err := s.manager.pickGlobalVirtualGroup(context.Background(), bucketInfo.BucketInfo.GlobalVirtualGroupFamilyId, storageParams)
log.Infow("pick global virtual group", "gvg_meta", gvgMeta, "error", err)
if err != nil {
return err
}
replicateTask.GlobalVirtualGroupId = gvgMeta.ID
replicateTask.SecondaryEndpoints = gvgMeta.SecondarySPEndpoints
meta.GlobalVirtualGroupID = gvgMeta.ID
meta.SecondaryEndpoints = gvgMeta.SecondarySPEndpoints
if err = s.manager.baseApp.GfSpDB().UpdateUploadProgress(meta); err != nil {
log.Errorw("failed to update object task state", "task_info", replicateTask.Info(), "error", err)
}

err = s.manager.replicateQueue.Push(replicateTask)
Expand Down
Loading