[BZ 1120418] Fix compile errors.

rhq-project · Jul 31, 2014 · fc0f31a · fc0f31a
1 parent a8103a9
commit fc0f31a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 25 deletions.
diff --git a/.../src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageClusterMaintenanceJob.java b/.../src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageClusterMaintenanceJob.java
@@ -59,7 +59,7 @@ public void executeJobCode(JobExecutionContext context) throws JobExecutionExcep
         try {
             log.info("Running cluster maintenance");
             StorageClusterMaintenanceManagerLocal maintenanceManager = LookupUtil.getStorageClusterMaintenanceManager();
-            maintenanceManager.scheduleMaintenance();
+            maintenanceManager.scheduleMaintenance(null);
         } catch (Exception e) {
             log.error("There was an unexpected error while performing cluster maintenance", e);
         } finally {

diff --git a/...rver/jar/src/main/java/org/rhq/server/storage/maintenance/step/ShutdownStorageClient.java b/...rver/jar/src/main/java/org/rhq/server/storage/maintenance/step/ShutdownStorageClient.java
@@ -22,7 +22,6 @@
 
 import org.rhq.core.domain.storage.MaintenanceJob;
 import org.rhq.core.domain.storage.MaintenanceStep;
-import org.rhq.core.domain.storage.MaintenanceStep.Type;
 import org.rhq.enterprise.server.storage.StorageClientManager;
 
 /**
@@ -45,9 +44,6 @@ public MaintenanceStep build(MaintenanceJob job, int stepNumber, String[] existi
 
         step.setStep(stepNumber)
             .setName(ShutdownStorageClient.class.getSimpleName())
-            .setType(Type.ServerUpdate)
-            .setSequential(true)
-            .setTimeout(1000)
             .setMaintenanceJob(job);
 
         return step;

diff --git a/.../server/jar/src/main/java/org/rhq/server/storage/maintenance/step/StartStorageClient.java b/.../server/jar/src/main/java/org/rhq/server/storage/maintenance/step/StartStorageClient.java
@@ -22,7 +22,6 @@
 
 import org.rhq.core.domain.storage.MaintenanceJob;
 import org.rhq.core.domain.storage.MaintenanceStep;
-import org.rhq.core.domain.storage.MaintenanceStep.Type;
 import org.rhq.enterprise.server.storage.StorageClientManager;
 
 /**
@@ -45,9 +44,6 @@ public MaintenanceStep build(MaintenanceJob job, int stepNumber, String[] existi
 
         step.setStep(stepNumber)
             .setName(StartStorageClient.class.getSimpleName())
-            .setType(Type.ServerUpdate)
-            .setSequential(true)
-            .setTimeout(1000)
             .setMaintenanceJob(job);
 
         return step;

diff --git a/...jar/src/main/java/org/rhq/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java b/...jar/src/main/java/org/rhq/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java
@@ -30,7 +30,6 @@
 import org.rhq.core.domain.resource.Resource;
 import org.rhq.core.domain.storage.MaintenanceJob;
 import org.rhq.core.domain.storage.MaintenanceStep;
-import org.rhq.core.domain.storage.MaintenanceStep.Type;
 import org.rhq.core.domain.util.PageControl;
 import org.rhq.core.domain.util.PageList;
 import org.rhq.enterprise.server.auth.SubjectManagerBean;
@@ -55,7 +54,8 @@ public class UpdateStorageNodeEndpoints implements MaintenanceStepFacade {
     @Override
     public void execute(MaintenanceStep maintenanceStep) throws Exception {
 
-        StorageNode storageNode = storageNodeManager.findStorageNodeByAddress(maintenanceStep.getNodeAddress());
+        StorageNode storageNode = storageNodeManager.findStorageNodeByAddress(maintenanceStep.getStorageNode()
+            .getAddress());
         Resource storageNodeResource = storageNode.getResource();
         //scheduling the operation
         long operationStartTime = System.currentTimeMillis();
@@ -109,10 +109,6 @@ public MaintenanceStep build(MaintenanceJob job, int stepNumber, String[] existi
         MaintenanceStep step = new MaintenanceStep();
         step.setStep(stepNumber)
             .setName(UpdateStorageNodeEndpoints.class.getSimpleName())
-            .setNodeAddress(affectedNode)
-            .setType(Type.ResourceOperation)
-            .setSequential(true)
-            .setTimeout(1000)
             .setMaintenanceJob(job);
 
         return step;

diff --git a/...er/jar/src/main/java/org/rhq/server/storage/maintenance/step/UpdateStorageNodeEntity.java b/...er/jar/src/main/java/org/rhq/server/storage/maintenance/step/UpdateStorageNodeEntity.java
@@ -22,10 +22,8 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.rhq.core.domain.cloud.StorageNode;
 import org.rhq.core.domain.storage.MaintenanceJob;
 import org.rhq.core.domain.storage.MaintenanceStep;
-import org.rhq.core.domain.storage.MaintenanceStep.Type;
 import org.rhq.enterprise.server.RHQConstants;
 import org.rhq.enterprise.server.auth.SubjectManagerLocal;
 import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal;
@@ -52,23 +50,18 @@ public MaintenanceStep build(MaintenanceJob job, int stepNumber, String[] storag
         MaintenanceStep step = new MaintenanceStep();
         step.setStep(stepNumber)
             .setName(UpdateStorageNodeEntity.class.getSimpleName())
-            .setNodeAddress(affectedNode)
-            .setType(Type.EntityUpdate)
-            .setSequential(true)
-            .setTimeout(1000)
             .setMaintenanceJob(job);
 
         return step;
     }
 
     @Override
     public void execute(MaintenanceStep step) {
-        StorageNode storageNode = storageNodeManagerBean.findStorageNodeByAddress(step.getNodeAddress());
-        if (storageNode == null || storageNode.getResource() == null)
+        if (step.getStorageNode() == null || step.getStorageNode() == null)
             throw new IllegalArgumentException("Storage node not found.");
 
-        storageNode.setCqlPort(Integer.parseInt(step.getArgs()));
+        step.getStorageNode().setCqlPort(Integer.parseInt(step.getArgs()));
 
-        entityManager.persist(storageNode);
+        entityManager.persist(step.getStorageNode());
     }
 }