Skip to content

Remove automanaged vhd functionality #899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcantah merged 1 commit into from
Nov 24, 2020
Merged

Remove automanaged vhd functionality #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions internal/hcsoci/resources_lcow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ func allocateLinuxResources(ctx context.Context, coi *createOptionsInternal, r *
case "bind":
case "physical-disk":
case "virtual-disk":
case "automanage-virtual-disk":
default:
// Unknown mount type
continue
Expand Down Expand Up @@ -103,7 +102,7 @@ func allocateLinuxResources(ctx context.Context, coi *createOptionsInternal, r *
uvmPathForShare = scsiMount.UVMPath
r.Add(scsiMount)
coi.Spec.Mounts[i].Type = "none"
} else if mount.Type == "virtual-disk" || mount.Type == "automanage-virtual-disk" {
} else if mount.Type == "virtual-disk" {
l.Debug("hcsshim::allocateLinuxResources Hot-adding SCSI virtual disk for OCI mount")
uvmPathForShare = fmt.Sprintf(uvm.LCOWGlobalMountPrefix, coi.HostingSystem.UVMMountCounter())

Expand All @@ -116,9 +115,6 @@ func allocateLinuxResources(ctx context.Context, coi *createOptionsInternal, r *

uvmPathForFile = scsiMount.UVMPath
uvmPathForShare = scsiMount.UVMPath
if mount.Type == "automanage-virtual-disk" {
r.Add(uvm.NewAutoManagedVHD(scsiMount.HostPath))
}
r.Add(scsiMount)
coi.Spec.Mounts[i].Type = "none"
} else if strings.HasPrefix(mount.Source, "sandbox://") {
Expand Down
6 changes: 1 addition & 5 deletions internal/hcsoci/resources_wcow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ func allocateWindowsResources(ctx context.Context, coi *createOptionsInternal, r
case "":
case "physical-disk":
case "virtual-disk":
case "automanage-virtual-disk":
default:
return fmt.Errorf("invalid OCI spec - Type '%s' not supported", mount.Type)
}
Expand All @@ -94,16 +93,13 @@ func allocateWindowsResources(ctx context.Context, coi *createOptionsInternal, r
}
coi.Spec.Mounts[i].Type = ""
r.Add(scsiMount)
} else if mount.Type == "virtual-disk" || mount.Type == "automanage-virtual-disk" {
} else if mount.Type == "virtual-disk" {
l.Debug("hcsshim::allocateWindowsResources Hot-adding SCSI virtual disk for OCI mount")
scsiMount, err := coi.HostingSystem.AddSCSI(ctx, mount.Source, uvmPath, readOnly, uvm.VMAccessTypeIndividual)
if err != nil {
return fmt.Errorf("adding SCSI virtual disk mount %+v: %s", mount, err)
}
coi.Spec.Mounts[i].Type = ""
if mount.Type == "automanage-virtual-disk" {
r.Add(uvm.NewAutoManagedVHD(scsiMount.HostPath))
}
r.Add(scsiMount)
} else {
if uvm.IsPipe(mount.Source) {
Expand Down
27 changes: 0 additions & 27 deletions internal/uvm/automanagedvhd.go
View file
Open in desktop

This file was deleted.