Exporting vm.job.enabled global setting on VirtualMachineManager class

victor-mendes-eduardo · victor-mendes-eduardo · commit aac9aa75247f · 2015-04-14T10:04:56.000-03:00
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -4133,7 +4133,7 @@ public String getConfigComponentName() {
     public ConfigKey<?>[] getConfigKeys() {
         return new ConfigKey<?>[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait,
                 VmOpLockStateRetry,
-                VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval};
+                VmOpWaitInterval, ExecuteInSequence, VmJobEnabled, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval};
     }
 
     public List<StoragePoolAllocator> getStoragePoolAllocators() {
diff --git a/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java b/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java
@@ -84,11 +84,6 @@ public StartupCommand[] initialize() throws IllegalArgumentException {
             Host.Record masterRecord = poolr.master.getRecord(conn);
             if (_host.uuid.equals(masterRecord.uuid)) {
                 _listener = new VmEventListener(true);
-
-                //
-                // TODO disable event listener for now. Wait until everything else is ready
-                //
-
                 _listener.start();
             } else {
                 _listener = new VmEventListener(false);

Original file line number	Diff line number	Diff line change
`@@ -4133,7 +4133,7 @@ public String getConfigComponentName() {`
`4133`	`4133`	`public ConfigKey<?>[] getConfigKeys() {`
`4134`	`4134`	`return new ConfigKey<?>[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait,`
`4135`	`4135`	`VmOpLockStateRetry,`
`4136`		`- VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval};`
	`4136`	`+ VmOpWaitInterval, ExecuteInSequence, VmJobEnabled, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval};`
`4137`	`4137`	`}`
`4138`	`4138`
`4139`	`4139`	`public List<StoragePoolAllocator> getStoragePoolAllocators() {`