Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: add support for actor runtime config, to make idle timeout scanning and gc of runtime actor in effective #334 #337

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion actor/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ import "github.com/dapr/go-sdk/actor/codec/constant"

// ActorConfig is Actor's configuration struct.
type ActorConfig struct {
SerializerType string
SerializerType string
ActorIdleTimeout string
ActorScanInterval string
DrainOngingCallTimeout string
DrainBalancedActors bool
}

// Option is option function of ActorConfig.
Expand All @@ -30,6 +34,34 @@ func WithSerializerName(serializerType string) Option {
}
}

// WithActorIdleTimeout set actorIdleTimeout type of the actor as @actorIdleTimeout.
func WithActorIdleTimeout(actorIdleTimeout string) Option {
return func(config *ActorConfig) {
config.ActorIdleTimeout = actorIdleTimeout
}
}

// WithActorScanInterval set actorScanInterval type of the actor as @actorScanInterval.
func WithActorScanInterval(actorScanInterval string) Option {
return func(config *ActorConfig) {
config.ActorScanInterval = actorScanInterval
}
}

// WithDrainOngingCallTimeout set drainOngingCallTimeout type of the actor as @drainOngingCallTimeout.
func WithDrainOngingCallTimeout(drainOngingCallTimeout string) Option {
return func(config *ActorConfig) {
config.DrainOngingCallTimeout = drainOngingCallTimeout
}
}

// WithDrainBalancedActors set drainBalancedActors type of the actor as @drainBalancedActors.
func WithDrainBalancedActors(drainBalancedActors bool) Option {
return func(config *ActorConfig) {
config.DrainBalancedActors = drainBalancedActors
}
}

// GetConfigFromOptions get final ActorConfig set by @opts.
func GetConfigFromOptions(opts ...Option) *ActorConfig {
conf := &ActorConfig{
Expand Down
8 changes: 8 additions & 0 deletions actor/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,16 @@
t.Run("get config with option", func(t *testing.T) {
config := GetConfigFromOptions(
WithSerializerName("mockSerializerType"),
WithActorIdleTimeout("1m"),
WithActorScanInterval("10s"),
WithDrainOngingCallTimeout("10s"),
WithDrainBalancedActors(true),
)
assert.NotNil(t, config)
assert.Equal(t, "mockSerializerType", config.SerializerType)
assert.Equal(t, "1m", config.ActorIdleTimeout)
assert.Equal(t, "10s", config.ActorScanInterval)
assert.Equal(t, "10s", config.DrainOngingCallTimeout)
assert.Equal(t, true, config.DrainBalancedActors)

Check failure on line 44 in actor/config/config_test.go

View workflow job for this annotation

GitHub Actions / Test on 1.21

bool-compare: use assert.True (testifylint)

Check failure on line 44 in actor/config/config_test.go

View workflow job for this annotation

GitHub Actions / Test on 1.22

bool-compare: use assert.True (testifylint)
})
}
4 changes: 4 additions & 0 deletions actor/runtime/actor_runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ func (r *ActorRunTimeContext) RegisterActorFactory(f actor.FactoryContext, opt .
conf := config.GetConfigFromOptions(opt...)
actType := f().Type()
r.config.RegisteredActorTypes = append(r.config.RegisteredActorTypes, actType)
r.config.ActorIdleTimeout = conf.ActorIdleTimeout
r.config.ActorScanInterval = conf.ActorScanInterval
r.config.DrainOngingCallTimeout = conf.DrainOngingCallTimeout
r.config.DrainBalancedActors = conf.DrainBalancedActors
mng, ok := r.actorManagers.Load(actType)
if !ok {
newMng, err := manager.NewDefaultActorManagerContext(conf.SerializerType)
Expand Down
Loading