Browse Source
Merge pull request #1167 from stlpmo-jn/volume_server_core_dump
resolve issue : create volume on no free space disk, the volume server core dump
pull/1171/head
Chris Lu
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
16 additions and
5 deletions
-
weed/storage/volume_create.go
-
weed/storage/volume_create_linux.go
-
weed/storage/volume_create_windows.go
|
|
@ -11,8 +11,11 @@ import ( |
|
|
|
|
|
|
|
func createVolumeFile(fileName string, preallocate int64, memoryMapSizeMB uint32) (backend.BackendStorageFile, error) { |
|
|
|
file, e := os.OpenFile(fileName, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) |
|
|
|
if e != nil { |
|
|
|
return nil, e |
|
|
|
} |
|
|
|
if preallocate > 0 { |
|
|
|
glog.V(0).Infof("Preallocated disk space for %s is not supported", fileName) |
|
|
|
} |
|
|
|
return backend.NewDiskFile(file), e |
|
|
|
return backend.NewDiskFile(file), nil |
|
|
|
} |
|
|
@ -12,9 +12,12 @@ import ( |
|
|
|
|
|
|
|
func createVolumeFile(fileName string, preallocate int64, memoryMapSizeMB uint32) (backend.BackendStorageFile, error) { |
|
|
|
file, e := os.OpenFile(fileName, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) |
|
|
|
if e != nil { |
|
|
|
return nil, e |
|
|
|
} |
|
|
|
if preallocate != 0 { |
|
|
|
syscall.Fallocate(int(file.Fd()), 1, 0, preallocate) |
|
|
|
glog.V(0).Infof("Preallocated %d bytes disk space for %s", preallocate, fileName) |
|
|
|
} |
|
|
|
return backend.NewDiskFile(file), e |
|
|
|
return backend.NewDiskFile(file), nil |
|
|
|
} |
|
|
@ -12,17 +12,22 @@ import ( |
|
|
|
) |
|
|
|
|
|
|
|
func createVolumeFile(fileName string, preallocate int64, memoryMapSizeMB uint32) (backend.BackendStorageFile, error) { |
|
|
|
|
|
|
|
if preallocate > 0 { |
|
|
|
glog.V(0).Infof("Preallocated disk space for %s is not supported", fileName) |
|
|
|
} |
|
|
|
|
|
|
|
if memoryMapSizeMB > 0 { |
|
|
|
file, e := os_overloads.OpenFile(fileName, windows.O_RDWR|windows.O_CREAT, 0644, true) |
|
|
|
return memory_map.NewMemoryMappedFile(file, memoryMapSizeMB), e |
|
|
|
if e != nil { |
|
|
|
return nil, e |
|
|
|
} |
|
|
|
return memory_map.NewMemoryMappedFile(file, memoryMapSizeMB), nil |
|
|
|
} else { |
|
|
|
file, e := os_overloads.OpenFile(fileName, windows.O_RDWR|windows.O_CREAT|windows.O_TRUNC, 0644, false) |
|
|
|
return backend.NewDiskFile(file), e |
|
|
|
if e != nil { |
|
|
|
return nil, e |
|
|
|
} |
|
|
|
return backend.NewDiskFile(file), nil |
|
|
|
} |
|
|
|
|
|
|
|
} |