diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-06-27 09:46:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 09:46:46 -0700 |
| commit | 201023dd159c8d22ad84c6dde3310fdb2062c8c5 (patch) | |
| tree | 732f70f2be41aceb8fab0bc40525013fd4624ca5 /weed | |
| parent | d172d07212d89036d450e2d2bb1aff37bd45101c (diff) | |
| parent | 8aa19577f4f755fc47dafa408da8bfcc23e3ffca (diff) | |
| download | seaweedfs-201023dd159c8d22ad84c6dde3310fdb2062c8c5.tar.xz seaweedfs-201023dd159c8d22ad84c6dde3310fdb2062c8c5.zip | |
Merge pull request #3242 from garenchan/ck-dev1
fix 3238: handle errors for GenerateDirUuid method
Diffstat (limited to 'weed')
| -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, |