Update namespace empty check to use buckets

dmcgowan · dmcgowan · commit 5a67161dc075 · 2018-01-17T15:04:58.000-08:00
Directly get and check whether a bucket is empty.
This prevents unnecessarily loading all records of
the buckets into memory just to check existence.
Also added checks for content and snapshots.

Signed-off-by: Derek McGowan &lt;derek@mcgstyle.net&gt;
diff --git a/metadata/buckets.go b/metadata/buckets.go
@@ -106,13 +106,8 @@ func imagesBucketPath(namespace string) [][]byte {
 	return [][]byte{bucketKeyVersion, []byte(namespace), bucketKeyObjectImages}
 }
 
-func withImagesBucket(tx *bolt.Tx, namespace string, fn func(bkt *bolt.Bucket) error) error {
-	bkt, err := createBucketIfNotExists(tx, imagesBucketPath(namespace)...)
-	if err != nil {
-		return err
-	}
-
-	return fn(bkt)
+func createImagesBucket(tx *bolt.Tx, namespace string) (*bolt.Bucket, error) {
+	return createBucketIfNotExists(tx, imagesBucketPath(namespace)...)
 }
 
 func getImagesBucket(tx *bolt.Tx, namespace string) *bolt.Bucket {
@@ -143,6 +138,10 @@ func createSnapshotterBucket(tx *bolt.Tx, namespace, snapshotter string) (*bolt.
 	return bkt, nil
 }
 
+func getSnapshottersBucket(tx *bolt.Tx, namespace string) *bolt.Bucket {
+	return getBucket(tx, bucketKeyVersion, []byte(namespace), bucketKeyObjectSnapshots)
+}
+
 func getSnapshotterBucket(tx *bolt.Tx, namespace, snapshotter string) *bolt.Bucket {
 	return getBucket(tx, bucketKeyVersion, []byte(namespace), bucketKeyObjectSnapshots, []byte(snapshotter))
 }
diff --git a/metadata/namespaces.go b/metadata/namespaces.go
@@ -133,31 +133,38 @@ func (s *namespaceStore) Delete(ctx context.Context, namespace string) error {
 }
 
 func (s *namespaceStore) namespaceEmpty(ctx context.Context, namespace string) (bool, error) {
-	ctx = namespaces.WithNamespace(ctx, namespace)
-
-	// need to check the various object stores.
-
-	imageStore := NewImageStore(s.tx)
-	images, err := imageStore.List(ctx)
-	if err != nil {
-		return false, err
-	}
-	if len(images) > 0 {
-		return false, nil
+	// Get all data buckets
+	buckets := []*bolt.Bucket{
+		getImagesBucket(s.tx, namespace),
+		getBlobsBucket(s.tx, namespace),
+		getContainersBucket(s.tx, namespace),
+	}
+	if snbkt := getSnapshottersBucket(s.tx, namespace); snbkt != nil {
+		if err := snbkt.ForEach(func(k, v []byte) error {
+			if v == nil {
+				buckets = append(buckets, snbkt.Bucket(k))
+			}
+			return nil
+		}); err != nil {
+			return false, err
+		}
 	}
 
-	containerStore := NewContainerStore(s.tx)
-	containers, err := containerStore.List(ctx)
-	if err != nil {
-		return false, err
+	// Ensure data buckets are empty
+	for _, bkt := range buckets {
+		if !isBucketEmpty(bkt) {
+			return false, nil
+		}
 	}
 
-	if len(containers) > 0 {
-		return false, nil
-	}
+	return true, nil
+}
 
-	// TODO(stevvooe): Need to add check for content store, as well. Still need
-	// to make content store namespace aware.
+func isBucketEmpty(bkt *bolt.Bucket) bool {
+	if bkt == nil {
+		return true
+	}
 
-	return true, nil
+	k, _ := bkt.Cursor().First()
+	return k == nil
 }

Original file line number	Diff line number	Diff line change
`@@ -106,13 +106,8 @@ func imagesBucketPath(namespace string) [][]byte {`
`106`	`106`	`return [][]byte{bucketKeyVersion, []byte(namespace), bucketKeyObjectImages}`
`107`	`107`	`}`
`108`	`108`
`109`		`-func withImagesBucket(tx bolt.Tx, namespace string, fn func(bkt bolt.Bucket) error) error {`
`110`		`- bkt, err := createBucketIfNotExists(tx, imagesBucketPath(namespace)...)`
`111`		`- if err != nil {`
`112`		`- return err`
`113`		`- }`
`114`		`-`
`115`		`- return fn(bkt)`
	`109`	`+func createImagesBucket(tx bolt.Tx, namespace string) (bolt.Bucket, error) {`
	`110`	`+ return createBucketIfNotExists(tx, imagesBucketPath(namespace)...)`
`116`	`111`	`}`
`117`	`112`
`118`	`113`	`func getImagesBucket(tx bolt.Tx, namespace string) bolt.Bucket {`
`@@ -143,6 +138,10 @@ func createSnapshotterBucket(tx bolt.Tx, namespace, snapshotter string) (bolt.`
`143`	`138`	`return bkt, nil`
`144`	`139`	`}`
`145`	`140`
	`141`	`+func getSnapshottersBucket(tx bolt.Tx, namespace string) bolt.Bucket {`
	`142`	`+ return getBucket(tx, bucketKeyVersion, []byte(namespace), bucketKeyObjectSnapshots)`
	`143`	`+}`
	`144`	`+`
`146`	`145`	`func getSnapshotterBucket(tx bolt.Tx, namespace, snapshotter string) bolt.Bucket {`
`147`	`146`	`return getBucket(tx, bucketKeyVersion, []byte(namespace), bucketKeyObjectSnapshots, []byte(snapshotter))`
`148`	`147`	`}`