lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-21 10:07:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename volume tier info to volume info

Browse Source
This commit is contained in:
Chris Lu
2019-12-28 11:21:49 -08:00
parent e8b357fd53
commit 2000284435
9 changed files with 219 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/storage/backend/backend.go
View File

@@ -23,7 +23,7 @@ type BackendStorageFile interface {
type BackendStorage interface {
ToProperties() map[string]string
NewStorageFile(key string, tierInfo *volume_server_pb.VolumeTierInfo) BackendStorageFile
NewStorageFile(key string, tierInfo *volume_server_pb.VolumeInfo) BackendStorageFile
CopyFile(f *os.File, attributes map[string]string, fn func(progressed int64, percentage float32) error) (key string, size int64, err error)
DownloadFile(fileName string, key string, fn func(progressed int64, percentage float32) error) (size int64, err error)
DeleteFile(key string) (err error)

4
weed/storage/backend/s3_backend/s3_backend.go
View File

@@ -61,7 +61,7 @@ func (s *S3BackendStorage) ToProperties() map[string]string {
return m
}
func (s *S3BackendStorage) NewStorageFile(key string, tierInfo *volume_server_pb.VolumeTierInfo) backend.BackendStorageFile {
func (s *S3BackendStorage) NewStorageFile(key string, tierInfo *volume_server_pb.VolumeInfo) backend.BackendStorageFile {
if strings.HasPrefix(key, "/") {
key = key[1:]
}
@@ -107,7 +107,7 @@ func (s *S3BackendStorage) DeleteFile(key string) (err error) {
type S3BackendStorageFile struct {
backendStorage *S3BackendStorage
key string
tierInfo *volume_server_pb.VolumeTierInfo
tierInfo *volume_server_pb.VolumeInfo
}
func (s3backendStorageFile S3BackendStorageFile) ReadAt(p []byte, off int64) (n int, err error) {

8
weed/storage/volume.go
View File

@@ -40,7 +40,7 @@ type Volume struct {
isCompacting bool
volumeTierInfo *volume_server_pb.VolumeTierInfo
volumeInfo *volume_server_pb.VolumeInfo
}
func NewVolume(dirname string, collection string, id needle.VolumeId, needleMapKind NeedleMapType, replicaPlacement *super_block.ReplicaPlacement, ttl *needle.TTL, preallocate int64, memoryMapMaxSizeMb uint32) (v *Volume, e error) {
@@ -225,11 +225,11 @@ func (v *Volume) ToVolumeInformationMessage() *master_pb.VolumeInformationMessag
}
func (v *Volume) RemoteStorageNameKey() (storageName, storageKey string) {
if v.volumeTierInfo == nil {
if v.volumeInfo == nil {
return
}
if len(v.volumeTierInfo.GetFiles()) == 0 {
if len(v.volumeInfo.GetFiles()) == 0 {
return
}
return v.volumeTierInfo.GetFiles()[0].BackendName(), v.volumeTierInfo.GetFiles()[0].GetKey()
return v.volumeInfo.GetFiles()[0].BackendName(), v.volumeInfo.GetFiles()[0].GetKey()
}

2
weed/storage/volume_loading.go
View File

@@ -26,7 +26,7 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind
fileName := v.FileName()
alreadyHasSuperBlock := false
if v.maybeLoadVolumeTierInfo() {
if v.maybeLoadVolumeInfo() {
v.noWriteCanDelete = true
// open remote file
alreadyHasSuperBlock = true

30
weed/storage/volume_tier.go
View File

@@ -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)
}