File tree Expand file tree Collapse file tree
plugin/kvm/src/main/java/org/zstack/kvm Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -497,7 +497,7 @@ public boolean isVmDoNotNeedToTrace(String vmUuid) {
497497 return true ;
498498 } else {
499499 // Expired, clean up
500- orphanedSkipVms .remove (vmUuid );
500+ orphanedSkipVms .remove (vmUuid , orphanedAt );
501501 logger .info (String .format ("orphaned skip entry for VM[uuid:%s] expired after %d minutes, resuming trace" ,
502502 vmUuid , ORPHAN_TTL_MS / 60000 ));
503503 }
@@ -513,11 +513,9 @@ private void cleanupExpiredOrphanedSkipVms() {
513513 }
514514
515515 long now = System .currentTimeMillis ();
516- Iterator <Map .Entry <String , Long >> it = orphanedSkipVms .entrySet ().iterator ();
517- while (it .hasNext ()) {
518- Map .Entry <String , Long > entry = it .next ();
516+ for (Map .Entry <String , Long > entry : orphanedSkipVms .entrySet ()) {
519517 if (now - entry .getValue () >= ORPHAN_TTL_MS ) {
520- it .remove ();
518+ orphanedSkipVms .remove (entry . getKey (), entry . getValue () );
521519 logger .info (String .format ("cleaned up expired orphaned skip entry for VM[uuid:%s]" , entry .getKey ()));
522520 }
523521 }
You can’t perform that action at this time.
0 commit comments