Update disk resize to work with lvms-storage-operator/topolvm
#4114
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| package machine | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/crc-org/crc/v2/pkg/crc/constants" | ||
| logging "github.com/crc-org/crc/v2/pkg/crc/logging" | ||
| "github.com/crc-org/crc/v2/pkg/crc/machine/types" | ||
| crcPreset "github.com/crc-org/crc/v2/pkg/crc/preset" | ||
| crcssh "github.com/crc-org/crc/v2/pkg/crc/ssh" | ||
| "golang.org/x/crypto/ssh" | ||
| ) | ||
|
|
||
| func growPartition(sshRunner *crcssh.Runner, partition string) error { | ||
| if _, _, err := sshRunner.RunPrivileged(fmt.Sprintf("Growing %s partition", partition), "/usr/bin/growpart", partition[:len("/dev/.da")], partition[len("/dev/.da"):]); err != nil { | ||
| var exitErr *ssh.ExitError | ||
| if !errors.As(err, &exitErr) { | ||
| return err | ||
| } | ||
| if exitErr.ExitStatus() != 1 { | ||
| return err | ||
| } | ||
| logging.Debugf("No free space after %s, nothing to do", partition) | ||
| return nil | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func ocpGetPVShiftSize(diskSize int, pvSize int) int { | ||
| defaultPvSize := constants.GetDefaultPersistentVolumeSize(crcPreset.OpenShift) | ||
| if pvSize > defaultPvSize { | ||
| return (diskSize - constants.DefaultDiskSize) - (pvSize - defaultPvSize) | ||
| } | ||
| return diskSize - constants.DefaultDiskSize | ||
| } | ||
|
|
||
| func moveTopolvmPartition(ctx context.Context, shiftSize int, vm *virtualMachine, sshRunner *crcssh.Runner) error { | ||
| pvPartition, err := getTopolvmPartition(sshRunner) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| _, _, err = sshRunner.RunPrivileged("move topolvm partition to end of disk", | ||
| fmt.Sprintf("echo '+%dG,' | sudo sfdisk --move-data /dev/vda -N %s --force", shiftSize, pvPartition[len("/dev/.da"):])) | ||
| var exitErr *ssh.ExitError | ||
| if err != nil { | ||
| if !errors.As(err, &exitErr) { | ||
| return err | ||
| } | ||
| if exitErr.ExitStatus() != 1 { | ||
| return err | ||
| } | ||
| } | ||
| if err == nil { | ||
| logging.Info("Restart VM after moving topolvm partition to end") | ||
| if err := restartHost(ctx, vm, sshRunner); err != nil { | ||
| return fmt.Errorf("Failed to move topolvm partition to increase root partition size: %w", err) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func growRootFileSystem(ctx context.Context, startConfig types.StartConfig, vm *virtualMachine, sshRunner *crcssh.Runner) error { | ||
| if startConfig.Preset == crcPreset.OpenShift { | ||
| sizeToMove := ocpGetPVShiftSize(startConfig.DiskSize, startConfig.PersistentVolumeSize) | ||
| if err := moveTopolvmPartition(ctx, sizeToMove, vm, sshRunner); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| rootPart, err := getrootPartition(sshRunner, startConfig.Preset) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := growPersistentVolume(sshRunner, startConfig.Preset, startConfig.PersistentVolumeSize); err != nil { | ||
| return fmt.Errorf("Unable to grow persistent volume partition: %w", err) | ||
| } | ||
|
|
||
| // with '/dev/[sv]da4' as input, run 'growpart /dev/[sv]da 4' | ||
| if err := growPartition(sshRunner, rootPart); err != nil { | ||
| return nil | ||
| } | ||
|
|
||
| logging.Infof("Resizing %s filesystem", rootPart) | ||
| rootFS := "/sysroot" | ||
| if _, _, err := sshRunner.RunPrivileged(fmt.Sprintf("Remounting %s read/write", rootFS), "mount -o remount,rw", rootFS); err != nil { | ||
| return err | ||
| } | ||
| if _, _, err = sshRunner.RunPrivileged(fmt.Sprintf("Growing %s filesystem", rootFS), "xfs_growfs", rootFS); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func growPersistentVolume(sshRunner *crcssh.Runner, preset crcPreset.Preset, persistentVolumeSize int) error { | ||
| if preset == crcPreset.Microshift { | ||
| rootPart, err := getrootPartition(sshRunner, preset) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| lvFullName := "rhel/root" | ||
| if err := growLVForMicroshift(sshRunner, lvFullName, rootPart, persistentVolumeSize); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| if preset == crcPreset.OpenShift { | ||
| pvPartition, err := getTopolvmPartition(sshRunner) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if _, _, err := sshRunner.RunPrivileged(fmt.Sprintf("Growing %s partition", pvPartition), "/usr/bin/growpart", pvPartition[:len("/dev/.da")], pvPartition[len("/dev/.da"):]); err != nil { | ||
| var exitErr *ssh.ExitError | ||
| if !errors.As(err, &exitErr) { | ||
| return err | ||
| } | ||
| if exitErr.ExitStatus() != 1 { | ||
| return err | ||
| } | ||
| logging.Debugf("No free space after %s, nothing to do", pvPartition) | ||
| return nil | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func getrootPartition(sshRunner *crcssh.Runner, preset crcPreset.Preset) (string, error) { | ||
| query := "--label root" | ||
| if preset == crcPreset.Microshift { | ||
| query = "-t TYPE=LVM2_member" | ||
| } | ||
| return getDeviceID(sshRunner, query) | ||
| } | ||
|
|
||
| func getTopolvmPartition(sshRunner *crcssh.Runner) (string, error) { | ||
| return getDeviceID(sshRunner, "-t PARTLABEL=topolvm") | ||
| } | ||
|
|
||
| func getDeviceID(sshRunner *crcssh.Runner, query string) (string, error) { | ||
| part, _, err := sshRunner.RunPrivileged("Get device id", "/usr/sbin/blkid", query, "-o", "device") | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| parts := strings.Split(strings.TrimSpace(part), "\n") | ||
| if len(parts) != 1 { | ||
| return "", fmt.Errorf("Unexpected number of devices: %s", part) | ||
| } | ||
| part = strings.TrimSpace(parts[0]) | ||
| if !strings.HasPrefix(part, "/dev/vda") && !strings.HasPrefix(part, "/dev/sda") { | ||
| return "", fmt.Errorf("Unexpected device: %s", part) | ||
| } | ||
| return part, nil | ||
| } | ||
|
|
||
| func growLVForMicroshift(sshRunner *crcssh.Runner, lvFullName string, rootPart string, persistentVolumeSize int) error { | ||
| if _, _, err := sshRunner.RunPrivileged("Resizing the physical volume(PV)", "/usr/sbin/pvresize", "--devices", rootPart, rootPart); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Get the size of volume group | ||
| sizeVG, _, err := sshRunner.RunPrivileged("Get the volume group size", "/usr/sbin/vgs", "--noheadings", "--nosuffix", "--units", "b", "-o", "vg_size", "--devices", rootPart) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| vgSize, err := strconv.Atoi(strings.TrimSpace(sizeVG)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Get the size of root lv | ||
| sizeLV, _, err := sshRunner.RunPrivileged("Get the size of root logical volume", "/usr/sbin/lvs", "-S", fmt.Sprintf("lv_full_name=%s", lvFullName), "--noheadings", "--nosuffix", "--units", "b", "-o", "lv_size", "--devices", rootPart) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| lvSize, err := strconv.Atoi(strings.TrimSpace(sizeLV)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| GB := 1073741824 | ||
| vgFree := persistentVolumeSize * GB | ||
| expectedLVSize := vgSize - vgFree | ||
| sizeToIncrease := expectedLVSize - lvSize | ||
| lvPath := fmt.Sprintf("/dev/%s", lvFullName) | ||
| if sizeToIncrease > 1 { | ||
| logging.Info("Extending and resizing '/dev/rhel/root' logical volume") | ||
| if _, _, err := sshRunner.RunPrivileged("Extending and resizing the logical volume(LV)", "/usr/sbin/lvextend", "-L", fmt.Sprintf("+%db", sizeToIncrease), lvPath, "--devices", rootPart); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will it be enough? because registry also going to use the pvc which is going to part of this partition and if a user mirror an image to openshift or even build a image from openshift then this space is going to be filled very fast :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right, we might have to increase the default disk-size, but there's very limited free space available, and currently that space is shared for both image-registry and host container image storage, with this since we have to create a separate partition this becomes more apparent:
We only have 7.6G free space, of which now
4.6Gis for host container images and3Gfor PVsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we can increase the default
disk-sizeto 40 and defaultpersistent-volume-sizeto 7, these are just arbitrary numbers, but it'd leave around 7gb free space on the root partition (closer to the current situation)(the bundle sizes are also increasing which would mean less free space for workloads, right? i saw the
4.16.3bundle from CI in 400MB larger than the 4.16.0 bundle)