Browse Source

Merge pull request 'EC的PacketSize保存到备份方式的配置中;优化公共结构体' (#3) from feature_gxh into master

gitlink
baohan 2 years ago
parent
commit
0f674b1099
2 changed files with 3 additions and 8 deletions
  1. +1
    -2
      internal/services/mq/storage.go
  2. +2
    -6
      internal/task/create_ec_package.go

+ 1
- 2
internal/services/mq/storage.go View File

@@ -8,7 +8,6 @@ import (


"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/consts/errorcode"
"gitlink.org.cn/cloudream/common/models"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
"gitlink.org.cn/cloudream/storage-agent/internal/config" "gitlink.org.cn/cloudream/storage-agent/internal/config"
@@ -196,7 +195,7 @@ func (svc *Service) StartStorageCreatePackage(msg *agtmq.StartStorageCreatePacka


objIter := iterator.NewUploadingObjectIterator(fullPath, uploadFilePathes) objIter := iterator.NewUploadingObjectIterator(fullPath, uploadFilePathes)


if msg.Redundancy.Type == models.RedundancyRep {
if msg.Redundancy.IsRepInfo() {
repInfo, err := msg.Redundancy.ToRepInfo() repInfo, err := msg.Redundancy.ToRepInfo()
if err != nil { if err != nil {
logger.Warnf("getting rep redundancy info: %s", err.Error()) logger.Warnf("getting rep redundancy info: %s", err.Error())


+ 2
- 6
internal/task/create_ec_package.go View File

@@ -5,7 +5,6 @@ import (


"gitlink.org.cn/cloudream/common/models" "gitlink.org.cn/cloudream/common/models"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage-agent/internal/config"
"gitlink.org.cn/cloudream/storage-common/pkgs/cmd" "gitlink.org.cn/cloudream/storage-common/pkgs/cmd"
"gitlink.org.cn/cloudream/storage-common/pkgs/iterator" "gitlink.org.cn/cloudream/storage-common/pkgs/iterator"
) )
@@ -29,11 +28,8 @@ func (t *CreateECPackage) Execute(ctx TaskContext, complete CompleteFn) {
log.Debugf("begin") log.Debugf("begin")
defer log.Debugf("end") defer log.Debugf("end")


ret, err := t.cmd.Execute(&cmd.UpdateECPackageContext{
UpdatePackageContext: &cmd.UpdatePackageContext{
Distlock: ctx.distlock,
},
ECPacketSize: config.Cfg().ECPacketSize,
ret, err := t.cmd.Execute(&cmd.UpdatePackageContext{
Distlock: ctx.distlock,
}) })
t.Result = ret t.Result = ret




Loading…
Cancel
Save