Browse Source

解决调试问题

gitlink
Sydonian 1 year ago
parent
commit
fdf6e6cad0
4 changed files with 8 additions and 14 deletions
  1. +3
    -3
      common/pkgs/cmd/upload_objects.go
  2. +4
    -5
      common/pkgs/db2/storage.go
  3. +1
    -0
      common/pkgs/ioswitch2/agent_worker.go
  4. +0
    -6
      common/pkgs/ioswitch2/http_hub_worker.go

+ 3
- 3
common/pkgs/cmd/upload_objects.go View File

@@ -104,13 +104,13 @@ func (t *UploadObjects) Execute(ctx *UploadObjectsContext) (*UploadObjectsResult
}

// 给上传节点的IPFS加锁
ipfsReqBlder := reqbuilder.NewBuilder()
lockBlder := reqbuilder.NewBuilder()
for _, us := range userStgs {
ipfsReqBlder.Shard().Buzy(us.Storage.Storage.StorageID)
lockBlder.Shard().Buzy(us.Storage.Storage.StorageID)
}
// TODO 考虑加Object的Create锁
// 防止上传的副本被清除
ipfsMutex, err := ipfsReqBlder.MutexLock(ctx.Distlock)
ipfsMutex, err := lockBlder.MutexLock(ctx.Distlock)
if err != nil {
return nil, fmt.Errorf("acquire locks failed, err: %w", err)
}


+ 4
- 5
common/pkgs/db2/storage.go View File

@@ -90,11 +90,10 @@ func (db *StorageDB) FillDetails(ctx SQLContext, details []stgmod.StorageDetail)
stgsMp := make(map[cdssdk.StorageID]*stgmod.StorageDetail)
stgIDs := make([]cdssdk.StorageID, 0, len(details))
var masterHubIDs []cdssdk.NodeID
for _, d := range details {
d2 := d
stgsMp[d.Storage.StorageID] = &d2
stgIDs = append(stgIDs, d.Storage.StorageID)
masterHubIDs = append(masterHubIDs, d.Storage.MasterHub)
for i := range details {
stgsMp[details[i].Storage.StorageID] = &details[i]
stgIDs = append(stgIDs, details[i].Storage.StorageID)
masterHubIDs = append(masterHubIDs, details[i].Storage.MasterHub)
}

// 获取监护Hub信息


+ 1
- 0
common/pkgs/ioswitch2/agent_worker.go View File

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

var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo](
(*AgentWorker)(nil),
(*HttpHubWorker)(nil),
)))

type AgentWorker struct {


+ 0
- 6
common/pkgs/ioswitch2/http_hub_worker.go View File

@@ -6,16 +6,10 @@ import (
"strconv"

"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
"gitlink.org.cn/cloudream/common/pkgs/types"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/sdks/storage/cdsapi"
"gitlink.org.cn/cloudream/common/utils/serder"
)

var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo](
(*HttpHubWorker)(nil),
)))

type HttpHubWorker struct {
Node cdssdk.Node
}


Loading…
Cancel
Save