Merge pull request #215 from josephschorr/cleanup-dispatcher-cache

Cleanup the CachingDispatcher when binary shuts down

cmd/spicedb/serve.go

@@ -472,6 +472,10 @@ func serveRun(cmd *cobra.Command, args []string) {
 		log.Fatal().Err(err).Msg("failed while shutting down namespace manager")
 	}
 
+	if err := cachingRedispatch.Close(); err != nil {
+		log.Fatal().Err(err).Msg("failed while shutting down dispatcher")
+	}
+
 	if err := ds.Close(); err != nil {
 		log.Fatal().Err(err).Msg("failed while shutting down datastore")
 	}

internal/dispatch/caching/caching.go

@@ -149,6 +149,15 @@ func (cd *cachingDispatcher) DispatchLookup(ctx context.Context, req *v1.Dispatc
 	return cd.d.DispatchLookup(ctx, req)
 }
 
+func (cd *cachingDispatcher) Close() error {
+	cache := cd.c
+	if cache != nil {
+		cache.Close()
+	}
+
+	return nil
+}
+
 func requestToKey(req *v1.DispatchCheckRequest) string {
 	return fmt.Sprintf("%s@%s@%s", tuple.StringONR(req.ObjectAndRelation), tuple.StringONR(req.Subject), req.Metadata.AtRevision)
 }

internal/dispatch/caching/cachingdispatch_test.go

@@ -101,6 +101,7 @@ func TestMaxDepthCaching(t *testing.T) {
 
 			dispatch, err := NewCachingDispatcher(delegate, nil, "")
 			require.NoError(err)
+			defer dispatch.Close()
 
 			for _, step := range tc.script {
 				resp, err := dispatch.DispatchCheck(context.Background(), &v1.DispatchCheckRequest{
@@ -140,3 +141,7 @@ func (ddm delegateDispatchMock) DispatchExpand(ctx context.Context, req *v1.Disp
 func (ddm delegateDispatchMock) DispatchLookup(ctx context.Context, req *v1.DispatchLookupRequest) (*v1.DispatchLookupResponse, error) {
 	return &v1.DispatchLookupResponse{}, nil
 }
+
+func (ddm delegateDispatchMock) Close() error {
+	return nil
+}

internal/dispatch/dispatch.go

@@ -19,6 +19,9 @@ type Dispatcher interface {
 	Check
 	Expand
 	Lookup
+
+	// Close closes the dispatcher.
+	Close() error
 }
 
 // Check interface describes just the methods required to dispatch check requests.

internal/dispatch/graph/graph.go

@@ -159,6 +159,10 @@ func (ld *localDispatcher) DispatchLookup(ctx context.Context, req *v1.DispatchL
 	return ld.lookupHandler.Lookup(ctx, req)
 }
 
+func (ld *localDispatcher) Close() error {
+	return nil
+}
+
 func rewriteError(original error) error {
 	nsNotFound := datastore.ErrNamespaceNotFound{}
 

internal/dispatch/remote/cluster.go

@@ -67,6 +67,10 @@ func (cr *clusterDispatcher) DispatchLookup(ctx context.Context, req *v1.Dispatc
 	return resp, nil
 }
 
+func (cr *clusterDispatcher) Close() error {
+	return nil
+}
+
 // Always verify that we implement the interface
 var _ dispatch.Dispatcher = &clusterDispatcher{}