Skip to content

Commit e0c6864

Browse files
committed
resolved conflict in clean up monitor
1 parent a668d04 commit e0c6864

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class IscsiStorageCleanupMonitor implements Runnable{
3838
private static final String ISCSI_PATH_PREFIX = "/dev/disk/by-path";
3939
private static final String KEYWORD_ISCSI = "iscsi";
4040
private static final String KEYWORD_IQN = "iqn";
41+
private static final String KEYWORD_PART = "part";
4142

4243
private IscsiAdmStorageAdaptor iscsiStorageAdaptor;
4344

@@ -114,7 +115,7 @@ private void updateDiskStatusMapWithInactiveIscsiSessions(Connect conn){
114115

115116
//check the volume map. If an entry exists change the status to True
116117
for (final LibvirtVMDef.DiskDef disk : disks) {
117-
if (diskStatusMap.containsKey(disk.getDiskPath())) {
118+
if (diskStatusMap.containsKey(disk.getDiskPath())&&!disk.getDiskPath().contains(KEYWORD_PART)) {
118119
diskStatusMap.put(disk.getDiskPath(), true);
119120
s_logger.debug("active disk found by cleanup thread" + disk.getDiskPath());
120121
}

0 commit comments

Comments
 (0)