add core.State logging to executor

neondatabase · Sep 27, 2023 · 2f639aa · 2f639aa
1 parent 428fa13
commit 2f639aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/pkg/agent/executor/core.go b/pkg/agent/executor/core.go
@@ -10,6 +10,8 @@ import (
 	"sync"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/neondatabase/autoscaling/pkg/agent/core"
 	"github.com/neondatabase/autoscaling/pkg/api"
 	"github.com/neondatabase/autoscaling/pkg/util"
@@ -20,6 +22,8 @@ type Config = core.Config
 type ExecutorCore struct {
 	mu sync.Mutex
 
+	stateLogger *zap.Logger
+
 	core    *core.State
 	actions *timedActions
 
@@ -32,12 +36,13 @@ type ClientSet struct {
 	Informant InformantInterface
 }
 
-func NewExecutorCore(vm api.VmInfo, config core.Config) *ExecutorCore {
+func NewExecutorCore(stateLogger *zap.Logger, vm api.VmInfo, config core.Config) *ExecutorCore {
 	return &ExecutorCore{
-		mu:      sync.Mutex{},
-		core:    core.NewState(vm, config),
-		actions: nil, // (*ExecutorCore).getActions() checks if this is nil
-		updates: util.NewBroadcaster(),
+		mu:          sync.Mutex{},
+		stateLogger: stateLogger,
+		core:        core.NewState(vm, config),
+		actions:     nil, // (*ExecutorCore).getActions() checks if this is nil
+		updates:     util.NewBroadcaster(),
 	}
 }
 
@@ -66,6 +71,7 @@ func (c *ExecutorCore) getActions() timedActions {
 	if c.actions == nil {
 		// NOTE: Even though we cache the actions generated using time.Now(), it's *generally* ok.
 		now := time.Now()
+		c.stateLogger.Info("Recalculating ActionSet", zap.Time("now", now), zap.Any("state", c.core.Dump()))
 		c.actions = &timedActions{calculatedAt: now, actions: c.core.NextActions(now)}
 	}
 

diff --git a/pkg/agent/runner.go b/pkg/agent/runner.go
@@ -348,7 +348,7 @@ func (r *Runner) Run(ctx context.Context, logger *zap.Logger, vmInfoUpdated util
 	execLogger := logger.Named("exec")
 
 	coreExecLogger := execLogger.Named("core")
-	executorCore := executor.NewExecutorCore(r.vm, executor.Config{
+	executorCore := executor.NewExecutorCore(coreExecLogger.Named("state"), r.vm, executor.Config{
 		DefaultScalingConfig:             r.global.config.Scaling.DefaultConfig,
 		PluginRequestTick:                time.Second * time.Duration(r.global.config.Scheduler.RequestAtLeastEverySeconds),
 		InformantDeniedDownscaleCooldown: time.Second * time.Duration(r.global.config.Informant.RetryDeniedDownscaleSeconds),