Merge pull request cockroachdb#18498 from BramGruneir/bram/cherrypick…

…_18376 cherrypick-1.1: server, ui: Fix the range log history in the range debug page.
a-robinson · Sep 14, 2017 · be60cc5 · be60cc5
2 parents 67f1059 + 0d93a6f
commit be60cc5
Show file tree

Hide file tree

Showing 17 changed files with 1,826 additions and 1,974 deletions.
diff --git a/pkg/server/admin.go b/pkg/server/admin.go
@@ -749,8 +749,8 @@ func (s *adminServer) RangeLog(
 		rangeID := parser.NewDInt(parser.DInt(req.RangeId))
 		q.Append(`WHERE "rangeID" = $ OR "otherRangeID" = $`, rangeID, rangeID)
 	}
-	q.Append("ORDER BY timestamp DESC ")
 	if limit > 0 {
+		q.Append("ORDER BY timestamp desc ")
 		q.Append("LIMIT $", parser.NewDInt(parser.DInt(limit)))
 	}
 	if len(q.Errors()) > 0 {
@@ -803,6 +803,8 @@ func (s *adminServer) RangeLog(
 			}
 			event.OtherRangeID = roachpb.RangeID(otherRangeID)
 		}
+
+		var prettyInfo serverpb.RangeLogResponse_PrettyInfo
 		if row[5].String() != "NULL" {
 			var info string
 			if err := scanner.ScanIndex(row, 5, &info); err != nil {
@@ -811,9 +813,26 @@ func (s *adminServer) RangeLog(
 			if err := json.Unmarshal([]byte(info), &event.Info); err != nil {
 				return nil, errors.Wrap(err, fmt.Sprintf("info didn't parse correctly: %s", info))
 			}
+			if event.Info.NewDesc != nil {
+				prettyInfo.NewDesc = event.Info.NewDesc.String()
+			}
+			if event.Info.UpdatedDesc != nil {
+				prettyInfo.UpdatedDesc = event.Info.UpdatedDesc.String()
+			}
+			if event.Info.AddedReplica != nil {
+				prettyInfo.AddedReplica = event.Info.AddedReplica.String()
+			}
+			if event.Info.RemovedReplica != nil {
+				prettyInfo.RemovedReplica = event.Info.RemovedReplica.String()
+			}
+			prettyInfo.Reason = string(event.Info.Reason)
+			prettyInfo.Details = event.Info.Details
 		}
 
-		resp.Events = append(resp.Events, event)
+		resp.Events = append(resp.Events, serverpb.RangeLogResponse_Event{
+			Event:      event,
+			PrettyInfo: prettyInfo,
+		})
 	}
 	return &resp, nil
 }

diff --git a/pkg/server/admin_test.go b/pkg/server/admin_test.go
@@ -1193,10 +1193,10 @@ func TestAdminAPIRangeLog(t *testing.T) {
 			}
 
 			for _, event := range resp.Events {
-				if event.RangeID != roachpb.RangeID(tc.rangeID) &&
-					event.OtherRangeID != roachpb.RangeID(tc.rangeID) {
+				if event.Event.RangeID != roachpb.RangeID(tc.rangeID) &&
+					event.Event.OtherRangeID != roachpb.RangeID(tc.rangeID) {
 					t.Errorf("expected rangeID or otherRangeID to be r%d, got r%d and r%d",
-						tc.rangeID, event.RangeID, event.OtherRangeID)
+						tc.rangeID, event.Event.RangeID, event.Event.OtherRangeID)
 				}
 			}
 		})