Method update to unanimous (#535)

Signed-off-by: lengrongfu <lenronfu@gmail.com>
This commit is contained in:
lengrongfu 2021-08-12 13:53:34 +08:00 committed by Gaius
parent 2120051ab0
commit 5f58b7ded8
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
7 changed files with 26 additions and 17 deletions

View File

@ -48,16 +48,19 @@ func NewStorageCleaner(cfg *GCConfig, driver storedriver.Driver, storageMgr Mana
} }
func (cleaner *Cleaner) GC(storagePattern string, force bool) ([]string, error) { func (cleaner *Cleaner) GC(storagePattern string, force bool) ([]string, error) {
freeSpace, err := cleaner.driver.GetAvailSpace() freeSpace, err := cleaner.driver.GetFreeSpace()
if err != nil { if err != nil {
if cdnerrors.IsFileNotExist(err) { if cdnerrors.IsFileNotExist(err) {
err = cleaner.driver.CreateBaseDir() err = cleaner.driver.CreateBaseDir()
if err != nil { if err != nil {
return nil, err return nil, err
} }
freeSpace, _ = cleaner.driver.GetAvailSpace() freeSpace, err = cleaner.driver.GetFreeSpace()
if err != nil {
return nil, fmt.Errorf("get free space: %v", err)
}
} else { } else {
return nil, fmt.Errorf("get available space: %v", err) return nil, fmt.Errorf("get free space: %v", err)
} }
} }
fullGC := force fullGC := force

View File

@ -67,8 +67,8 @@ type Driver interface {
// If not, return the ErrFileNotExist. // If not, return the ErrFileNotExist.
Stat(raw *Raw) (*StorageInfo, error) Stat(raw *Raw) (*StorageInfo, error)
// GetAvailSpace returns the available disk space in B. // GetFreeSpace returns the available disk space in B.
GetAvailSpace() (unit.Bytes, error) GetFreeSpace() (unit.Bytes, error)
// GetTotalAndFreeSpace // GetTotalAndFreeSpace
GetTotalAndFreeSpace() (unit.Bytes, unit.Bytes, error) GetTotalAndFreeSpace() (unit.Bytes, unit.Bytes, error)
@ -253,9 +253,9 @@ func (s *driverPlugin) MoveFile(src string, dst string) error {
return s.instance.MoveFile(src, dst) return s.instance.MoveFile(src, dst)
} }
// GetAvailSpace returns the available disk space in B. // GetFreeSpace returns the available disk space in B.
func (s *driverPlugin) GetAvailSpace() (unit.Bytes, error) { func (s *driverPlugin) GetFreeSpace() (unit.Bytes, error) {
return s.instance.GetAvailSpace() return s.instance.GetFreeSpace()
} }
func (s *driverPlugin) GetHomePath() string { func (s *driverPlugin) GetHomePath() string {

View File

@ -316,8 +316,8 @@ func (ds *driver) Remove(raw *storedriver.Raw) error {
return err return err
} }
// GetAvailSpace returns the available disk space in Byte. // GetFreeSpace returns the available disk space in Byte.
func (ds *driver) GetAvailSpace() (unit.Bytes, error) { func (ds *driver) GetFreeSpace() (unit.Bytes, error) {
path := ds.BaseDir path := ds.BaseDir
lock(path, -1, true) lock(path, -1, true)
defer unLock(path, -1, true) defer unLock(path, -1, true)

View File

@ -78,19 +78,19 @@ func (mr *MockDriverMockRecorder) Get(arg0 interface{}) *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDriver)(nil).Get), arg0) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDriver)(nil).Get), arg0)
} }
// GetAvailSpace mocks base method. // GetFreeSpace mocks base method.
func (m *MockDriver) GetAvailSpace() (unit.Bytes, error) { func (m *MockDriver) GetFreeSpace() (unit.Bytes, error) {
m.ctrl.T.Helper() m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetAvailSpace") ret := m.ctrl.Call(m, "GetFreeSpace")
ret0, _ := ret[0].(unit.Bytes) ret0, _ := ret[0].(unit.Bytes)
ret1, _ := ret[1].(error) ret1, _ := ret[1].(error)
return ret0, ret1 return ret0, ret1
} }
// GetAvailSpace indicates an expected call of GetAvailSpace. // GetFreeSpace indicates an expected call of GetFreeSpace.
func (mr *MockDriverMockRecorder) GetAvailSpace() *gomock.Call { func (mr *MockDriverMockRecorder) GetFreeSpace() *gomock.Call {
mr.mock.ctrl.T.Helper() mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAvailSpace", reflect.TypeOf((*MockDriver)(nil).GetAvailSpace)) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFreeSpace", reflect.TypeOf((*MockDriver)(nil).GetFreeSpace))
} }
// GetBytes mocks base method. // GetBytes mocks base method.

View File

@ -60,7 +60,7 @@ func (m mockDriver) Stat(_ *Raw) (*StorageInfo, error) {
panic("implement me") panic("implement me")
} }
func (m mockDriver) GetAvailSpace() (unit.Bytes, error) { func (m mockDriver) GetFreeSpace() (unit.Bytes, error) {
panic("implement me") panic("implement me")
} }

View File

@ -40,6 +40,12 @@
![alt][download-process] ![alt][download-process]
### 子模块架构
#### CDN模块
![cdn](../images/cdn.png)
### 子系统功能 ### 子系统功能
**Manager** **Manager**

BIN
docs/zh-CN/images/cdn.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 KiB