mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Change file names and maker parsing safer

Browse source
This commit is contained in:
Fabian Reinartz 2017-01-06 13:13:22 +01:00
parent 96c2bd249f
commit 2eb544c98e
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
block.go
View file

@ -101,11 +101,11 @@ func (pb *persistedBlock) interval() (int64, int64) {
} }
func chunksFileName(path string) string { func chunksFileName(path string) string {
return filepath.Join(path, "000-series") return filepath.Join(path, "chunks-000")
} }
func indexFileName(path string) string { func indexFileName(path string) string {
return filepath.Join(path, "000-index") return filepath.Join(path, "index-000")
} }
type mmapFile struct { type mmapFile struct {

20
db.go
View file

@ -10,6 +10,7 @@ import (
"path/filepath" "path/filepath"
"reflect" "reflect"
"strconv" "strconv"
"strings"
"sync" "sync"
"unsafe" "unsafe"
@ -216,7 +217,10 @@ func isBlockDir(fi os.FileInfo) bool {
if !fi.IsDir() { if !fi.IsDir() {
return false return false
} }
if _, err := strconv.ParseUint(fi.Name(), 10, 32); err != nil { if !strings.HasPrefix(fi.Name(), "b-") {
return false
}
if _, err := strconv.ParseUint(fi.Name()[2:], 10, 32); err != nil {
return false return false
} }
return true return true
@ -475,13 +479,19 @@ func (p *DB) nextBlockDir() (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
i := uint64(0) i := uint64(0)
if len(names) > 0 { for _, n := range names {
if i, err = strconv.ParseUint(names[len(names)-1], 10, 32); err != nil { if !strings.HasPrefix(n, "b-") {
return "", err continue
} }
j, err := strconv.ParseUint(n[2:], 10, 32)
if err != nil {
continue
}
i = j
} }
return filepath.Join(p.dir, fmt.Sprintf("%0.6d", i+1)), nil return filepath.Join(p.dir, fmt.Sprintf("b-%0.6d", i+1)), nil
} }
// chunkDesc wraps a plain data chunk and provides cached meta data about it. // chunkDesc wraps a plain data chunk and provides cached meta data about it.

2
wal.go
View file

@ -33,7 +33,7 @@ type WAL struct {
symbols map[string]uint32 symbols map[string]uint32
} }
const walFileName = "000-wal" const walFileName = "wal-000"
// OpenWAL opens or creates a write ahead log in the given directory. // OpenWAL opens or creates a write ahead log in the given directory.
// The WAL must be read completely before new data is written. // The WAL must be read completely before new data is written.