add benchmark for large scale cycles

Author: pquerna

pkg/sync/expand/cycle.go

@@ -1,6 +1,8 @@
 package expand
 
 import (
+	"context"
+
 	mapset "github.com/deckarep/golang-set/v2"
 )
 
@@ -147,22 +149,26 @@ func (g *EntitlementGraph) removeNode(nodeID int) {
 
 // FixCycles if any cycles of nodes exist, merge all nodes in that cycle into a
 // single node and then repeat. Iteration ends when there are no more cycles.
-func (g *EntitlementGraph) FixCycles() error {
+func (g *EntitlementGraph) FixCycles(ctx context.Context) error {
 	if g.HasNoCycles {
 		return nil
 	}
-	cycle := g.GetFirstCycle()
-	if cycle == nil {
-		g.HasNoCycles = true
-		return nil
-	}
+	for {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+		}
+		cycle := g.GetFirstCycle()
+		if cycle == nil {
+			g.HasNoCycles = true
+			return nil
+		}
 
-	if err := g.fixCycle(cycle); err != nil {
-		return err
+		if err := g.fixCycle(cycle); err != nil {
+			return err
+		}
 	}
-
-	// Recurse!
-	return g.FixCycles()
 }
 
 // fixCycle takes a list of Node IDs that form a cycle and merges them into a

pkg/sync/expand/graph_test.go

@@ -201,7 +201,7 @@ func TestHandleCycle(t *testing.T) {
 			}
 			require.True(t, found)
 
-			err := graph.FixCycles()
+			err := graph.FixCycles(ctx)
 			require.NoError(t, err, graph.Str())
 			err = graph.Validate()
 			require.NoError(t, err)
@@ -221,7 +221,7 @@ func TestHandleComplexCycle(t *testing.T) {
 	require.Equal(t, 4, len(graph.Edges))
 	require.Equal(t, 3, len(graph.GetEntitlements()))
 
-	err := graph.FixCycles()
+	err := graph.FixCycles(ctx)
 	require.NoError(t, err, graph.Str())
 	err = graph.Validate()
 	require.NoError(t, err)
@@ -248,7 +248,7 @@ func TestHandleCliqueCycle(t *testing.T) {
 		require.Equal(t, 6, len(graph.Edges))
 		require.Equal(t, 3, len(graph.GetEntitlements()))
 
-		err := graph.FixCycles()
+		err := graph.FixCycles(ctx)
 		require.NoError(t, err, graph.Str())
 		err = graph.Validate()
 		require.NoError(t, err)

pkg/sync/syncer.go

@@ -1373,7 +1373,7 @@ func (s *syncer) SyncGrantExpansion(ctx context.Context) error {
 				return fmt.Errorf("cycles detected in entitlement graph")
 			}
 
-			err := entitlementGraph.FixCycles()
+			err := entitlementGraph.FixCycles(ctx)
 			if err != nil {
 				return err
 			}