Merge pull request #5283 from alakesh/check-out-of-space

estesp · web-flow · commit b7c813690157 · 2021-04-12T20:37:13.000-04:00
devmapper: log pool status when mkfs fails
diff --git a/snapshots/devmapper/dmsetup/dmsetup.go b/snapshots/devmapper/dmsetup/dmsetup.go
@@ -274,10 +274,11 @@ func Version() (string, error) {
 
 // DeviceStatus represents devmapper device status information
 type DeviceStatus struct {
-	Offset int64
-	Length int64
-	Target string
-	Params []string
+	RawOutput string
+	Offset    int64
+	Length    int64
+	Target    string
+	Params    []string
 }
 
 // Status provides status information for devmapper device
@@ -291,6 +292,7 @@ func Status(deviceName string) (*DeviceStatus, error) {
 	if err != nil {
 		return nil, err
 	}
+	status.RawOutput = output
 
 	// Status output format:
 	//  Offset (int64)
diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go
@@ -366,8 +366,13 @@ func (s *Snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
 		}
 
 		if err := mkfs(ctx, dmsetup.GetFullDevicePath(deviceName)); err != nil {
+			status, sErr := dmsetup.Status(s.pool.poolName)
+			if sErr != nil {
+				multierror.Append(err, sErr)
+			}
+
 			// Rollback thin device creation if mkfs failed
-			log.G(ctx).WithError(err).Errorf("failed to initialize thin device %q for snapshot %s", deviceName, snap.ID)
+			log.G(ctx).WithError(err).Errorf("failed to initialize thin device %q for snapshot %s pool status %s", deviceName, snap.ID, status.RawOutput)
 			return nil, multierror.Append(err,
 				s.pool.RemoveDevice(ctx, deviceName))
 		}

Original file line number	Diff line number	Diff line change
`@@ -366,8 +366,13 @@ func (s *Snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`if err := mkfs(ctx, dmsetup.GetFullDevicePath(deviceName)); err != nil {`
	`369`	`+ status, sErr := dmsetup.Status(s.pool.poolName)`
	`370`	`+ if sErr != nil {`
	`371`	`+ multierror.Append(err, sErr)`
	`372`	`+ }`
	`373`	`+`
`369`	`374`	`// Rollback thin device creation if mkfs failed`
`370`		`- log.G(ctx).WithError(err).Errorf("failed to initialize thin device %q for snapshot %s", deviceName, snap.ID)`
	`375`	`+ log.G(ctx).WithError(err).Errorf("failed to initialize thin device %q for snapshot %s pool status %s", deviceName, snap.ID, status.RawOutput)`
`371`	`376`	`return nil, multierror.Append(err,`
`372`	`377`	`s.pool.RemoveDevice(ctx, deviceName))`
`373`	`378`	`}`