SHOW DIAGNOSTICS must check if shards are local

CHANGELOG.md

@@ -15,6 +15,7 @@
 - [#2326](https://github.com/influxdb/influxdb/pull/2326): Fix parse error in CREATE CONTINUOUS QUERY
 - [#2300](https://github.com/influxdb/influxdb/pull/2300): Refactor integration tests.  Properly close Graphite/OpenTSDB listeners.
 - [#2338](https://github.com/influxdb/influxdb/pull/2338): Fix panic if tag key isn't double quoted when it should have been
+- [#2338](https://github.com/influxdb/influxdb/pull/2338): Fix SHOW DIAGNOSTICS panic if any shard was non-local.
 
 ## v0.9.0-rc25 [2015-04-15]
 

server.go

@@ -3295,14 +3295,19 @@ func (s *Server) DiagnosticsAsRows() []*influxql.Row {
 	// Shards
 	shardsRow := &influxql.Row{Columns: []string{}}
 	shardsRow.Name = "shards_diag"
-	shardsRow.Columns = append(shardsRow.Columns, "time", "id", "dataNodes", "index", "path")
+	shardsRow.Columns = append(shardsRow.Columns, "time", "id", "dataNodes", "index")
 	shardsRow.Tags = tags
 	for _, sh := range s.shards {
 		var nodes []string
 		for _, n := range sh.DataNodeIDs {
 			nodes = append(nodes, strconv.FormatUint(n, 10))
-			shardsRow.Values = append(shardsRow.Values, []interface{}{now, strconv.FormatUint(sh.ID, 10), strings.Join(nodes, ","),
-				strconv.FormatUint(sh.index, 10), sh.store.Path()})
+			shardsRow.Values = append(shardsRow.Values, []interface{}{now, strconv.FormatUint(sh.ID, 10),
+				strings.Join(nodes, ","), strconv.FormatUint(sh.index, 10)})
+		}
+		// Shard may not be local to this node.
+		if sh.store != nil {
+			shardsRow.Columns = append(shardsRow.Columns, "path")
+			shardsRow.Values = append(shardsRow.Values, []interface{}{sh.store.Path()})
 		}
 	}