diff options
Diffstat (limited to 'weed/storage/volume_tier.go')
| -rw-r--r-- | weed/storage/volume_tier.go | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/weed/storage/volume_tier.go b/weed/storage/volume_tier.go index 5e27562f7..82b822393 100644 --- a/weed/storage/volume_tier.go +++ b/weed/storage/volume_tier.go @@ -13,13 +13,13 @@ import ( "github.com/golang/protobuf/jsonpb" ) -func (v *Volume) GetVolumeTierInfo() *volume_server_pb.VolumeTierInfo { - return v.volumeTierInfo +func (v *Volume) GetVolumeInfo() *volume_server_pb.VolumeInfo { + return v.volumeInfo } -func (v *Volume) maybeLoadVolumeTierInfo() bool { +func (v *Volume) maybeLoadVolumeInfo() bool { - v.volumeTierInfo = &volume_server_pb.VolumeTierInfo{} + v.volumeInfo = &volume_server_pb.VolumeInfo{} tierFileName := v.FileName() + ".vif" @@ -33,7 +33,7 @@ func (v *Volume) maybeLoadVolumeTierInfo() bool { return false } - glog.V(0).Infof("maybeLoadVolumeTierInfo loading volume %d check file", v.Id) + glog.V(0).Infof("maybeLoadVolumeInfo loading volume %d check file", v.Id) tierData, readErr := ioutil.ReadFile(tierFileName) if readErr != nil { @@ -41,26 +41,26 @@ func (v *Volume) maybeLoadVolumeTierInfo() bool { return false } - glog.V(0).Infof("maybeLoadVolumeTierInfo loading volume %d ReadFile", v.Id) + glog.V(0).Infof("maybeLoadVolumeInfo loading volume %d ReadFile", v.Id) - if err := jsonpb.Unmarshal(bytes.NewReader(tierData), v.volumeTierInfo); err != nil { + if err := jsonpb.Unmarshal(bytes.NewReader(tierData), v.volumeInfo); err != nil { glog.Warningf("unmarshal error: %v", err) return false } - glog.V(0).Infof("maybeLoadVolumeTierInfo loading volume %d Unmarshal tierInfo %v", v.Id, v.volumeTierInfo) + glog.V(0).Infof("maybeLoadVolumeInfo loading volume %d Unmarshal tierInfo %v", v.Id, v.volumeInfo) - if len(v.volumeTierInfo.GetFiles()) == 0 { + if len(v.volumeInfo.GetFiles()) == 0 { return false } glog.V(0).Infof("volume %d is tiered to %s as %s and read only", v.Id, - v.volumeTierInfo.Files[0].BackendName(), v.volumeTierInfo.Files[0].Key) + v.volumeInfo.Files[0].BackendName(), v.volumeInfo.Files[0].Key) v.noWriteCanDelete = true v.noWriteOrDelete = false - glog.V(0).Infof("loading volume %d from remote %v", v.Id, v.volumeTierInfo.Files) + glog.V(0).Infof("loading volume %d from remote %v", v.Id, v.volumeInfo.Files) v.LoadRemoteFile() return true @@ -75,18 +75,18 @@ func (v *Volume) HasRemoteFile() bool { } func (v *Volume) LoadRemoteFile() error { - tierFile := v.volumeTierInfo.GetFiles()[0] + tierFile := v.volumeInfo.GetFiles()[0] backendStorage := backend.BackendStorages[tierFile.BackendName()] if v.DataBackend != nil { v.DataBackend.Close() } - v.DataBackend = backendStorage.NewStorageFile(tierFile.Key, v.volumeTierInfo) + v.DataBackend = backendStorage.NewStorageFile(tierFile.Key, v.volumeInfo) return nil } -func (v *Volume) SaveVolumeTierInfo() error { +func (v *Volume) SaveVolumeInfo() error { tierFileName := v.FileName() + ".vif" @@ -99,7 +99,7 @@ func (v *Volume) SaveVolumeTierInfo() error { Indent: " ", } - text, marshalErr := m.MarshalToString(v.GetVolumeTierInfo()) + text, marshalErr := m.MarshalToString(v.GetVolumeInfo()) if marshalErr != nil { return fmt.Errorf("marshal volume %d tier info: %v", v.Id, marshalErr) } |
