fix: rewrite StorageLocationMap DecodeMsgpack as it only works with a temporary map

This commit is contained in:
Derrick Hammer 2024-01-09 15:50:14 -05:00
parent c137d75b24
commit b7107989d3
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 28 additions and 10 deletions

View File

@ -127,21 +127,37 @@ func (ssl *SignedStorageLocationImpl) Location() interfaces.StorageLocation {
} }
func (s *StorageLocationMap) DecodeMsgpack(dec *msgpack.Decoder) error { func (s *StorageLocationMap) DecodeMsgpack(dec *msgpack.Decoder) error {
temp, err := dec.DecodeUntypedMap()
if err != nil {
return err
}
if *s == nil { if *s == nil {
*s = make(map[int]NodeStorage) *s = make(StorageLocationMap)
} }
tempMap, ok := interface{}(temp).(StorageLocationMap) // Decode directly into a temp map
if !ok { temp := make(map[int]map[string]map[int]interface{})
return fmt.Errorf("unexpected data format from msgpack decoding") err := dec.Decode(&temp)
if err != nil {
return fmt.Errorf("error decoding msgpack: %w", err)
} }
*s = tempMap // Convert temp map to StorageLocationMap
for k, v := range temp {
nodeStorage, exists := (*s)[k]
if !exists {
nodeStorage = make(NodeStorage, len(v)) // preallocate if size is known
(*s)[k] = nodeStorage
}
for nk, nv := range v {
nodeDetailsStorage, exists := nodeStorage[nk]
if !exists {
nodeDetailsStorage = make(NodeDetailsStorage, len(nv)) // preallocate if size is known
nodeStorage[nk] = nodeDetailsStorage
}
for ndk, ndv := range nv {
nodeDetailsStorage[ndk] = ndv
}
}
}
return nil return nil
} }
@ -225,7 +241,9 @@ func (s *StorageLocationProviderImpl) Start() error {
break break
} }
//s.node.Logger().Debug("New URIs", zap.Any("uris", newUris), zap.Any("availableNodes", s.availableNodes), zap.Any("timeout", s.timeout), zap.Any("isTimedOut", s.isTimedOut), zap.Any("isWaitingForUri", s.isWaitingForUri), zap.Any("requestSent", requestSent))
if len(s.availableNodes) == 0 && len(newUris) < 2 && !requestSent { if len(s.availableNodes) == 0 && len(newUris) < 2 && !requestSent {
s.node.Logger().Debug("Sending hash request")
err := s.node.Services().P2P().SendHashRequest(s.hash, s.types) err := s.node.Services().P2P().SendHashRequest(s.hash, s.types)
if err != nil { if err != nil {
s.node.Logger().Error("Error sending hash request", zap.Error(err)) s.node.Logger().Error("Error sending hash request", zap.Error(err))