diff options
| author | chrislu <chris.lu@gmail.com> | 2022-06-27 12:40:50 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-06-27 12:40:50 -0700 |
| commit | 4b1f48a399ac8e18154929b942d47e10c60a54d9 (patch) | |
| tree | a93a65a5a00ee3ec6ec4fcb8e88fdcfc42148331 /weed/storage | |
| parent | 4a65159250c0ca7cf0fc203dd300bf402c1016f9 (diff) | |
| parent | dc6b1a52e8a2b34c1e775fe21013e366c6a37ca6 (diff) | |
| download | seaweedfs-4b1f48a399ac8e18154929b942d47e10c60a54d9.tar.xz seaweedfs-4b1f48a399ac8e18154929b942d47e10c60a54d9.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
Diffstat (limited to 'weed/storage')
| -rw-r--r-- | weed/storage/disk_location.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/weed/storage/disk_location.go b/weed/storage/disk_location.go index 289fd3b47..847324838 100644 --- a/weed/storage/disk_location.go +++ b/weed/storage/disk_location.go @@ -44,13 +44,11 @@ func GenerateDirUuid(dir string) (dirUuidString string, err error) { dirUuidString = dirUuid.String() writeErr := util.WriteFile(fileName, []byte(dirUuidString), 0644) if writeErr != nil { - glog.Warningf("failed to write uuid to %s : %v", fileName, writeErr) return "", fmt.Errorf("failed to write uuid to %s : %v", fileName, writeErr) } } else { uuidData, readErr := os.ReadFile(fileName) if readErr != nil { - glog.Warningf("failed to read uuid from %s : %v", fileName, readErr) return "", fmt.Errorf("failed to read uuid from %s : %v", fileName, readErr) } dirUuidString = string(uuidData) @@ -65,7 +63,10 @@ func NewDiskLocation(dir string, maxVolumeCount int, minFreeSpace util.MinFreeSp } else { idxDir = util.ResolvePath(idxDir) } - dirUuid, _ := GenerateDirUuid(dir) + dirUuid, err := GenerateDirUuid(dir) + if err != nil { + glog.Fatalf("cannot generate uuid of dir %s: %v", dir, err) + } location := &DiskLocation{ Directory: dir, DirectoryUuid: dirUuid, |