You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/08/22 02:11:00 UTC
svn commit: r1619637 - in /lucene/dev/trunk: ./ solr/CHANGES.txt
solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
Author: markrmiller
Date: Fri Aug 22 00:11:00 2014
New Revision: 1619637
URL: http://svn.apache.org/r1619637
Log:
SOLR-4895: An error should be returned when a rollback is attempted in SolrCloud mode.
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1619637&r1=1619636&r2=1619637&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Aug 22 00:11:00 2014
@@ -112,6 +112,12 @@ Apache ZooKeeper 3.4.6
Detailed Change List
----------------------
+Bug Fixes
+----------------------
+
+* SOLR-4895: An error should be returned when a rollback is attempted in SolrCloud mode.
+ (Vamsee Yarlagadda via Mark Miller)
+
Other Changes
---------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1619637&r1=1619636&r2=1619637&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Fri Aug 22 00:11:00 2014
@@ -670,6 +670,10 @@ public class DirectUpdateHandler2 extend
*/
@Override
public void rollback(RollbackUpdateCommand cmd) throws IOException {
+ if (core.getCoreDescriptor().getCoreContainer().isZooKeeperAware()) {
+ throw new UnsupportedOperationException("Rollback is currently not supported in SolrCloud mode. (SOLR-4895)");
+ }
+
rollbackCommands.incrementAndGet();
boolean error=true;