add more integration versioning tests

modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchException.java

@@ -77,10 +77,10 @@ public class ElasticSearchException extends RuntimeException {
 
 
     /**
-     * Retrieve the innermost cause of this exception, if any.
+     * Retrieve the innermost cause of this exception, if none, returns the current exception.
      */
     public Throwable getRootCause() {
-        Throwable rootCause = null;
+        Throwable rootCause = this;
         Throwable cause = getCause();
         while (cause != null && cause != rootCause) {
             rootCause = cause;

modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java

@@ -429,7 +429,7 @@ public abstract class TransportShardReplicationOperationAction<Request extends S
                 if (logger.isDebugEnabled()) {
                     logger.debug(shard.shortSummary() + ": Failed to execute [" + request + "]", e);
                 }
-                listener.onFailure(new ReplicationShardOperationFailedException(shardIt.shardId(), e));
+                listener.onFailure(e);
             }
         }
 

modules/test/integration/src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.test.integration.load;
+package org.elasticsearch.test.integration.versioning;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.index.IndexResponse;

modules/test/integration/src/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java

@@ -0,0 +1,114 @@
+/*
+ * Licensed to Elastic Search and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Elastic Search licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.integration.versioning;
+
+import org.elasticsearch.ElasticSearchException;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.index.engine.VersionConflictEngineException;
+import org.elasticsearch.indices.IndexMissingException;
+import org.elasticsearch.test.integration.AbstractNodesTests;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.elasticsearch.index.query.xcontent.QueryBuilders.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * @author kimchy (shay.banon)
+ */
+public class SimpleVersioningTests extends AbstractNodesTests {
+
+    private Client client;
+    private Client client2;
+
+    @BeforeClass public void createNodes() throws Exception {
+        startNode("server1");
+        startNode("server2");
+        client = client("server1");
+        client2 = client("server2");
+    }
+
+    @AfterClass public void closeNodes() {
+        client.close();
+        closeAllNodes();
+    }
+
+    @Test public void testSimpleVersioning() throws Exception {
+        try {
+            client.admin().indices().prepareDelete("test").execute().actionGet();
+        } catch (IndexMissingException e) {
+            // its ok
+        }
+        client.admin().indices().prepareCreate("test").execute().actionGet();
+        client.admin().cluster().prepareHealth("test").setWaitForGreenStatus().execute().actionGet();
+
+        IndexResponse indexResponse = client.prepareIndex("test", "type", "1").setSource("field1", "value1_1").execute().actionGet();
+        assertThat(indexResponse.version(), equalTo(1l));
+
+        indexResponse = client.prepareIndex("test", "type", "1").setSource("field1", "value1_2").setVersion(1).execute().actionGet();
+        assertThat(indexResponse.version(), equalTo(2l));
+
+        try {
+            client.prepareIndex("test", "type", "1").setSource("field1", "value1_1").setVersion(1).execute().actionGet();
+        } catch (ElasticSearchException e) {
+            assertThat(e.unwrapCause(), instanceOf(VersionConflictEngineException.class));
+        }
+
+        try {
+            client2.prepareIndex("test", "type", "1").setSource("field1", "value1_1").setVersion(1).execute().actionGet();
+        } catch (ElasticSearchException e) {
+            assertThat(e.unwrapCause(), instanceOf(VersionConflictEngineException.class));
+        }
+
+        try {
+            client.prepareIndex("test", "type", "1").setCreate(true).setSource("field1", "value1_1").setVersion(1).execute().actionGet();
+        } catch (ElasticSearchException e) {
+            assertThat(e.unwrapCause(), instanceOf(VersionConflictEngineException.class));
+        }
+
+        try {
+            client2.prepareIndex("test", "type", "1").setCreate(true).setSource("field1", "value1_1").setVersion(1).execute().actionGet();
+        } catch (ElasticSearchException e) {
+            assertThat(e.unwrapCause(), instanceOf(VersionConflictEngineException.class));
+        }
+
+        try {
+            client.prepareDelete("test", "type", "1").setVersion(1).execute().actionGet();
+        } catch (ElasticSearchException e) {
+            assertThat(e.unwrapCause(), instanceOf(VersionConflictEngineException.class));
+        }
+
+        try {
+            client2.prepareDelete("test", "type", "1").setVersion(1).execute().actionGet();
+        } catch (ElasticSearchException e) {
+            assertThat(e.unwrapCause(), instanceOf(VersionConflictEngineException.class));
+        }
+
+        client.admin().indices().prepareRefresh().execute().actionGet();
+        assertThat(client.prepareGet("test", "type", "1").execute().actionGet().version(), equalTo(2l));
+
+        SearchResponse searchResponse = client.prepareSearch().setQuery(matchAllQuery()).execute().actionGet();
+        assertThat(searchResponse.hits().getAt(0).version(), equalTo(2l));
+    }
+}