mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00
Code Activity

source/local: simplify feature file size checking

Browse source
This commit is contained in:
Markus Lehtonen 2023-09-08 14:56:20 +03:00
parent a2083f81a5
commit a5e78f0849
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/local/local.go
View file

@ -324,23 +324,6 @@ func getFeaturesFromFiles() (map[string]string, error) {
for _, file := range files { for _, file := range files {
fileName := file.Name() fileName := file.Name()
fileInfo, err := file.Info()
if err != nil {
klog.ErrorS(err, "failed to get file info", "fileName", fileName)
continue
}
fileSize := fileInfo.Size()
if fileSize > MaxFeatureFileSize {
klog.ErrorS(
fmt.Errorf("file size limit exceeded: %d bytes > %d bytes", fileSize, MaxFeatureFileSize),
"skipping too big feature file",
"fileName", fileName, "fileSize", fileSize,
)
continue
}
lines, err := getFileContent(fileName) lines, err := getFileContent(fileName)
if err != nil { if err != nil {
klog.ErrorS(err, "failed to read file", "fileName", fileName) klog.ErrorS(err, "failed to read file", "fileName", fileName)
@ -374,6 +357,10 @@ func getFileContent(fileName string) ([][]byte, error) {
} }
if filestat.Mode().IsRegular() { if filestat.Mode().IsRegular() {
if filestat.Size() > MaxFeatureFileSize {
return lines, fmt.Errorf("file size limit exceeded: %d bytes > %d bytes", filestat.Size(), MaxFeatureFileSize)
}
fileContent, err := os.ReadFile(path) fileContent, err := os.ReadFile(path)
// Do not return any lines if an error occurred // Do not return any lines if an error occurred