mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-12 16:44:05 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #6867 from pracucci/enhance-ulid-entropy-generator

Browse source 
Use a cryptographically secure random generator for ULID
This commit is contained in:
Julien Pivotto 2020-02-25 13:47:50 +01:00 committed by GitHub
parent c869e046a5 c391b6ca43
commit 202813a654
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tsdb/compact.go
View file

@ -15,10 +15,10 @@ package tsdb
import ( import (
"context" "context"
"crypto/rand"
"fmt" "fmt"
"io" "io"
"math" "math"
"math/rand"
"os" "os"
"path/filepath" "path/filepath"
"sort" "sort"
@ -413,8 +413,7 @@ func (c *LeveledCompactor) Compact(dest string, dirs []string, open []*Block) (u
uids = append(uids, meta.ULID.String()) uids = append(uids, meta.ULID.String())
} }
entropy := rand.New(rand.NewSource(time.Now().UnixNano())) uid = ulid.MustNew(ulid.Now(), rand.Reader)
uid = ulid.MustNew(ulid.Now(), entropy)
meta := compactBlockMetas(uid, metas...) meta := compactBlockMetas(uid, metas...)
err = c.write(dest, meta, blocks...) err = c.write(dest, meta, blocks...)
@ -468,8 +467,7 @@ func (c *LeveledCompactor) Compact(dest string, dirs []string, open []*Block) (u
func (c *LeveledCompactor) Write(dest string, b BlockReader, mint, maxt int64, parent *BlockMeta) (ulid.ULID, error) { func (c *LeveledCompactor) Write(dest string, b BlockReader, mint, maxt int64, parent *BlockMeta) (ulid.ULID, error) {
start := time.Now() start := time.Now()
entropy := rand.New(rand.NewSource(time.Now().UnixNano())) uid := ulid.MustNew(ulid.Now(), rand.Reader)
uid := ulid.MustNew(ulid.Now(), entropy)
meta := &BlockMeta{ meta := &BlockMeta{
ULID: uid, ULID: uid,