logging improvements and naming of field(s)

Author: Daan Hoogland

Diff for: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -5622,13 +5622,13 @@ public Outcome<VirtualMachine> addVmToNetworkThroughJobQueue(
 
         VmWorkJobVO workJob = null;
         if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
-            if (s_logger.isTraceEnabled()) {
-                s_logger.trace(String.format("number of add nic jobs for vm %s are %d", vm, pendingWorkJobs.size()));
+            if (pendingWorkJobs.size() > 0) {
+                s_logger.warn(String.format("number of jobs to add net %s to vm %s are %d", network.getUuid(), vm.getInstanceName(), pendingWorkJobs.size()));
             }
             workJob = fetchOrCreateVmWorkJobToAddNetwokr(vm, network, requested, context, user, account, pendingWorkJobs);
         } else {
             if (s_logger.isTraceEnabled()) {
-                s_logger.trace(String.format("no add-nic jobs for vm %s yet", vm));
+                s_logger.trace(String.format("no jobs to add network %s for vm %s yet", network, vm));
             }
 
             workJob = createVmWorkJobToAddNetwork(vm, network, requested, context, user, account);
@@ -5648,7 +5648,7 @@ private VmWorkJobVO fetchOrCreateVmWorkJobToAddNetwokr(
             List<VmWorkJobVO> pendingWorkJobs) {
         VmWorkJobVO workJob = null;
         for (VmWorkJobVO job : pendingWorkJobs) {
-            if (network.getUuid().equals(job.getSecondaryKey())) {
+            if (network.getUuid().equals(job.getSecondaryObjectIdentifier())) {
                 if (s_logger.isTraceEnabled()) {
                     s_logger.trace(String.format("a similar job found for vm %s", vm));
                 }
@@ -5679,7 +5679,7 @@ private VmWorkJobVO createVmWorkJobToAddNetwork(
         workJob.setVmType(VirtualMachine.Type.Instance);
         workJob.setVmInstanceId(vm.getId());
         workJob.setRelated(AsyncJobExecutionContext.getOriginJobId());
-        workJob.setSecondaryKey(network.getUuid());
+        workJob.setSecondaryObjectIdentifier(network.getUuid());
 
         // save work context info (there are some duplications)
         final VmWorkAddVmToNetwork workInfo = new VmWorkAddVmToNetwork(user.getId(), account.getId(), vm.getId(),

Diff for: engine/schema/src/main/resources/META-INF/db/schema-41520to41600.sql

@@ -792,4 +792,4 @@ ALTER TABLE cloud_usage.usage_network DROP PRIMARY KEY, ADD PRIMARY KEY (`accoun
 ALTER TABLE `cloud`.`user_statistics` DROP INDEX `account_id`, ADD UNIQUE KEY `account_id`  (`account_id`,`data_center_id`,`public_ip_address`,`device_id`,`device_type`, `network_id`);
 ALTER TABLE `cloud_usage`.`user_statistics` DROP INDEX `account_id`, ADD UNIQUE KEY `account_id`  (`account_id`,`data_center_id`,`public_ip_address`,`device_id`,`device_type`, `network_id`);
 
-ALTER TABLE `cloud`.`vm_work_job` ADD COLUMN `secondary_key` char(100) COMMENT 'any additional item that must be checked during queueing' AFTER `vm_instance_id`;
+ALTER TABLE `cloud`.`vm_work_job` ADD COLUMN `secondary_object` char(100) COMMENT 'any additional item that must be checked during queueing' AFTER `vm_instance_id`;

Diff for: framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDao.java

@@ -32,7 +32,7 @@ public interface VmWorkJobDao extends GenericDao<VmWorkJobVO, Long> {
 
     List<VmWorkJobVO> listPendingWorkJobs(VirtualMachine.Type type, long instanceId, String jobCmd);
 
-    List<VmWorkJobVO> listPendingWorkJobs(VirtualMachine.Type type, long instanceId, String jobCmd, String secondaryKey);
+    List<VmWorkJobVO> listPendingWorkJobs(VirtualMachine.Type type, long instanceId, String jobCmd, String secondaryObjectIdentifier);
 
     void updateStep(long workJobId, Step step);
 

Diff for: framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java

@@ -67,7 +67,7 @@ public void init() {
         PendingWorkJobByCommandSearch.and("jobStatus", PendingWorkJobByCommandSearch.entity().getStatus(), Op.EQ);
         PendingWorkJobByCommandSearch.and("vmType", PendingWorkJobByCommandSearch.entity().getVmType(), Op.EQ);
         PendingWorkJobByCommandSearch.and("vmInstanceId", PendingWorkJobByCommandSearch.entity().getVmInstanceId(), Op.EQ);
-        PendingWorkJobByCommandSearch.and("secondaryKey", PendingWorkJobByCommandSearch.entity().getSecondaryKey(), Op.EQ);
+        PendingWorkJobByCommandSearch.and("secondaryObjectIdentifier", PendingWorkJobByCommandSearch.entity().getSecondaryObjectIdentifier(), Op.EQ);
         PendingWorkJobByCommandSearch.and("step", PendingWorkJobByCommandSearch.entity().getStep(), Op.NEQ);
         PendingWorkJobByCommandSearch.and("cmd", PendingWorkJobByCommandSearch.entity().getCmd(), Op.EQ);
         PendingWorkJobByCommandSearch.done();
@@ -121,13 +121,13 @@ public List<VmWorkJobVO> listPendingWorkJobs(VirtualMachine.Type type, long inst
     }
 
     @Override
-    public List<VmWorkJobVO> listPendingWorkJobs(VirtualMachine.Type type, long instanceId, String jobCmd, String secondaryKey) {
+    public List<VmWorkJobVO> listPendingWorkJobs(VirtualMachine.Type type, long instanceId, String jobCmd, String secondaryObjectIdentifier) {
 
         SearchCriteria<VmWorkJobVO> sc = PendingWorkJobByCommandSearch.create();
         sc.setParameters("jobStatus", JobInfo.Status.IN_PROGRESS);
         sc.setParameters("vmType", type);
         sc.setParameters("vmInstanceId", instanceId);
-        sc.setParameters("secondaryKey", secondaryKey);
+        sc.setParameters("secondaryObjectIdentifier", secondaryObjectIdentifier);
         sc.setParameters("cmd", jobCmd);
 
         Filter filter = new Filter(VmWorkJobVO.class, "created", true, null, null);

Diff for: framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java

@@ -58,8 +58,8 @@ boolean updateState() {
     @Column(name = "vm_instance_id")
     long vmInstanceId;
 
-    @Column(name = "secondary_key")
-    String secondaryKey;
+    @Column(name = "secondary_object")
+    String secondaryObjectIdentifier;
 
     protected VmWorkJobVO() {
     }
@@ -93,11 +93,11 @@ public void setVmInstanceId(long vmInstanceId) {
         this.vmInstanceId = vmInstanceId;
     }
 
-    public String getSecondaryKey() {
-        return secondaryKey;
+    public String getSecondaryObjectIdentifier() {
+        return secondaryObjectIdentifier;
     }
 
-    public void setSecondaryKey(String secondaryKey) {
-        this.secondaryKey = secondaryKey;
+    public void setSecondaryObjectIdentifier(String secondaryObjectIdentifier) {
+        this.secondaryObjectIdentifier = secondaryObjectIdentifier;
     }
 }