fix: wait for the proper raft status instead of just for the status t…

…o be up. Removed obsolete purge events
AxonIQ · Nov 22, 2023 · 107b513 · 107b513
1 parent 67fb80a
commit 107b513
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/AxonIQ.AxonServer.Embedded/AxonServer.cs b/src/AxonIQ.AxonServer.Embedded/AxonServer.cs
@@ -34,17 +34,11 @@ public DnsEndPoint GetGrpcEndpoint()
         return Server.GetGrpcEndpoint();
     }
 
-    public GrpcChannel CreateGrpcChannel(GrpcChannelOptions? options = default)
+    public GrpcChannel CreateGrpcChannel(GrpcChannelOptions? options)
     {
         return Server.CreateGrpcChannel(options);
     }
 
-    public async Task PurgeEvents()
-    {
-        using var client = Server.CreateHttpClient();
-        (await client.DeleteAsync("v1/devmode/purge-events")).EnsureSuccessStatusCode();
-    }
-
     public Task DisposeAsync()
     {
         return Server.DisposeAsync();

diff --git a/src/AxonIQ.AxonServer.Embedded/EmbeddedAxonServer.cs b/src/AxonIQ.AxonServer.Embedded/EmbeddedAxonServer.cs
@@ -101,6 +101,16 @@ public async Task WaitUntilAvailableAsync(TimeSpan? maximumWaitTime = default, T
             Port = endpoint.Port,
             Path = "actuator/health"
         }.Uri;
+
+        //Only test the raft status of contexts this node is hosting a replication group for 
+        var contexts =
+            Template
+                .ReplicationGroups?
+                .Where(replicationGroup =>
+                    replicationGroup.Roles?.Any(role => role.Node == Properties.NodeSetup.Name) ?? false)
+                .SelectMany(replicationGroup => replicationGroup.Contexts?.Where(context => context.Name != null)
+                    .Select(context => new Context(context.Name!)) ?? Array.Empty<Context>())
+                .ToArray() ?? Array.Empty<Context>();
 
         var watch = Stopwatch.StartNew();
         while (!available && watch.Elapsed < (maximumWaitTime ?? DefaultMaximumWaitTime))
@@ -113,8 +123,13 @@ public async Task WaitUntilAvailableAsync(TimeSpan? maximumWaitTime = default, T
                 var response = (await client.GetAsync(requestUri)).EnsureSuccessStatusCode();
                 var json = await response.Content.ReadAsStringAsync();
                 var document = JsonDocument.Parse(json);
-                var property = document.RootElement.GetProperty("status");
-                if (property.GetString() == "UP")
+                if (document.RootElement.GetProperty("status").GetString() == "UP" &&
+                    document.RootElement.GetProperty("components").GetProperty("raft").GetProperty("status").GetString() == "UP" &&
+                    contexts.All(context => 
+                        document.RootElement
+                            .GetProperty("components").GetProperty("raft").GetProperty("details")
+                            .GetProperty($"{context.ToString()}.leader").GetString() != null 
+                    ))
                 {
                     available = true;
                 }

diff --git a/src/AxonIQ.AxonServer.Embedded/ToxicAxonServer.cs b/src/AxonIQ.AxonServer.Embedded/ToxicAxonServer.cs
@@ -34,17 +34,11 @@ public DnsEndPoint GetGrpcEndpoint()
         return Server.GetGrpcEndpoint();
     }
 
-    public GrpcChannel CreateGrpcChannel(GrpcChannelOptions? options = default)
+    public GrpcChannel CreateGrpcChannel(GrpcChannelOptions? options)
     {
         return Server.CreateGrpcChannel(options);
     }
 
-    public async Task PurgeEvents()
-    {
-        using var client = Server.CreateHttpClient();
-        (await client.DeleteAsync("v1/devmode/purge-events")).EnsureSuccessStatusCode();
-    }
-
     public Task DisposeAsync()
     {
         return Server.DisposeAsync();