From 151e66c0bbcc4832105db7aed82d195061b07597 Mon Sep 17 00:00:00 2001
From: Steve Yen <steve.yen@gmail.com>
Date: Thu, 16 Apr 2015 18:40:51 -0700
Subject: [PATCH] better err msg when querying an index with queries disabled

---
 pindex.go            | 9 ++++++---
 pindex_impl_bleve.go | 3 ++-
 pindex_impl_vlite.go | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pindex.go b/pindex.go
index 769aa30..0a5505c 100644
--- a/pindex.go
+++ b/pindex.go
@@ -204,7 +204,8 @@ type RemotePlanPIndex struct {
 // up-to-date node and hitting it with load just makes the
 // rebalance take longer?
 func (mgr *Manager) CoveringPIndexes(indexName, indexUUID string,
-	wantNode func(*PlanPIndexNode) bool) (
+	wantNode func(*PlanPIndexNode) bool,
+	wantKind string) (
 	localPIndexes []*PIndex, remotePlanPIndexes []*RemotePlanPIndex, err error) {
 	nodeDefs, _, err := CfgGetNodeDefs(mgr.Cfg(), NODE_DEFS_WANTED)
 	if err != nil {
@@ -279,8 +280,10 @@ build_loop:
 			}
 		}
 
-		return nil, nil, fmt.Errorf("pindex: no node covers planPIndex: %#v",
-			planPIndex)
+		return nil, nil, fmt.Errorf("pindex:"+
+			" %s may have been disabled; no nodes are enabled/allocated"+
+			" to serve %s for the index partition(s)",
+			wantKind, wantKind)
 	}
 
 	return localPIndexes, remotePlanPIndexes, nil
diff --git a/pindex_impl_bleve.go b/pindex_impl_bleve.go
index 888f5eb..716e6ac 100644
--- a/pindex_impl_bleve.go
+++ b/pindex_impl_bleve.go
@@ -743,7 +743,8 @@ func bleveIndexAlias(mgr *Manager, indexName, indexUUID string,
 	consistencyParams *ConsistencyParams,
 	cancelCh <-chan bool) (bleve.IndexAlias, error) {
 	localPIndexes, remotePlanPIndexes, err :=
-		mgr.CoveringPIndexes(indexName, indexUUID, PlanPIndexNodeCanRead)
+		mgr.CoveringPIndexes(indexName, indexUUID, PlanPIndexNodeCanRead,
+			"queries")
 	if err != nil {
 		return nil, fmt.Errorf("bleve: bleveIndexAlias, err: %v", err)
 	}
diff --git a/pindex_impl_vlite.go b/pindex_impl_vlite.go
index bb8357b..95aa31b 100644
--- a/pindex_impl_vlite.go
+++ b/pindex_impl_vlite.go
@@ -796,7 +796,8 @@ func vliteGatherer(mgr *Manager, indexName, indexUUID string,
 	consistencyParams *ConsistencyParams,
 	cancelCh <-chan bool) (*VLiteGatherer, error) {
 	localPIndexes, remotePlanPIndexes, err :=
-		mgr.CoveringPIndexes(indexName, indexUUID, PlanPIndexNodeCanRead)
+		mgr.CoveringPIndexes(indexName, indexUUID, PlanPIndexNodeCanRead,
+			"queries")
 	if err != nil {
 		return nil, fmt.Errorf("vlite: gatherer, err: %v", err)
 	}