SOLR-4590: Collections API should return a nice error when not in SolrCloud mode.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1526614 13f79535-47bb-0310-9956-ffa450edef68

solr/CHANGES.txt

@@ -77,6 +77,11 @@ New Features
 * SOLR-5274: Allow JettySolrRunner SSL config to be specified via a constructor.
   (Mark Miller) 
 
+Bug Fixes
+----------------------
+* SOLR-4590: Collections API should return a nice error when not in SolrCloud mode.
+  (Anshum Gupta, Mark Miller)
+
 Security
 ----------------------
 

solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java

@@ -111,6 +111,12 @@ public class CollectionsHandler extends RequestHandlerBase {
               "Core container instance missing");
     }
 
+    // Make sure that the core is ZKAware
+    if(!cores.isZooKeeperAware()) {
+      throw new SolrException(ErrorCode.BAD_REQUEST,
+          "Solr instance is not running in SolrCloud mode.");
+    }
+
     // Pick the action
     SolrParams params = req.getParams();
     CollectionAction action = null;