Merge remote-tracking branch 'couchbase/morpheus'

Change-Id: I5d5e823f460d4020e43aa2255f7634e7bc90ed5c

Author: joshiprashanthd

datastore/couchbase/couchbase.go

@@ -3856,7 +3856,21 @@ func (s *store) CheckSystemCollection(bucketName, requestId string, forceIndex b
 		return false, errors.NewInvalidGSIIndexerError("Cannot get primary index on system collection")
 	}
 
-	sysIndex, er := indexer3.IndexByName(_BUCKET_SYSTEM_PRIM_INDEX)
+	sysIndexName := _BUCKET_SYSTEM_PRIM_INDEX
+
+	primaryIndexes, err := indexer3.PrimaryIndexes()
+	if err != nil {
+		return false, err
+	}
+
+	for _, index := range primaryIndexes {
+		if index != nil && index.IsPrimary() {
+			sysIndexName = index.Name()
+			break
+		}
+	}
+
+	sysIndex, er := indexer3.IndexByName(sysIndexName)
 	if er != nil {
 		if !errors.IsIndexNotFoundError(er) {
 			// only ignore index not found error
@@ -3899,7 +3913,7 @@ func (s *store) CheckSystemCollection(bucketName, requestId string, forceIndex b
 				return false, er
 			}
 
-			sysIndex, er = indexer3.IndexByName(_BUCKET_SYSTEM_PRIM_INDEX)
+			sysIndex, er = indexer3.IndexByName(sysIndexName)
 			if er != nil {
 				return false, er
 			}