From decb5fa8983f91156f7074d129b97e1ed83bb39d Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Sun, 10 Apr 2011 23:12:00 +0300
Subject: [PATCH] Optimize API: Don't execute concurrent optimize operations
 (shard level) on the same node, closes #846.

---
 .../optimize/TransportOptimizeAction.java     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
index e7e0703669f..531041dfbaa 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
@@ -51,6 +51,8 @@ public class TransportOptimizeAction extends TransportBroadcastOperationAction<O
 
     private final IndicesService indicesService;
 
+    private final Object optimizeMutex = new Object();
+
     @Inject public TransportOptimizeAction(Settings settings, ThreadPool threadPool, ClusterService clusterService,
                                            TransportService transportService, IndicesService indicesService) {
         super(settings, threadPool, clusterService, transportService);
@@ -111,15 +113,17 @@ public class TransportOptimizeAction extends TransportBroadcastOperationAction<O
     }
 
     @Override protected ShardOptimizeResponse shardOperation(ShardOptimizeRequest request) throws ElasticSearchException {
-        IndexShard indexShard = indicesService.indexServiceSafe(request.index()).shardSafe(request.shardId());
-        indexShard.optimize(new Engine.Optimize()
-                .waitForMerge(request.waitForMerge())
-                .maxNumSegments(request.maxNumSegments())
-                .onlyExpungeDeletes(request.onlyExpungeDeletes())
-                .flush(request.flush())
-                .refresh(request.refresh())
-        );
-        return new ShardOptimizeResponse(request.index(), request.shardId());
+        synchronized (optimizeMutex) {
+            IndexShard indexShard = indicesService.indexServiceSafe(request.index()).shardSafe(request.shardId());
+            indexShard.optimize(new Engine.Optimize()
+                    .waitForMerge(request.waitForMerge())
+                    .maxNumSegments(request.maxNumSegments())
+                    .onlyExpungeDeletes(request.onlyExpungeDeletes())
+                    .flush(request.flush())
+                    .refresh(request.refresh())
+            );
+            return new ShardOptimizeResponse(request.index(), request.shardId());
+        }
     }
 
     /**