Skip to content

Initialize attached disk in windows ARM #42

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
aledsage merged 3 commits into from
Jan 18, 2018
Merged

Initialize attached disk in windows ARM #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e2b295
Implement attached windows disk initialization in Azure ARM
ivanayov Jul 11, 2017
63e8be6
Initialize windows disk in Azure ARM - simplify code to not use the A…
ivanayov Jul 12, 2017
3932f43
Adds drive-letter options when adding additional hard disk on Windows
nakomis Jan 12, 2018
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
115 changes: 69 additions & 46 deletions blockstore/src/main/java/brooklyn/location/blockstore/AbstractVolumeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import org.apache.brooklyn.location.jclouds.JcloudsMachineLocation;
import org.apache.brooklyn.location.jclouds.JcloudsMachineNamer;
import org.apache.brooklyn.location.ssh.SshMachineLocation;
import org.apache.brooklyn.location.winrm.WinRmMachineLocation;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.core.internal.winrm.WinRmToolResponse;
import org.jclouds.compute.domain.NodeMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -73,58 +75,79 @@ public MountedBlockDevice attachAndMountVolume(JcloudsMachineLocation machine, B
@Override
public void createFilesystem(AttachedBlockDevice attachedDevice, FilesystemOptions filesystemOptions) {
JcloudsMachineLocation machine = attachedDevice.getMachine();
if (!(machine instanceof SshMachineLocation)) {
throw new IllegalStateException("Cannot create filesystem for "+machine+" of type "+machine.getClass().getName()+"; expected "+SshMachineLocation.class.getSimpleName());
Copy link
Member

@aledsage aledsage Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we still throw this in an else block (if it's not SshMacheLocation or WinRmMachineLocation)?

}

String osDeviceName = getOSDeviceName(attachedDevice.getDeviceSuffix());
String filesystemType = filesystemOptions.getFilesystemType();
LOG.debug("Creating filesystem: device={}; osDeviceName={}, config={}", new Object[]{attachedDevice, osDeviceName, filesystemOptions});

// NOTE: also adds an entry to fstab so the mount remains available after a reboot.
Map<String, ?> flags = MutableMap.of("allocatePTY", true);

int exitCode = ((SshMachineLocation)machine).execCommands(flags, "Creating filesystem on volume", ImmutableList.of(
dontRequireTtyForSudo(),
waitForFileCmd(osDeviceName, 60),
installPackage(ImmutableMap.of("yum", "e4fsprogs"), null),
sudo("/sbin/mkfs -F -t " + filesystemType + " " + osDeviceName)));

if (exitCode != 0) {
throw new RuntimeException(format("Failed to create file system. machine=%s; osDeviceName=%s; filesystemType=%s",
machine, osDeviceName, filesystemType));
if (machine instanceof SshMachineLocation) {
String osDeviceName = getOSDeviceName(attachedDevice.getDeviceSuffix());
String filesystemType = filesystemOptions.getFilesystemType();
LOG.debug("Creating filesystem: device={}; osDeviceName={}, config={}", new Object[]{attachedDevice, osDeviceName, filesystemOptions});

// NOTE: also adds an entry to fstab so the mount remains available after a reboot.
Map<String, ?> flags = MutableMap.of("allocatePTY", true);

int exitCode = ((SshMachineLocation)machine).execCommands(flags, "Creating filesystem on volume", ImmutableList.of(
dontRequireTtyForSudo(),
waitForFileCmd(osDeviceName, 60),
installPackage(ImmutableMap.of("yum", "e4fsprogs"), null),
sudo("/sbin/mkfs -F -t " + filesystemType + " " + osDeviceName)));

if (exitCode != 0) {
throw new RuntimeException(format("Failed to create file system. machine=%s; osDeviceName=%s; filesystemType=%s",
machine, osDeviceName, filesystemType));
}
} else if (machine instanceof WinRmMachineLocation) {
String driveLetter = filesystemOptions.getMountPoint();
String driveLetterParam = Strings.isNullOrEmpty(driveLetter) ? "-AssignDriveLetter" : "-DriveLetter " + driveLetter;
String volumeLabel = filesystemOptions.getVolumeLabel();
String volumeLabelParam = Strings.isNullOrEmpty(volumeLabel) ? "datadisk" : volumeLabel;
WinRmToolResponse response = ((WinRmMachineLocation)machine).executePsScript("Get-Disk | Where partitionstyle -eq 'raw' | " +
// AWS May create an instance store volume, which we need to exclude
// See https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-windows-volumes.html#instance-store-volume-map
"Where {$_.SerialNumber -As [int] -NotIn 78..89 -Or $_.FriendlyName -Ne \"AWS PVDISK\"} | " +
"Initialize-Disk -PartitionStyle MBR -PassThru | New-Partition " + driveLetterParam + " -UseMaximumSize | " +
"Format-Volume -FileSystem " + filesystemOptions.getFilesystemType() +" -NewFileSystemLabel \"" + volumeLabelParam + "\" -Confirm:$false");
if (response.getStatusCode() != 0) {
throw new RuntimeException(format("Failed to initialize disk. machine=%s; filesystemType=%s; stdErr=%s;",
machine, filesystemOptions.getFilesystemType(), response.getStdErr()));
}
} else {
throw new IllegalStateException("Cannot create filesystem for " + machine + " of type "
+ machine.getClass().getName() + "; expected " + SshMachineLocation.class.getSimpleName()
+ " or " + WinRmMachineLocation.class.getSimpleName());
}
}

@Override
public MountedBlockDevice mountFilesystem(AttachedBlockDevice attachedDevice, FilesystemOptions options) {
JcloudsMachineLocation machine = attachedDevice.getMachine();
if (!(machine instanceof SshMachineLocation)) {
throw new IllegalStateException("Cannot mount filesystem for "+machine+" of type "+machine.getClass().getName()+"; expected "+SshMachineLocation.class.getSimpleName());
Copy link
Member

@aledsage aledsage Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, should we fail if it's not ssh or winrm?

}

LOG.debug("Mounting filesystem: device={}; options={}", attachedDevice, options);
String osDeviceName = getOSDeviceName(attachedDevice.getDeviceSuffix());
String mountPoint = options.getMountPoint();
String filesystemType = options.getFilesystemType();

// NOTE: also adds an entry to fstab so the mount remains available after a reboot.
Map<String, ?> flags = MutableMap.of("allocatePTY", true);
int exitCode = ((SshMachineLocation)machine).execCommands(flags, "Mounting EBS volume", ImmutableList.of(
dontRequireTtyForSudo(),
"echo making dir",
sudo("mkdir -p -m 755 " + mountPoint),
"echo updating fstab",
waitForFileCmd(osDeviceName, 60),
"echo \"" + osDeviceName + " " + mountPoint + " " + filesystemType + " noatime 0 0\" | " + sudo("tee -a /etc/fstab"),
"echo mounting device",
sudo("mount " + mountPoint),
"echo device mounted"
));

if (exitCode != 0) {
throw new RuntimeException(format("Failed to mount file system. machine=%s; osDeviceName=%s; mountPoint=%s; filesystemType=%s",
attachedDevice.getMachine(), osDeviceName, mountPoint, filesystemType));
if (machine instanceof SshMachineLocation) {
LOG.debug("Mounting filesystem: device={}; options={}", attachedDevice, options);
String osDeviceName = getOSDeviceName(attachedDevice.getDeviceSuffix());
String mountPoint = options.getMountPoint();
String filesystemType = options.getFilesystemType();

// NOTE: also adds an entry to fstab so the mount remains available after a reboot.
Map<String, ?> flags = MutableMap.of("allocatePTY", true);
int exitCode = ((SshMachineLocation)machine).execCommands(flags, "Mounting EBS volume", ImmutableList.of(
dontRequireTtyForSudo(),
"echo making dir",
sudo("mkdir -p -m 755 " + mountPoint),
"echo updating fstab",
waitForFileCmd(osDeviceName, 60),
"echo \"" + osDeviceName + " " + mountPoint + " " + filesystemType + " noatime 0 0\" | " + sudo("tee -a /etc/fstab"),
"echo mounting device",
sudo("mount " + mountPoint),
"echo device mounted"
));

if (exitCode != 0) {
throw new RuntimeException(format("Failed to mount file system. machine=%s; osDeviceName=%s; mountPoint=%s; filesystemType=%s",
attachedDevice.getMachine(), osDeviceName, mountPoint, filesystemType));
}
} else if (machine instanceof WinRmMachineLocation) {
LOG.debug("Ignoring mounting of filesystem on WinRmMachineLocation: device={}; options={}", attachedDevice, options);
} else {
throw new IllegalStateException("Cannot mount filesystem for " + machine + " of type "
+ machine.getClass().getName() + "; expected " + SshMachineLocation.class.getSimpleName()
+ " or " + WinRmMachineLocation.class.getSimpleName());
}

return attachedDevice.mountedAt(options.getMountPoint());
Expand Down
22 changes: 22 additions & 0 deletions blockstore/src/main/java/brooklyn/location/blockstore/FilesystemOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import java.util.Map;

import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;

public class FilesystemOptions {

private String mountPoint;
private String filesystemType;
private String volumeLabel;

// For more convenient yaml input
public static FilesystemOptions fromMap(Map<String, ?> map) {
FilesystemOptions result = new FilesystemOptions();
result.mountPoint = (String) map.get("mountPoint");
result.filesystemType = (String) map.get("filesystemType");
result.volumeLabel = (String) map.get("volumeLabel");
return result;
}

Expand All @@ -31,23 +34,42 @@ public FilesystemOptions(String mountPoint) {
}

public FilesystemOptions(String mountPoint, String filesystemType) {
this(mountPoint, filesystemType, "");
}

public FilesystemOptions(String mountPoint, String filesystemType, String volumeLabel) {
this.filesystemType = checkNotNull(filesystemType, "filesystemType");
this.mountPoint = checkNotNull(mountPoint, "mountPoint");
this.volumeLabel = Optional.fromNullable(volumeLabel).or("");
}

/*
For Linux machines, this will be the mount point, e.g. /data. For Windows systems, this is the drive letter, e.g. "G". A colon should not be included
*/
public String getMountPoint() {
return mountPoint;
}

/*
For Linux machines, this will be the file system type, e.g. ext3. For Windows system, this is the `-FileSystem` parameter passed to the `Format-Volume` cmdlet, e.g. NTFS
*/
public String getFilesystemType() {
return filesystemType;
}

/*
Windows only. The volume label to be assigned to the volume, e.g. "MyDataDrive"
*/
public String getVolumeLabel() {
return volumeLabel;
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("mountPoint", mountPoint)
.add("filesystemType", filesystemType)
.add("volumeLabel", volumeLabel)
.toString();
}
}