Browse Source

修复崩溃问题

feature_gxh
Sydonian 5 months ago
parent
commit
95f981a9a1
3 changed files with 7 additions and 21 deletions
  1. +5
    -3
      client/internal/uploader/uploader.go
  2. +2
    -1
      client/internal/uploader/user_space_upload.go
  3. +0
    -17
      coordinator/types/storage.go

+ 5
- 3
client/internal/uploader/uploader.go View File

@@ -58,9 +58,11 @@ func (u *Uploader) BeginUpdate(pkgID clitypes.PackageID, affinity clitypes.UserS
for _, space := range spaceDetails { for _, space := range spaceDetails {
latency := time.Duration(math.MaxInt64) latency := time.Duration(math.MaxInt64)


con, ok := cons[space.RecommendHub.HubID]
if ok && con.Latency != nil {
latency = *con.Latency
if space.RecommendHub != nil {
con, ok := cons[space.RecommendHub.HubID]
if ok && con.Latency != nil {
latency = *con.Latency
}
} }


uploadSpaces = append(uploadSpaces, UploadSpaceInfo{ uploadSpaces = append(uploadSpaces, UploadSpaceInfo{


+ 2
- 1
client/internal/uploader/user_space_upload.go View File

@@ -54,7 +54,8 @@ func (u *Uploader) UserSpaceUpload(userSpaceID clitypes.UserSpaceID, rootPath st
}) })


var uploadSpaces []UploadSpaceInfo var uploadSpaces []UploadSpaceInfo
if !stgglb.StandaloneMode {
// TODO 应该要分离Standalone模式和RecommendHub为nil的情况
if !stgglb.StandaloneMode && srcSpace.RecommendHub != nil {
coorCli := stgglb.CoordinatorRPCPool.Get() coorCli := stgglb.CoordinatorRPCPool.Get()
defer coorCli.Release() defer coorCli.Release()




+ 0
- 17
coordinator/types/storage.go View File

@@ -41,7 +41,6 @@ type StorageType interface {
} }


var _ = serder.UseTypeUnionInternallyTagged(types.Ref(types.NewTypeUnion[StorageType]( var _ = serder.UseTypeUnionInternallyTagged(types.Ref(types.NewTypeUnion[StorageType](
// (*MashupStorageType)(nil),
(*LocalType)(nil), (*LocalType)(nil),
(*OBSType)(nil), (*OBSType)(nil),
(*OSSType)(nil), (*OSSType)(nil),
@@ -50,22 +49,6 @@ var _ = serder.UseTypeUnionInternallyTagged(types.Ref(types.NewTypeUnion[Storage
(*S3Type)(nil), (*S3Type)(nil),
)), "type") )), "type")


// // 多种存储服务的混合存储服务。需谨慎选择存储服务的组合,避免出Bug
// type MashupStorageType struct {
// serder.Metadata `union:"Mashup"`
// Type string `json:"type"`
// Store StorageType `json:"store"` // 创建ShardStore或BaseStore时,使用的存储服务类型
// Feature StorageType `json:"feature"` // 根据Feature创建组件时使用的存储服务类型
// }

// func (a *MashupStorageType) GetStorageType() string {
// return "Mashup"
// }

// func (a *MashupStorageType) String() string {
// return "Mashup"
// }

type LocalType struct { type LocalType struct {
serder.Metadata `union:"Local"` serder.Metadata `union:"Local"`
Type string `json:"type"` Type string `json:"type"`


Loading…
Cancel
Save