Repository: cloudstack Updated Branches: refs/heads/master 55983d47c -> 718fd5f39
CLOUDSTACK-7445: Number whitespaces in "rbd showmapped" command varies in plain format. Use regex in grep to workaround. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/718fd5f3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/718fd5f3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/718fd5f3 Branch: refs/heads/master Commit: 718fd5f39f34500f9defdeb8193e69ee01cff3b7 Parents: 55983d4 Author: Kishan Kavala <kis...@apache.org> Authored: Wed Aug 27 16:13:35 2014 +0530 Committer: Kishan Kavala <kis...@apache.org> Committed: Wed Aug 27 16:13:35 2014 +0530 ---------------------------------------------------------------------- .../com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/718fd5f3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java index 6b7a195..2280672 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java @@ -947,7 +947,7 @@ public class KVMStorageProcessor implements StorageProcessor { if (resource.getHypervisorType() == Hypervisor.HypervisorType.LXC) { String[] splitPoolImage = attachingDisk.getPath().split("/"); //ToDo: rbd showmapped supports json and xml output. Use json/xml to get device - String device = Script.runSimpleBashScript("rbd showmapped | grep \""+splitPoolImage[0]+" "+splitPoolImage[1]+"\" | cut -d \" \" -f10"); + String device = Script.runSimpleBashScript("rbd showmapped | grep \""+splitPoolImage[0]+"[ ]*"+splitPoolImage[1]+"\" | grep -o \"[^ ]*[ ]*$\""); if (device != null) { s_logger.debug("RBD device on host is: "+device); attachingDisk.setPath(device); @@ -974,7 +974,7 @@ public class KVMStorageProcessor implements StorageProcessor { //Split pool and image details from disk path String[] splitPoolImage = attachingDisk.getPath().split("/"); //ToDo: rbd showmapped supports json and xml output. Use json/xml to get device - String device = Script.runSimpleBashScript("rbd showmapped | grep \""+splitPoolImage[0]+" "+splitPoolImage[1]+"\" | cut -d \" \" -f10"); + String device = Script.runSimpleBashScript("rbd showmapped | grep \""+splitPoolImage[0]+"[ ]*"+splitPoolImage[1]+"\" | grep -o \"[^ ]*[ ]*$\""); if (device != null) { s_logger.debug("RBD device on host is: "+device); diskdef.defBlockBasedDisk(device, devId, DiskDef.diskBus.VIRTIO);
