support actor config

wXwcoder · wXwcoder · commit c7c2249ca672 · 2022-11-16T19:55:40.000+08:00
Signed-off-by: wangxw &lt;996268132@qq.com&gt;
diff --git a/actor/config/config.go b/actor/config/config.go
@@ -18,8 +18,8 @@ import "github.com/dapr/go-sdk/actor/codec/constant"
 // ActorConfig is Actor's configuration struct.
 type ActorConfig struct {
 	SerializerType         string
-	IdleTimeout            string
-	ScanInterval           string
+	ActorIdleTimeout       string
+	ActorScanInterval      string
 	DrainOngingCallTimeout string
 	DrainBalancedActors    bool
 }
@@ -34,28 +34,28 @@ func WithSerializerName(serializerType string) Option {
 	}
 }
 
-// WithIdleTimeout set serializer type of the actor as @idleTimeout.
-func WithIdleTimeout(idleTimeout string) Option {
+// WithActorIdleTimeout set actorIdleTimeout type of the actor as @actorIdleTimeout.
+func WithActorIdleTimeout(actorIdleTimeout string) Option {
 	return func(config *ActorConfig) {
-		config.IdleTimeout = idleTimeout
+		config.ActorIdleTimeout = actorIdleTimeout
 	}
 }
 
-// WithScanInterval set serializer type of the actor as @scanInterval.
-func WithScanInterval(scanInterval string) Option {
+// WithActorScanInterval set actorScanInterval type of the actor as @actorScanInterval.
+func WithActorScanInterval(actorScanInterval string) Option {
 	return func(config *ActorConfig) {
-		config.ScanInterval = scanInterval
+		config.ActorScanInterval = actorScanInterval
 	}
 }
 
-// WithDrainOngingCallTimeout set serializer type of the actor as @drainOngingCallTimeout.
+// WithDrainOngingCallTimeout set drainOngingCallTimeout type of the actor as @drainOngingCallTimeout.
 func WithDrainOngingCallTimeout(drainOngingCallTimeout string) Option {
 	return func(config *ActorConfig) {
 		config.DrainOngingCallTimeout = drainOngingCallTimeout
 	}
 }
 
-// WithDrainBalancedActors set serializer type of the actor as @drainBalancedActors.
+// WithDrainBalancedActors set drainBalancedActors type of the actor as @drainBalancedActors.
 func WithDrainBalancedActors(drainBalancedActors bool) Option {
 	return func(config *ActorConfig) {
 		config.DrainBalancedActors = drainBalancedActors
diff --git a/actor/config/config_test.go b/actor/config/config_test.go
@@ -31,15 +31,15 @@ func TestRegisterActorTimer(t *testing.T) {
 	t.Run("get config with option", func(t *testing.T) {
 		config := GetConfigFromOptions(
 			WithSerializerName("mockSerializerType"),
-			WithIdleTimeout("1m"),
-			WithScanInterval("10s"),
+			WithActorIdleTimeout("1m"),
+			WithActorScanInterval("10s"),
 			WithDrainOngingCallTimeout("10s"),
 			WithDrainBalancedActors(true),
 		)
 		assert.NotNil(t, config)
 		assert.Equal(t, "mockSerializerType", config.SerializerType)
-		assert.Equal(t, "1m", config.IdleTimeout)
-		assert.Equal(t, "10s", config.ScanInterval)
+		assert.Equal(t, "1m", config.ActorIdleTimeout)
+		assert.Equal(t, "10s", config.ActorScanInterval)
 		assert.Equal(t, "10s", config.DrainOngingCallTimeout)
 		assert.Equal(t, true, config.DrainBalancedActors)
 	})
diff --git a/actor/runtime/actor_runtime.go b/actor/runtime/actor_runtime.go
@@ -49,6 +49,10 @@ func (r *ActorRunTime) RegisterActorFactory(f actor.Factory, opt ...config.Optio
 	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.NewDefaultActorManager(conf.SerializerType)

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ import "github.com/dapr/go-sdk/actor/codec/constant"`
`18`	`18`	`// ActorConfig is Actor's configuration struct.`
`19`	`19`	`type ActorConfig struct {`
`20`	`20`	`SerializerType string`
`21`		`- IdleTimeout string`
`22`		`- ScanInterval string`
	`21`	`+ ActorIdleTimeout string`
	`22`	`+ ActorScanInterval string`
`23`	`23`	`DrainOngingCallTimeout string`
`24`	`24`	`DrainBalancedActors bool`
`25`	`25`	`}`
`@@ -34,28 +34,28 @@ func WithSerializerName(serializerType string) Option {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-// WithIdleTimeout set serializer type of the actor as @idleTimeout.`
`38`		`-func WithIdleTimeout(idleTimeout string) Option {`
	`37`	`+// WithActorIdleTimeout set actorIdleTimeout type of the actor as @actorIdleTimeout.`
	`38`	`+func WithActorIdleTimeout(actorIdleTimeout string) Option {`
`39`	`39`	`return func(config *ActorConfig) {`
`40`		`- config.IdleTimeout = idleTimeout`
	`40`	`+ config.ActorIdleTimeout = actorIdleTimeout`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`-// WithScanInterval set serializer type of the actor as @scanInterval.`
`45`		`-func WithScanInterval(scanInterval string) Option {`
	`44`	`+// WithActorScanInterval set actorScanInterval type of the actor as @actorScanInterval.`
	`45`	`+func WithActorScanInterval(actorScanInterval string) Option {`
`46`	`46`	`return func(config *ActorConfig) {`
`47`		`- config.ScanInterval = scanInterval`
	`47`	`+ config.ActorScanInterval = actorScanInterval`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-// WithDrainOngingCallTimeout set serializer type of the actor as @drainOngingCallTimeout.`
	`51`	`+// WithDrainOngingCallTimeout set drainOngingCallTimeout type of the actor as @drainOngingCallTimeout.`
`52`	`52`	`func WithDrainOngingCallTimeout(drainOngingCallTimeout string) Option {`
`53`	`53`	`return func(config *ActorConfig) {`
`54`	`54`	`config.DrainOngingCallTimeout = drainOngingCallTimeout`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-// WithDrainBalancedActors set serializer type of the actor as @drainBalancedActors.`
	`58`	`+// WithDrainBalancedActors set drainBalancedActors type of the actor as @drainBalancedActors.`
`59`	`59`	`func WithDrainBalancedActors(drainBalancedActors bool) Option {`
`60`	`60`	`return func(config *ActorConfig) {`
`61`	`61`	`config.DrainBalancedActors = drainBalancedActors`