changes/improvements

Author: sureshanaparti

engine/schema/src/main/java/com/cloud/event/dao/EventDaoImpl.java

@@ -21,6 +21,7 @@
 import java.util.stream.Collectors;
 
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import com.cloud.event.Event.State;
@@ -106,14 +107,16 @@ public List<EventVO> listToArchiveOrDeleteEvents(List<Long> ids, String type, Da
 
     @Override
     public void archiveEvents(List<EventVO> events) {
-        if (events != null && !events.isEmpty()) {
-            List<Long> ids = events.stream().map(EventVO::getId).collect(Collectors.toList());
-            SearchCriteria<EventVO> sc = ArchiveByIdsSearch.create();
-            sc.setParameters("id", ids.toArray(new Object[ids.size()]));
-            EventVO eventForUpdate = createForUpdate();
-            eventForUpdate.setArchived(true);
-            UpdateBuilder ub = getUpdateBuilder(eventForUpdate);
-            update(ub, sc, null);
+        if (CollectionUtils.isEmpty(events)) {
+            return;
         }
+
+        List<Long> ids = events.stream().map(EventVO::getId).collect(Collectors.toList());
+        SearchCriteria<EventVO> sc = ArchiveByIdsSearch.create();
+        sc.setParameters("id", ids.toArray(new Object[ids.size()]));
+        EventVO eventForUpdate = createForUpdate();
+        eventForUpdate.setArchived(true);
+        UpdateBuilder ub = getUpdateBuilder(eventForUpdate);
+        update(ub, sc, null);
     }
 }

engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java

@@ -116,7 +116,7 @@ public SecurityGroupWorkVO take(long serverId) {
                 //ensure that there is no job in Processing state for the same VM
                 processing = true;
                 if (logger.isTraceEnabled()) {
-                    logger.trace("Security Group work take: found a job in Scheduled and Processing  vmid=" + work.getInstanceId());
+                    logger.trace("Security Group work take: found a job in Scheduled and Processing  vmid={}", work.getInstanceId());
                 }
             }
             work.setServerId(serverId);
@@ -142,13 +142,24 @@ public SecurityGroupWorkVO take(long serverId) {
 
     @Override
     public void updateStep(Long vmId, Long logSequenceNumber, Step step) {
+        final TransactionLegacy txn = TransactionLegacy.currentTxn();
+        txn.start();
         SearchCriteria<SecurityGroupWorkVO> sc = VmIdSeqNumSearch.create();
         sc.setParameters("vmId", vmId);
         sc.setParameters("seqno", logSequenceNumber);
 
-        SecurityGroupWorkVO workForUpdate = createForUpdate();
-        workForUpdate.setStep(step);
-        update(workForUpdate, sc);
+        final Filter filter = new Filter(SecurityGroupWorkVO.class, null, true, 0l, 1l);
+
+        final List<SecurityGroupWorkVO> vos = lockRows(sc, filter, true);
+        if (vos.size() == 0) {
+            txn.commit();
+            return;
+        }
+        SecurityGroupWorkVO work = vos.get(0);
+        work.setStep(step);
+        update(work.getId(), work);
+
+        txn.commit();
     }
 
     @Override