Support adding additional error handling to generated actors (#2141)

benbenwilde · web-flow · commit 7193337b325b · 2024-11-09T09:49:42.000+01:00
* Support adding additional error handling to generated actors

updates for tests

* add delay for flaky test
diff --git a/src/Proto.Cluster.CodeGen/Template.cs b/src/Proto.Cluster.CodeGen/Template.cs
@@ -62,14 +62,19 @@ public abstract class {{Name}}Base
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
         {{/each}}
     
         {{#each Methods}}
         public abstract Task{{#if UseReturn}}<{{OutputName}}>{{/if}} {{Name}}({{SingleParameterDefinition}});
         {{/each}}
+
+        public virtual void OnError(Exception ex)
+        { 
+            Context!.Respond(new global::Proto.Cluster.GrainErrorResponse { Err = ex.ToString() });
+        }
     }
 
     public class {{Name}}Client
diff --git a/tests/Proto.Cluster.CodeGen.Tests/ExpectedOutput.cs b/tests/Proto.Cluster.CodeGen.Tests/ExpectedOutput.cs
@@ -42,7 +42,7 @@ public virtual async Task GetState(Action<Acme.Mysystem.Bar.GetCurrentStateRespo
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
         public virtual async Task SendCommand(Acme.Mysystem.Bar.SomeCommand request, Action respond, Action<string> onError)
@@ -54,7 +54,7 @@ public virtual async Task SendCommand(Acme.Mysystem.Bar.SomeCommand request, Act
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
         public virtual async Task RequestResponse(Acme.Mysystem.Bar.Query request, Action<Acme.Mysystem.Bar.Response> respond, Action<string> onError)
@@ -66,7 +66,7 @@ public virtual async Task RequestResponse(Acme.Mysystem.Bar.Query request, Actio
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
         public virtual async Task NoParameterOrReturn(Action respond, Action<string> onError)
@@ -78,14 +78,19 @@ public virtual async Task NoParameterOrReturn(Action respond, Action<string> onE
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
     
         public abstract Task<Acme.Mysystem.Bar.GetCurrentStateResponse> GetState();
         public abstract Task SendCommand(Acme.Mysystem.Bar.SomeCommand request);
         public abstract Task<Acme.Mysystem.Bar.Response> RequestResponse(Acme.Mysystem.Bar.Query request);
         public abstract Task NoParameterOrReturn();
+
+        public virtual void OnError(Exception ex)
+        { 
+            Context!.Respond(new global::Proto.Cluster.GrainErrorResponse { Err = ex.ToString() });
+        }
     }
 
     public class TestGrainClient
diff --git a/tests/Proto.Cluster.CodeGen.Tests/ExpectedOutputPackageless.cs b/tests/Proto.Cluster.CodeGen.Tests/ExpectedOutputPackageless.cs
@@ -42,7 +42,7 @@ public virtual async Task GetState(Action<Acme.Mysystem.Bar.GetCurrentStateRespo
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
         public virtual async Task SendCommand(Acme.Mysystem.Bar.SomeCommand request, Action respond, Action<string> onError)
@@ -54,7 +54,7 @@ public virtual async Task SendCommand(Acme.Mysystem.Bar.SomeCommand request, Act
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
         public virtual async Task RequestResponse(Acme.Mysystem.Bar.Query request, Action<Acme.Mysystem.Bar.Response> respond, Action<string> onError)
@@ -66,7 +66,7 @@ public virtual async Task RequestResponse(Acme.Mysystem.Bar.Query request, Actio
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
         public virtual async Task NoParameterOrReturn(Action respond, Action<string> onError)
@@ -78,14 +78,19 @@ public virtual async Task NoParameterOrReturn(Action respond, Action<string> onE
             }
             catch (Exception x)
             {
-                onError(x.ToString());
+                OnError(x);
             }
         }
     
         public abstract Task<Acme.Mysystem.Bar.GetCurrentStateResponse> GetState();
         public abstract Task SendCommand(Acme.Mysystem.Bar.SomeCommand request);
         public abstract Task<Acme.Mysystem.Bar.Response> RequestResponse(Acme.Mysystem.Bar.Query request);
         public abstract Task NoParameterOrReturn();
+
+        public virtual void OnError(Exception ex)
+        { 
+            Context!.Respond(new global::Proto.Cluster.GrainErrorResponse { Err = ex.ToString() });
+        }
     }
 
     public class TestGrainClient
diff --git a/tests/Proto.Cluster.PartitionIdentity.Tests/PartitionIdentityTests.cs b/tests/Proto.Cluster.PartitionIdentity.Tests/PartitionIdentityTests.cs
@@ -83,6 +83,9 @@ PartitionIdentityLookup.Send send
         timer.Restart();
         await fixture.DisposeAsync();
         _output.WriteLine($"Stopped cluster in {timer.Elapsed}");
+        
+        // delay to reduce flakiness
+        await Task.Delay(2000);
 
         var actorStates = fixture.Repository.Contents.ToList();
 

Original file line number	Diff line number	Diff line change
`@@ -62,14 +62,19 @@ public abstract class {{Name}}Base`
`62`	`62`	`}`
`63`	`63`	`catch (Exception x)`
`64`	`64`	`{`
`65`		`- onError(x.ToString());`
	`65`	`+ OnError(x);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`{{/each}}`
`69`	`69`
`70`	`70`	`{{#each Methods}}`
`71`	`71`	`public abstract Task{{#if UseReturn}}<{{OutputName}}>{{/if}} {{Name}}({{SingleParameterDefinition}});`
`72`	`72`	`{{/each}}`
	`73`	`+`
	`74`	`+ public virtual void OnError(Exception ex)`
	`75`	`+ {`
	`76`	`+ Context!.Respond(new global::Proto.Cluster.GrainErrorResponse { Err = ex.ToString() });`
	`77`	`+ }`
`73`	`78`	`}`
`74`	`79`
`75`	`80`	`public class {{Name}}Client`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public virtual async Task GetState(Action<Acme.Mysystem.Bar.GetCurrentStateRespo`
`42`	`42`	`}`
`43`	`43`	`catch (Exception x)`
`44`	`44`	`{`
`45`		`- onError(x.ToString());`
	`45`	`+ OnError(x);`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`public virtual async Task SendCommand(Acme.Mysystem.Bar.SomeCommand request, Action respond, Action<string> onError)`
`@@ -54,7 +54,7 @@ public virtual async Task SendCommand(Acme.Mysystem.Bar.SomeCommand request, Act`
`54`	`54`	`}`
`55`	`55`	`catch (Exception x)`
`56`	`56`	`{`
`57`		`- onError(x.ToString());`
	`57`	`+ OnError(x);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`public virtual async Task RequestResponse(Acme.Mysystem.Bar.Query request, Action<Acme.Mysystem.Bar.Response> respond, Action<string> onError)`
`@@ -66,7 +66,7 @@ public virtual async Task RequestResponse(Acme.Mysystem.Bar.Query request, Actio`
`66`	`66`	`}`
`67`	`67`	`catch (Exception x)`
`68`	`68`	`{`
`69`		`- onError(x.ToString());`
	`69`	`+ OnError(x);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`public virtual async Task NoParameterOrReturn(Action respond, Action<string> onError)`
`@@ -78,14 +78,19 @@ public virtual async Task NoParameterOrReturn(Action respond, Action<string> onE`
`78`	`78`	`}`
`79`	`79`	`catch (Exception x)`
`80`	`80`	`{`
`81`		`- onError(x.ToString());`
	`81`	`+ OnError(x);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public abstract Task<Acme.Mysystem.Bar.GetCurrentStateResponse> GetState();`
`86`	`86`	`public abstract Task SendCommand(Acme.Mysystem.Bar.SomeCommand request);`
`87`	`87`	`public abstract Task<Acme.Mysystem.Bar.Response> RequestResponse(Acme.Mysystem.Bar.Query request);`
`88`	`88`	`public abstract Task NoParameterOrReturn();`
	`89`	`+`
	`90`	`+ public virtual void OnError(Exception ex)`
	`91`	`+ {`
	`92`	`+ Context!.Respond(new global::Proto.Cluster.GrainErrorResponse { Err = ex.ToString() });`
	`93`	`+ }`
`89`	`94`	`}`
`90`	`95`
`91`	`96`	`public class TestGrainClient`