upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #383 from Icinga/feature/icingadb-schema-version

Browse source 
Only do anything while icinga:schema version meets our expectations
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-10-25 15:49:58 +02:00 committed by GitHub
commit d9c626ced8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
cmd/icingadb/main.go
View file

@ -2,6 +2,7 @@ package main
import (
"context"
"github.com/go-redis/redis/v8"
"github.com/icinga/icingadb/internal/command"
"github.com/icinga/icingadb/pkg/com"
"github.com/icinga/icingadb/pkg/common"
@ -25,9 +26,10 @@ import (
)
const (
ExitSuccess = 0
ExitFailure = 1
expectedSchemaVersion = 2
ExitSuccess = 0
ExitFailure = 1
expectedRedisSchemaVersion = "1"
expectedDbSchemaVersion = 2
)
func main() {
@ -84,6 +86,15 @@ func run() int {
}
}
{
pos, err := checkRedisSchema(logger, rc, "0-0")
if err != nil {
logger.Fatalf("%+v", err)
}
go monitorRedisSchema(logger, rc, pos)
}
ctx, cancelCtx := context.WithCancel(context.Background())
defer cancelCtx()
@ -310,9 +321,47 @@ func checkDbSchema(ctx context.Context, db *icingadb.DB) error {
return errors.Wrap(err, "can't check database schema version")
}
if version != expectedSchemaVersion {
return errors.Errorf("expected database schema v%d, got v%d", expectedSchemaVersion, version)
if version != expectedDbSchemaVersion {
return errors.Errorf("expected database schema v%d, got v%d", expectedDbSchemaVersion, version)
}
return nil
}
// monitorRedisSchema monitors rc's icinga:schema version validity.
func monitorRedisSchema(logger *zap.SugaredLogger, rc *icingaredis.Client, pos string) {
for {
var err error
pos, err = checkRedisSchema(logger, rc, pos)
if err != nil {
logger.Fatalf("%+v", err)
}
}
}
// checkRedisSchema verifies rc's icinga:schema version.
func checkRedisSchema(logger *zap.SugaredLogger, rc *icingaredis.Client, pos string) (newPos string, err error) {
if pos == "0-0" {
defer time.AfterFunc(3*time.Second, func() { logger.Info("Waiting for current Redis schema version") }).Stop()
} else {
logger.Debug("Waiting for new Redis schema version")
}
cmd := rc.XRead(context.Background(), &redis.XReadArgs{Streams: []string{"icinga:schema", pos}})
xRead, err := cmd.Result()
if err != nil {
return "", icingaredis.WrapCmdErr(cmd)
}
message := xRead[0].Messages[0]
if version := message.Values["version"]; version != expectedRedisSchemaVersion {
return "", errors.Errorf(
"unexpected Redis schema version: %q (expected %q)", version, expectedRedisSchemaVersion,
)
}
logger.Debug("Redis schema version is correct")
return message.ID, nil
}