Skip to content

Commit

Permalink
Method update to unanimous (#535)
Browse files Browse the repository at this point in the history
Signed-off-by: lengrongfu <lenronfu@gmail.com>
  • Loading branch information
lengrongfu committed Aug 12, 2021
1 parent c1c3d65 commit 71ec3a1
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 17 deletions.
9 changes: 6 additions & 3 deletions cdnsystem/daemon/cdn/storage/storage_gc.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,19 @@ func NewStorageCleaner(cfg *GCConfig, driver storedriver.Driver, storageMgr Mana
}

func (cleaner *Cleaner) GC(storagePattern string, force bool) ([]string, error) {
freeSpace, err := cleaner.driver.GetAvailSpace()
freeSpace, err := cleaner.driver.GetFreeSpace()
if err != nil {
if cdnerrors.IsFileNotExist(err) {
err = cleaner.driver.CreateBaseDir()
if err != nil {
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 {
return nil, fmt.Errorf("get available space: %v", err)
return nil, fmt.Errorf("get free space: %v", err)
}
}
fullGC := force
Expand Down
10 changes: 5 additions & 5 deletions cdnsystem/storedriver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ type Driver interface {
// If not, return the ErrFileNotExist.
Stat(raw *Raw) (*StorageInfo, error)

// GetAvailSpace returns the available disk space in B.
GetAvailSpace() (unit.Bytes, error)
// GetFreeSpace returns the available disk space in B.
GetFreeSpace() (unit.Bytes, error)

// GetTotalAndFreeSpace
GetTotalAndFreeSpace() (unit.Bytes, unit.Bytes, error)
Expand Down Expand Up @@ -253,9 +253,9 @@ func (s *driverPlugin) MoveFile(src string, dst string) error {
return s.instance.MoveFile(src, dst)
}

// GetAvailSpace returns the available disk space in B.
func (s *driverPlugin) GetAvailSpace() (unit.Bytes, error) {
return s.instance.GetAvailSpace()
// GetFreeSpace returns the available disk space in B.
func (s *driverPlugin) GetFreeSpace() (unit.Bytes, error) {
return s.instance.GetFreeSpace()
}

func (s *driverPlugin) GetHomePath() string {
Expand Down
4 changes: 2 additions & 2 deletions cdnsystem/storedriver/local/local_driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ func (ds *driver) Remove(raw *storedriver.Raw) error {
return err
}

// GetAvailSpace returns the available disk space in Byte.
func (ds *driver) GetAvailSpace() (unit.Bytes, error) {
// GetFreeSpace returns the available disk space in Byte.
func (ds *driver) GetFreeSpace() (unit.Bytes, error) {
path := ds.BaseDir
lock(path, -1, true)
defer unLock(path, -1, true)
Expand Down
12 changes: 6 additions & 6 deletions cdnsystem/storedriver/mock_driver.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cdnsystem/storedriver/store_mgr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (m mockDriver) Stat(_ *Raw) (*StorageInfo, error) {
panic("implement me")
}

func (m mockDriver) GetAvailSpace() (unit.Bytes, error) {
func (m mockDriver) GetFreeSpace() (unit.Bytes, error) {
panic("implement me")
}

Expand Down
6 changes: 6 additions & 0 deletions docs/zh-CN/design/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@

![alt][download-process]

### 子模块架构

#### CDN模块

![cdn](../images/cdn.png)

### 子系统功能

**Manager**
Expand Down
Binary file added docs/zh-CN/images/cdn.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 71ec3a1

Please sign in to comment.