Merge branch 'main' into feature/334

wXwcoder · web-flow · commit 5e0f3b6f0de6 · 2022-11-14T11:03:09.000+08:00
Signed-off-by: wXwcoder &lt;996268132@qq.com&gt;
diff --git a/actor/actor.go b/actor/actor.go
@@ -43,6 +43,10 @@ type Server interface {
 	// SaveState is impl by ServerImplBase, It saves the state cache of this actor instance to state store component by calling api of daprd.
 	// Save state is called at two places: 1. On invocation of this actor instance. 2. When new actor starts.
 	SaveState() error
+	// Activate called when actor created by actor manager
+	Activate() error
+	// Deactivate called before actor removed by actor manager
+	Deactivate() error
 }
 
 type ReminderCallee interface {
diff --git a/actor/manager/container.go b/actor/manager/container.go
@@ -28,6 +28,7 @@ import (
 type ActorContainer interface {
 	Invoke(methodName string, param []byte) ([]reflect.Value, actorErr.ActorErr)
 	GetActor() actor.Server
+	Deactivate() error
 }
 
 // DefaultActorContainer contains actor instance and methods type info generated from actor.
@@ -43,8 +44,12 @@ func NewDefaultActorContainer(actorID string, impl actor.Server, serializer code
 	daprClient, _ := dapr.NewClient()
 	// create state manager for this new actor
 	impl.SetStateManager(state.NewActorStateManager(impl.Type(), actorID, state.NewDaprStateAsyncProvider(daprClient)))
+	err := impl.Activate()
+	if err != nil {
+		return nil, actorErr.ErrSaveStateFailed
+	}
 	// save state of this actor
-	err := impl.SaveState()
+	err = impl.SaveState()
 	if err != nil {
 		return nil, actorErr.ErrSaveStateFailed
 	}
@@ -84,3 +89,7 @@ func (d *DefaultActorContainer) Invoke(methodName string, param []byte) ([]refle
 	returnValue := methodType.method.Func.Call(argsValues)
 	return returnValue, actorErr.Success
 }
+
+func (d *DefaultActorContainer) Deactivate() error {
+	return d.actor.Deactivate()
+}
diff --git a/actor/manager/manager.go b/actor/manager/manager.go
@@ -122,10 +122,11 @@ func (m *DefaultActorManager) InvokeMethod(actorID, methodName string, request [
 
 // DeactivateActor removes actor from actor manager.
 func (m *DefaultActorManager) DeactivateActor(actorID string) actorErr.ActorErr {
-	_, ok := m.activeActors.Load(actorID)
+	actor, ok := m.activeActors.Load(actorID)
 	if !ok {
 		return actorErr.ErrActorIDNotFound
 	}
+	actor.(ActorContainer).Deactivate()
 	m.activeActors.Delete(actorID)
 	return actorErr.Success
 }
diff --git a/actor/mock/mock_factory_impl.go b/actor/mock/mock_factory_impl.go
@@ -27,6 +27,14 @@ type ActorImpl struct {
 	actor.ServerImplBase
 }
 
+func (t *ActorImpl) Activate() error {
+	return nil
+}
+
+func (t *ActorImpl) Deactivate() error {
+	return nil
+}
+
 func (t *ActorImpl) Type() string {
 	return "testActorType"
 }
@@ -46,6 +54,14 @@ type NotReminderCalleeActor struct {
 	actor.ServerImplBase
 }
 
+func (t *NotReminderCalleeActor) Activate() error {
+	return nil
+}
+
+func (t *NotReminderCalleeActor) Deactivate() error {
+	return nil
+}
+
 func (t *NotReminderCalleeActor) Type() string {
 	return "testActorNotReminderCalleeType"
 }
diff --git a/actor/mock/mock_server.go b/actor/mock/mock_server.go

Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,11 @@ func (m *DefaultActorManager) InvokeMethod(actorID, methodName string, request [`
`122`	`122`
`123`	`123`	`// DeactivateActor removes actor from actor manager.`
`124`	`124`	`func (m *DefaultActorManager) DeactivateActor(actorID string) actorErr.ActorErr {`
`125`		`- _, ok := m.activeActors.Load(actorID)`
	`125`	`+ actor, ok := m.activeActors.Load(actorID)`
`126`	`126`	`if !ok {`
`127`	`127`	`return actorErr.ErrActorIDNotFound`
`128`	`128`	`}`
	`129`	`+ actor.(ActorContainer).Deactivate()`
`129`	`130`	`m.activeActors.Delete(actorID)`
`130`	`131`	`return actorErr.Success`
`131`	`132`	`}`