a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: stats: imp err handling, logs

Browse Source 
Merge in DNS/adguard-home from 2661-imp-stats-logging to master

Updates #2661.

Squashed commit of the following:

commit 474735a5c6ab650973343a1323ebf3c00edd71cf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 17:44:34 2021 +0300

    stats: imp err handling, logs
This commit is contained in:
Ainar Garipov 2021-02-11 17:55:37 +03:00
parent 7dd2d0af96
commit a623ac694b
1 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
internal/stats/unit.go
View File

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"encoding/gob" "encoding/gob"
"errors"
"fmt" "fmt"
"net" "net"
"os" "os"
@ -11,10 +12,14 @@ import (
"sync" "sync"
"time" "time"
"github.com/AdguardTeam/AdGuardHome/internal/agherr"
"github.com/AdguardTeam/golibs/log" "github.com/AdguardTeam/golibs/log"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )
// TODO(a.garipov): Rewrite all of this. Add proper error handling and
// inspection. Improve logging. Decrease complexity.
const ( const (
maxDomains = 100 // max number of top domains to store in file or return via Get() maxDomains = 100 // max number of top domains to store in file or return via Get()
maxClients = 100 // max number of top clients to store in file or return via Get() maxClients = 100 // max number of top clients to store in file or return via Get()
@ -61,11 +66,12 @@ type unitDB struct {
TimeAvg uint32 // usec TimeAvg uint32 // usec
} }
func createObject(conf Config) (*statsCtx, error) { func createObject(conf Config) (s *statsCtx, err error) {
s := statsCtx{} s = &statsCtx{}
if !checkInterval(conf.LimitDays) { if !checkInterval(conf.LimitDays) {
conf.LimitDays = 1 conf.LimitDays = 1
} }
s.conf = &Config{} s.conf = &Config{}
*s.conf = conf *s.conf = conf
s.conf.limit = conf.LimitDays * 24 s.conf.limit = conf.LimitDays * 24
@ -84,27 +90,43 @@ func createObject(conf Config) (*statsCtx, error) {
log.Tracef("Deleting old units...") log.Tracef("Deleting old units...")
firstID := id - s.conf.limit - 1 firstID := id - s.conf.limit - 1
unitDel := 0 unitDel := 0
forEachBkt := func(name []byte, b *bolt.Bucket) error {
id := uint32(btoi(name)) // TODO(a.garipov): See if this is actually necessary. Looks
if id < firstID { // like a rather bizarre solution.
err := tx.DeleteBucket(name) errStop := agherr.Error("stop iteration")
if err != nil { forEachBkt := func(name []byte, _ *bolt.Bucket) (cberr error) {
log.Debug("tx.DeleteBucket: %s", err) nameID := uint32(btoi(name))
} if nameID < firstID {
log.Debug("Stats: deleted unit %d", id) cberr = tx.DeleteBucket(name)
unitDel++ if cberr != nil {
log.Debug("stats: tx.DeleteBucket: %s", cberr)
return nil return nil
} }
return fmt.Errorf("")
log.Debug("stats: deleted unit %d", nameID)
unitDel++
return nil
}
return errStop
}
err = tx.ForEach(forEachBkt)
if err != nil && !errors.Is(err, errStop) {
log.Debug("stats: deleting units: %s", err)
} }
_ = tx.ForEach(forEachBkt)
udb = s.loadUnitFromDB(tx, id) udb = s.loadUnitFromDB(tx, id)
if unitDel != 0 { if unitDel != 0 {
s.commitTxn(tx) s.commitTxn(tx)
} else { } else {
_ = tx.Rollback() err = tx.Rollback()
if err != nil {
log.Debug("rolling back: %s", err)
}
} }
} }
@ -115,8 +137,9 @@ func createObject(conf Config) (*statsCtx, error) {
} }
s.unit = &u s.unit = &u
log.Debug("Stats: initialized") log.Debug("stats: initialized")
return &s, nil
return s, nil
} }
func (s *statsCtx) Start() { func (s *statsCtx) Start() {
@ -133,7 +156,7 @@ func (s *statsCtx) dbOpen() bool {
log.Tracef("db.Open...") log.Tracef("db.Open...")
s.db, err = bolt.Open(s.conf.Filename, 0o644, nil) s.db, err = bolt.Open(s.conf.Filename, 0o644, nil)
if err != nil { if err != nil {
log.Error("Stats: open DB: %s: %s", s.conf.Filename, err) log.Error("stats: open DB: %s: %s", s.conf.Filename, err)
if err.Error() == "invalid argument" { if err.Error() == "invalid argument" {
log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/internal/wiki/Getting-Started#limitations") log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/internal/wiki/Getting-Started#limitations")
} }
@ -262,10 +285,13 @@ func (s *statsCtx) periodicFlush() {
func (s *statsCtx) deleteUnit(tx *bolt.Tx, id uint32) bool { func (s *statsCtx) deleteUnit(tx *bolt.Tx, id uint32) bool {
err := tx.DeleteBucket(unitName(id)) err := tx.DeleteBucket(unitName(id))
if err != nil { if err != nil {
log.Tracef("bolt DeleteBucket: %s", err) log.Tracef("stats: bolt DeleteBucket: %s", err)
return false return false
} }
log.Debug("Stats: deleted unit %d", id)
log.Debug("stats: deleted unit %d", id)
return true return true
} }
@ -390,7 +416,7 @@ func (s *statsCtx) setLimit(limitDays int) {
conf := *s.conf conf := *s.conf
conf.limit = uint32(limitDays) * 24 conf.limit = uint32(limitDays) * 24
s.conf = &conf s.conf = &conf
log.Debug("Stats: set limit: %d", limitDays) log.Debug("stats: set limit: %d", limitDays)
} }
func (s *statsCtx) WriteDiskConfig(dc *DiskConfig) { func (s *statsCtx) WriteDiskConfig(dc *DiskConfig) {
@ -415,7 +441,7 @@ func (s *statsCtx) Close() {
log.Tracef("db.Close") log.Tracef("db.Close")
} }
log.Debug("Stats: closed") log.Debug("stats: closed")
} }
// Reset counters and clear database // Reset counters and clear database
@ -443,7 +469,7 @@ func (s *statsCtx) clear() {
_ = s.dbOpen() _ = s.dbOpen()
log.Debug("Stats: cleared") log.Debug("stats: cleared")
} }
// Get Client IP address // Get Client IP address