sql: check the expiration time of a table descriptor is valid

related to #24930 Release note: None
cockroachdb · May 3, 2018 · 5d205ed · 5d205ed
1 parent 4a36c2b
commit 5d205ed
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/pkg/sql/table.go b/pkg/sql/table.go
@@ -280,6 +280,10 @@ func (tc *TableCollection) getTableVersion(
 		return nil, nil, err
 	}
 
+	if !origTimestamp.Less(expiration) {
+		log.Fatalf(ctx, "bad table for T=%s, expiration=%s", origTimestamp, expiration)
+	}
+
 	tc.leasedTables = append(tc.leasedTables, table)
 	log.VEventf(ctx, 2, "added table '%s' to table collection", tn)
 
@@ -341,6 +345,10 @@ func (tc *TableCollection) getTableVersionByID(
 		return nil, err
 	}
 
+	if !origTimestamp.Less(expiration) {
+		log.Fatalf(ctx, "bad table for T=%s, expiration=%s", origTimestamp, expiration)
+	}
+
 	tc.leasedTables = append(tc.leasedTables, table)
 	log.VEventf(ctx, 2, "added table '%s' to table collection", table.Name)