This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.15 by this push:
new c82688a kvm: Fix double-escape issue while creating rbd disk options
(#4568)
c82688a is described below
commit c82688a3559929fafa388192b949f4136b5d3d27
Author: Rohit Yadav <[email protected]>
AuthorDate: Tue Jan 5 15:23:38 2021 +0530
kvm: Fix double-escape issue while creating rbd disk options (#4568)
This fixes issue introduced in c3554ec31dafbdfaa0ed646afb17a6f3378571f5
which enable block of code that will double escape rados host/monitor
port.
Signed-off-by: Rohit Yadav <[email protected]>
---
.../src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java | 2 +-
.../test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 221a3d7..5b4a610 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 class KVMPhysicalDisk {
rbdOpts = "rbd:" + image;
rbdOpts += ":mon_host=" + monHost;
if (monPort > 0) {
- rbdOpts += "\\\\:" + monPort;
+ rbdOpts += "\\:" + monPort;
}
if (authUserName == null) {
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 bd644c8..cf39dce 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() {
