Merge pull request #194 from HileQAQ/main

liulanzheng · web-flow · commit 6dff475f0805 · 2023-05-12T15:22:10.000+08:00
Erase writable label in Prepare if not overlaybd
diff --git a/pkg/snapshot/overlay.go b/pkg/snapshot/overlay.go
@@ -527,6 +527,11 @@ func (o *snapshotter) createMountPoint(ctx context.Context, kind snapshots.Kind,
 			// do nothing
 		}
 	}
+	if _, writableBD := info.Labels[label.SupportReadWriteMode]; stype == storageTypeNormal && writableBD {
+		// if is not overlaybd writable layer, delete label before commit
+		delete(info.Labels, label.SupportReadWriteMode)
+		storage.UpdateInfo(ctx, info)
+	}
 
 	rollback = false
 	if err := t.Commit(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -527,6 +527,11 @@ func (o *snapshotter) createMountPoint(ctx context.Context, kind snapshots.Kind,`
`527`	`527`	`// do nothing`
`528`	`528`	`}`
`529`	`529`	`}`
	`530`	`+ if _, writableBD := info.Labels[label.SupportReadWriteMode]; stype == storageTypeNormal && writableBD {`
	`531`	`+ // if is not overlaybd writable layer, delete label before commit`
	`532`	`+ delete(info.Labels, label.SupportReadWriteMode)`
	`533`	`+ storage.UpdateInfo(ctx, info)`
	`534`	`+ }`
`530`	`535`
`531`	`536`	`rollback = false`
`532`	`537`	`if err := t.Commit(); err != nil {`