Merge pull request #373 from UNC-Libraries/move-contention

Using ExecutorService to limit the number of simultaneous move operations

Author: daines

services/src/main/java/edu/unc/lib/dl/cdr/services/rest/modify/MoveObjectsController.java

@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -54,6 +55,9 @@ public class MoveObjectsController {
 
 	private final Map<String, MoveRequest> moveRequests;
 
+	@Autowired
+	private ExecutorService moveExecutor;
+	
 	public MoveObjectsController() {
 		moveRequests = new HashMap<>();
 	}
@@ -72,10 +76,10 @@ Map<String, Object> moveObjects(@RequestBody MoveRequest moveRequest, HttpServle
 
 		moveRequest.setUser(GroupsThreadStore.getUsername());
 
-		Thread moveThread = new Thread(new MoveRunnable(moveRequest, GroupsThreadStore.getGroups()));
-		log.info("User {} is starting move operation of {} objects to destination {}",
+		MoveRunnable runnable = new MoveRunnable(moveRequest, GroupsThreadStore.getGroups());
+		log.info("User {} is queuing move operation of {} objects to destination {}",
 				new Object[] { GroupsThreadStore.getUsername(), moveRequest.moved.size(), moveRequest.getDestination()});
-		moveThread.start();
+		moveExecutor.submit(runnable);
 
 		response.setStatus(200);
 
@@ -212,6 +216,9 @@ public MoveRunnable(MoveRequest request, AccessGroupSet groups) {
 		@Override
 		public void run() {
 			try {
+				log.info("Move of {} objects to {} for user {} has begun", new Object[] {
+						request.getMoved().size(), request.getDestination(), request.getUser() });
+				
 				moveRequests.put(request.getId(), request);
 
 				GroupsThreadStore.storeGroups(groups);

services/src/main/webapp/WEB-INF/service-context.xml

@@ -225,4 +225,8 @@
 		<constructor-arg value="${data.dir}"/>
 	</bean>
 
+	<bean id="moveExecutor" class="java.util.concurrent.Executors"
+			factory-method="newFixedThreadPool" destroy-method="shutdownNow">
+			<constructor-arg value="${services.move.workers:1}"/>
+	</bean>
 </beans>