etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kvm: Fix double-escape issue while creating rbd disk options (#4568) 

This fixes issue introduced in c3554ec31d
which enable block of code that will double escape rados host/monitor
port.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2021-01-05 15:23:38 +05:30 committed by GitHub
parent d4580f3e50
commit c82688a355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java
View File

@ -29,7 +29,7 @@ public class KVMPhysicalDisk {
rbdOpts = "rbd:" + image;
rbdOpts += ":mon_host=" + monHost;
if (monPort > 0) {
rbdOpts += "\\\\:" + monPort;
rbdOpts += "\\:" + monPort;
}
if (authUserName == null) {

2
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java
View File

@ -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() {