Use trylock for populating parents/children in catalog queries (#2747)

rilldata · Jul 7, 2023 · 2bca601 · 2bca601
1 parent 3d105ab
commit 2bca601
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/runtime/services/catalog/catalog.go b/runtime/services/catalog/catalog.go
@@ -52,10 +52,12 @@ func (s *Service) FindEntries(ctx context.Context, typ drivers.ObjectType) ([]*d
 	if err != nil {
 		return nil, err
 	}
-	s.Meta.lock.RLock()
-	defer s.Meta.lock.RUnlock()
-	for _, entry := range entries {
-		s.Meta.fillDAGInEntry(entry)
+	if s.Meta.lock.TryRLock() {
+		defer s.Meta.lock.RUnlock()
+
+		for _, entry := range entries {
+			s.Meta.fillDAGInEntry(entry)
+		}
 	}
 	return entries, nil
 }
@@ -65,9 +67,11 @@ func (s *Service) FindEntry(ctx context.Context, name string) (*drivers.CatalogE
 	if err != nil {
 		return nil, err
 	}
-	s.Meta.lock.RLock()
-	defer s.Meta.lock.RUnlock()
-	s.Meta.fillDAGInEntry(entry)
+	if s.Meta.lock.TryRLock() {
+		defer s.Meta.lock.RUnlock()
+
+		s.Meta.fillDAGInEntry(entry)
+	}
 	return entry, nil
 }