From c4b75ff9d9d52be847c1d484ec40ea1d4e1c62bb Mon Sep 17 00:00:00 2001
From: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Date: Thu, 6 Sep 2018 12:50:47 +0200
Subject: [PATCH] cli: handle merged range descriptors in debug keys

Noticed during #29252.

Release note: None
---
 pkg/cli/debug.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/cli/debug.go b/pkg/cli/debug.go
index bc6a2839a307..61c6b51e0c93 100644
--- a/pkg/cli/debug.go
+++ b/pkg/cli/debug.go
@@ -284,8 +284,13 @@ func loadRangeDescriptor(
 			// doesn't parse as a range descriptor just skip it.
 			return false, nil
 		}
+		if len(kv.Value) == 0 {
+			// RangeDescriptor was deleted (range merged away).
+			return false, nil
+		}
 		if err := (roachpb.Value{RawBytes: kv.Value}).GetProto(&desc); err != nil {
-			return false, err
+			log.Warningf(context.Background(), "ignoring range descriptor due to error %s: %+v", err, kv)
+			return false, nil
 		}
 		return desc.RangeID == rangeID, nil
 	}