incusd: Remove cluster member on join failure

Signed-off-by: Piotr Resztak <[email protected]>

Author: presztak

cmd/incusd/api_cluster.go

@@ -622,6 +622,13 @@ func clusterPutJoin(d *Daemon, r *http.Request, req api.ClusterPut) response.Res
 			return err
 		}
 
+		reverter.Add(func() {
+			err = client.DeleteClusterMember(req.ServerName, true)
+			if err != nil {
+				logger.Errorf("Failed request to delete cluster member: %v", err)
+			}
+		})
+
 		// Now request for this node to be added to the list of cluster nodes.
 		info, err := clusterAcceptMember(client, req.ServerName, localHTTPSAddress, cluster.SchemaVersion, version.APIExtensionsCount(), pools, networks)
 		if err != nil {
@@ -2034,7 +2041,7 @@ func clusterNodeDelete(d *Daemon, r *http.Request) response.Response {
 
 	// First check that the node is clear from containers and images and
 	// make it leave the database cluster, if it's part of it.
-	address, err := cluster.Leave(s, d.gateway, name, force == 1)
+	address, err := cluster.Leave(s, d.gateway, name, force == 1, true)
 	if err != nil {
 		return response.SmartError(err)
 	}
@@ -2099,7 +2106,7 @@ func clusterNodeDelete(d *Daemon, r *http.Request) response.Response {
 	}
 
 	// Remove node from the database
-	err = cluster.Purge(s.DB.Cluster, name)
+	err = cluster.Purge(s.DB.Cluster, name, true)
 	if err != nil {
 		return response.SmartError(fmt.Errorf("Failed to remove member from database: %w", err))
 	}