feat: Adds logging when there are no shards during backup and restore

backup/backup.go

@@ -8,11 +8,13 @@ import (
 	"github.com/influxdata/influxdb/v2"
 	"github.com/influxdata/influxdb/v2/tenant"
 	"github.com/influxdata/influxdb/v2/v1/services/meta"
+	"go.uber.org/zap"
 )
 
 type BucketManifestWriter struct {
-	ts *tenant.Service
-	mc *meta.Client
+	ts     *tenant.Service
+	mc     *meta.Client
+	logger *zap.Logger
 }
 
 func NewBucketManifestWriter(ts *tenant.Service, mc *meta.Client) BucketManifestWriter {
@@ -22,6 +24,10 @@ func NewBucketManifestWriter(ts *tenant.Service, mc *meta.Client) BucketManifest
 	}
 }
 
+func (b *BucketManifestWriter) WithLogger(logger *zap.Logger) {
+	b.logger = logger
+}
+
 // WriteManifest writes a bucket manifest describing all of the buckets that exist in the database.
 // It is intended to be used to write to an HTTP response after appropriate measures have been taken
 // to ensure that the request is authorized.
@@ -40,11 +46,30 @@ func (b BucketManifestWriter) WriteManifest(ctx context.Context, w io.Writer) er
 		}
 
 		dbInfo := b.mc.Database(bkt.ID.String())
+		if dbInfo == nil {
+			b.logger.Error("Backup: could not find database", zap.String("id", bkt.ID.String()))
+			continue
+		}
 
 		var description *string
 		if bkt.Description != "" {
 			description = &bkt.Description
 		}
+		rpManifests := retentionPolicyToManifest(dbInfo.RetentionPolicies)
+
+		if b.logger != nil {
+			for _, rpManifest := range rpManifests {
+				for _, sg := range rpManifest.ShardGroups {
+					if len(sg.Shards) <= 0 && sg.DeletedAt == nil {
+						b.logger.Warn("Backup: ShardGroup has not been deleted and has no shards",
+							zap.String("bucket", bkt.Name),
+							zap.String("rp", bkt.RetentionPolicyName),
+							zap.Uint64("shard-group-id", sg.ID), zap.Time("start-time", sg.StartTime),
+							zap.Time("end-time", sg.EndTime))
+					}
+				}
+			}
+		}
 
 		l = append(l, influxdb.BucketMetadataManifest{
 			OrganizationID:         bkt.OrgID,
@@ -53,7 +78,7 @@ func (b BucketManifestWriter) WriteManifest(ctx context.Context, w io.Writer) er
 			BucketName:             bkt.Name,
 			Description:            description,
 			DefaultRetentionPolicy: dbInfo.DefaultRetentionPolicy,
-			RetentionPolicies:      retentionPolicyToManifest(dbInfo.RetentionPolicies),
+			RetentionPolicies:      rpManifests,
 		})
 	}
 

cmd/influxd/launcher/launcher.go

@@ -634,6 +634,7 @@ func (m *Launcher) run(ctx context.Context, opts *InfluxdOpts) (err error) {
 	ts.BucketService = dbrp.NewBucketService(m.log, ts.BucketService, dbrpSvc)
 
 	bucketManifestWriter := backup.NewBucketManifestWriter(ts, metaClient)
+	bucketManifestWriter.WithLogger(m.log.With(zap.String("service", "bucket-manifest-writer")))
 
 	onboardingLogger := m.log.With(zap.String("handler", "onboard"))
 	onboardOpts := []tenant.OnboardServiceOptionFn{tenant.WithOnboardingLogger(onboardingLogger)}

http/restore_service.go

@@ -226,6 +226,18 @@ func (h *RestoreHandler) handleRestoreBucketMetadata(w http.ResponseWriter, r *h
 		return
 	}
 
+	for _, rps := range b.RetentionPolicies {
+		for _, sg := range rps.ShardGroups {
+			if len(sg.Shards) <= 0 && sg.DeletedAt == nil {
+				h.Logger.Warn("Restore: ShardGroup has not been deleted and has no shards",
+					zap.String("bucket", b.BucketName),
+					zap.String("rp", rps.Name),
+					zap.Uint64("shard-group-id", sg.ID), zap.Time("start-time", sg.StartTime),
+					zap.Time("end-time", sg.EndTime))
+			}
+		}
+	}
+
 	// Create the bucket - This will fail if the bucket already exists.
 	// TODO: Could we support restoring to an existing bucket?
 	var description string