From 24da5c1ead109cd268c5ff17abc2f084c0922c8f Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 4 Jan 2021 19:52:27 +0530 Subject: [PATCH 1/2] kvm: Fix double-escape issue while creating rbd disk options This fixes issue introduced in c3554ec31dafbdfaa0ed646afb17a6f3378571f5 which enable block of code that will double escape rados host/monitor port. Signed-off-by: Rohit Yadav --- .../java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java index 221a3d7c1808..5b4a61058d53 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java @@ -29,7 +29,7 @@ public static String RBDStringBuilder(String monHost, int monPort, String authUs rbdOpts = "rbd:" + image; rbdOpts += ":mon_host=" + monHost; if (monPort > 0) { - rbdOpts += "\\\\:" + monPort; + rbdOpts += "\\:" + monPort; } if (authUserName == null) { From c2faeebe2b2e4d0ae2291e9c5f6b894493b1e349 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 5 Jan 2021 12:10:48 +0530 Subject: [PATCH 2/2] fix unit test Signed-off-by: Rohit Yadav --- .../com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java index bd644c85cd8c..cf39dceb1a5c 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java @@ -25,7 +25,7 @@ public class KVMPhysicalDiskTest extends TestCase { public void testRBDStringBuilder() { assertEquals(KVMPhysicalDisk.RBDStringBuilder("ceph-monitor", 8000, "admin", "supersecret", "volume1"), - "rbd:volume1:mon_host=ceph-monitor\\\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30"); + "rbd:volume1:mon_host=ceph-monitor\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30"); } public void testAttributes() {