It seems like every upload creates a new StorageInfo object. This makes it very sensitive to slow code paths. A particular slow function is `IsLikelyMountPoint` on Windows since `windows.GetVolumePathName` is slow. We cache the result of this operation. Before: ``` Operation: PUT - Concurrency: 12 * Average: 70.46 MB/s, 70.46 obj/s, 70.46 ops ended/s (59.58s) Aggregated, split into 59 x 1s time segments: * Fastest: 77.67 MB/s, 77.67 obj/s, 79.00 ops ended/s (1s) * 50% Median: 70.84 MB/s, 70.84 obj/s, 70.00 ops ended/s (1s) * Slowest: 61.51 MB/s, 61.51 obj/s, 61.00 ops ended/s (1s) ``` After: ``` Operation: PUT - Concurrency: 12 * Average: 166.80 MB/s, 166.80 obj/s, 166.74 ops ended/s (59.8s) Aggregated, split into 59 x 1s time segments: * Fastest: 183.83 MB/s, 183.83 obj/s, 186.00 ops ended/s (1s) * 50% Median: 167.47 MB/s, 167.47 obj/s, 166.00 ops ended/s (1s) * Slowest: 139.30 MB/s, 139.30 obj/s, 141.00 ops ended/s (1s) ```
61 lines
1.9 KiB
Go
61 lines
1.9 KiB
Go
// +build windows
|
|
|
|
/*
|
|
* MinIO Cloud Storage, (C) 2018 MinIO, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package mountinfo
|
|
|
|
import (
|
|
"path/filepath"
|
|
"sync"
|
|
|
|
"golang.org/x/sys/windows"
|
|
)
|
|
|
|
// CheckCrossDevice - check if any input path has multiple sub-mounts.
|
|
// this is a dummy function and returns nil for now.
|
|
func CheckCrossDevice(paths []string) error {
|
|
return nil
|
|
}
|
|
|
|
// mountPointCache contains results of IsLikelyMountPoint
|
|
var mountPointCache sync.Map
|
|
|
|
// IsLikelyMountPoint determines if a directory is a mountpoint.
|
|
func IsLikelyMountPoint(path string) bool {
|
|
path = filepath.Dir(path)
|
|
if v, ok := mountPointCache.Load(path); ok {
|
|
return v.(bool)
|
|
}
|
|
wpath, _ := windows.UTF16PtrFromString(path)
|
|
wvolume := make([]uint16, len(path)+1)
|
|
|
|
if err := windows.GetVolumePathName(wpath, &wvolume[0], uint32(len(wvolume))); err != nil {
|
|
mountPointCache.Store(path, false)
|
|
return false
|
|
}
|
|
|
|
switch windows.GetDriveType(&wvolume[0]) {
|
|
case windows.DRIVE_FIXED, windows.DRIVE_REMOVABLE, windows.DRIVE_REMOTE, windows.DRIVE_RAMDISK:
|
|
// Recognize "fixed", "removable", "remote" and "ramdisk" drives as proper drives
|
|
// which can be treated as an actual mount-point, rest can be ignored.
|
|
// https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-getdrivetypew
|
|
mountPointCache.Store(path, true)
|
|
return true
|
|
}
|
|
mountPointCache.Store(path, false)
|
|
return false
|
|
}
|