Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(backup): fix DBRetentionAndShardFromPath parsing error between different OS #25362

Merged
merged 1 commit into from
Sep 27, 2024
Merged

fix(backup): fix DBRetentionAndShardFromPath parsing error between different OS #25362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cmd/influxd/backup_util/backup_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"io"
"os"
"path/filepath"
"regexp"
"sort"
"strings"
"sync/atomic"

internal "github.com/influxdata/influxdb/cmd/influxd/backup_util/internal"
Expand Down Expand Up @@ -219,10 +219,12 @@ func (w *CountingWriter) BytesWritten() int64 {
return atomic.LoadInt64(&w.Total)
}

// retentionAndShardFromPath will take the shard relative path and split it into the
// retention policy name and shard ID. The first part of the path should be the database name.
var separatorRegexp = regexp.MustCompile(`[/\\]`)

// DBRetentionAndShardFromPath will take the shard relative path and split it into the
// database name, retention policy name and shard ID. The first part of the path should be the database name.
func DBRetentionAndShardFromPath(path string) (db, retention, shard string, err error) {
a := strings.Split(path, string(filepath.Separator))
a := separatorRegexp.Split(path, -1)
if len(a) != 3 {
return "", "", "", fmt.Errorf("expected database, retention policy, and shard id in path: %s", path)
}
Expand Down