Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: support absolute file paths in check-schema (#23991) 

Absolute file paths in influx_inspect check-schema
cause an 'Invalid Argument' error. This was caused
fs.WalkDir using fs.ValidPath. Replacing with
filepath.WalkDir permits absolute paths.

closes https://github.com/influxdata/influxdb/issues/23987
pull/24036/head
davidby-influx 2022-12-19 12:59:56 -08:00 committed by GitHub
parent 657c2d7a2a
commit 144aca1f7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/influx_inspect/type_conflicts/type_conflicts.go
View File

@ -11,6 +11,7 @@ import (
"path/filepath"
"strings"
errors2 "github.com/influxdata/influxdb/pkg/errors"
"github.com/influxdata/influxdb/tsdb"
)
@ -37,6 +38,11 @@ func (tc *TypeConflictChecker) Run(args ...string) error {
// Get a set of every measurement/field/type tuple present.
var schema Schema
var err error
tc.Path, err = filepath.Abs(tc.Path)
if err != nil {
return err
}
schema, err = tc.readFields()
if err != nil {
return err
@ -64,8 +70,7 @@ func (tc *TypeConflictChecker) readFields() (Schema, error) {
} else {
root = path.Dir(tc.Path)
}
fileSystem := os.DirFS(".")
err = fs.WalkDir(fileSystem, root, func(path string, d fs.DirEntry, err error) error {
err = filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) (rErr error) {
if err != nil {
return fmt.Errorf("error walking file: %w", err)
}
@ -80,6 +85,9 @@ func (tc *TypeConflictChecker) readFields() (Schema, error) {
return nil
}
dirs := strings.Split(path, string(os.PathSeparator))
if len(dirs) < 4 {
return fmt.Errorf("wrong directory structure for InfluxDB: %q", path)
}
db := dirs[len(dirs)-4]
rp := dirs[len(dirs)-3]
fmt.Printf("Processing %s\n", path)
@ -91,7 +99,7 @@ func (tc *TypeConflictChecker) readFields() (Schema, error) {
}
return fmt.Errorf("unable to open file %q: %w", path, err)
}
defer mfs.Close()
defer errors2.Capture(&rErr, mfs.Close)()
measurements := mfs.MeasurementNames()
for _, m := range measurements {