Converted RepairJob to Async service

jbellmann · Nov 1, 2011 · ad05eaf · ad05eaf
1 parent fc06b17
commit ad05eaf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/src/java/voldemort/server/StoreRepository.java b/src/java/voldemort/server/StoreRepository.java
@@ -8,7 +8,7 @@
 
 import voldemort.VoldemortException;
 import voldemort.annotations.concurrency.Threadsafe;
-import voldemort.server.scheduler.slop.RepairJob;
+import voldemort.server.storage.RepairJob;
 import voldemort.store.StorageEngine;
 import voldemort.store.Store;
 import voldemort.store.slop.SlopStorageEngine;

diff --git a/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java b/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java
@@ -45,7 +45,7 @@
 import voldemort.server.protocol.RequestHandler;
 import voldemort.server.protocol.StreamRequestHandler;
 import voldemort.server.rebalance.Rebalancer;
-import voldemort.server.scheduler.slop.RepairJob;
+import voldemort.server.storage.RepairJob;
 import voldemort.server.storage.StorageService;
 import voldemort.store.ErrorCodeMapper;
 import voldemort.store.StorageEngine;
@@ -613,12 +613,25 @@ public VAdminProto.RollbackStoreResponse handleRollbackStore(VAdminProto.Rollbac
     public VAdminProto.RepairJobResponse handleRepairJob(VAdminProto.RepairJobRequest request) {
         VAdminProto.RepairJobResponse.Builder response = VAdminProto.RepairJobResponse.newBuilder();
         try {
-            RepairJob job = storeRepository.getRepairJob();
-            if(job != null) {
-                logger.info("Starting the repair job now on ID : " + metadataStore.getNodeId());
-                job.run();
-            } else
-                logger.error("RepairJob is not scheduled.");
+            int requestId = asyncService.getUniqueRequestId();
+            asyncService.submitOperation(requestId, new AsyncOperation(requestId, "Repair Job") {
+
+                @Override
+                public void operate() {
+                    RepairJob job = storeRepository.getRepairJob();
+                    if(job != null) {
+                        logger.info("Starting the repair job now on ID : "
+                                    + metadataStore.getNodeId());
+                        job.run();
+                    } else
+                        logger.error("RepairJob is not initialized.");
+                }
+
+                @Override
+                public void stop() {
+                    status.setException(new VoldemortException("Repair job interrupted"));
+                }
+            });
         } catch(VoldemortException e) {
             response.setError(ProtoUtils.encodeError(errorCodeMapper, e));
             logger.error("Repair job failed for request : " + request.toString() + ")", e);

diff --git a/...mort/server/scheduler/slop/RepairJob.java → ...a/voldemort/server/storage/RepairJob.java b/...mort/server/scheduler/slop/RepairJob.java → ...a/voldemort/server/storage/RepairJob.java
@@ -1,4 +1,4 @@
-package voldemort.server.scheduler.slop;
+package voldemort.server.storage;
 
 import java.util.Arrays;
 import java.util.Date;

diff --git a/src/java/voldemort/server/storage/StorageService.java b/src/java/voldemort/server/storage/StorageService.java
@@ -58,7 +58,6 @@
 import voldemort.server.scheduler.DataCleanupJob;
 import voldemort.server.scheduler.SchedulerService;
 import voldemort.server.scheduler.slop.BlockingSlopPusherJob;
-import voldemort.server.scheduler.slop.RepairJob;
 import voldemort.server.scheduler.slop.StreamingSlopPusherJob;
 import voldemort.store.StorageConfiguration;
 import voldemort.store.StorageEngine;