From 03ab0b1b9a0fda4cdb018a3551ed4ad605a0432f Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 28 Dec 2019 21:40:12 -0800 Subject: [PATCH] correct .vif file creation --- weed/pb/volume_info.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/weed/pb/volume_info.go b/weed/pb/volume_info.go index 661e5b003..b2edf9c5e 100644 --- a/weed/pb/volume_info.go +++ b/weed/pb/volume_info.go @@ -52,10 +52,8 @@ func MaybeLoadVolumeInfo(fileName string) (*volume_server_pb.VolumeInfo, bool) { func SaveVolumeInfo(fileName string, volumeInfo *volume_server_pb.VolumeInfo) error { - tierFileName := fileName + ".vif" - - if exists, _, canWrite, _, _ := util.CheckFile(tierFileName); exists && !canWrite { - return fmt.Errorf("%s not writable", tierFileName) + if exists, _, canWrite, _, _ := util.CheckFile(fileName); exists && !canWrite { + return fmt.Errorf("%s not writable", fileName) } m := jsonpb.Marshaler{ @@ -68,9 +66,9 @@ func SaveVolumeInfo(fileName string, volumeInfo *volume_server_pb.VolumeInfo) er return fmt.Errorf("marshal to %s: %v", fileName, marshalErr) } - writeErr := ioutil.WriteFile(tierFileName, []byte(text), 0755) + writeErr := ioutil.WriteFile(fileName, []byte(text), 0755) if writeErr != nil { - return fmt.Errorf("fail to write %s : %v", tierFileName, writeErr) + return fmt.Errorf("fail to write %s : %v", fileName, writeErr) } return nil