Merge cockroachdb#124870

124870: util/mon: disable recently added assertion for now r=yuzefovich a=yuzefovich There are some more issues to address (probably around the server shutdown), so let's disable the recently added assertion that all short-living monitors are stopped when the parent is stopped. Informs: cockroachdb#124848 Informs: cockroachdb#124849 Informs: cockroachdb#124850 Epic: None Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
herkolategan · May 30, 2024 · c5168ac · c5168ac
2 parents d8e609f + ab7a048
commit c5168ac
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/pkg/util/mon/bytes_usage.go b/pkg/util/mon/bytes_usage.go
@@ -653,12 +653,13 @@ func (mm *BytesMonitor) doStop(ctx context.Context, check bool) {
 				// Ignore mm itself if it is short-living.
 				numShortLiving--
 			}
-			if numShortLiving > 0 {
-				panic(errors.AssertionFailedf(
-					"found %d short-living non-stopped monitors in %s\n%s",
-					numShortLiving, mm.name, sb.String(),
-				))
-			}
+			// TODO(#124848): uncomment this.
+			//if numShortLiving > 0 {
+			//	panic(errors.AssertionFailedf(
+			//		"found %d short-living non-stopped monitors in %s\n%s",
+			//		numShortLiving, mm.name, sb.String(),
+			//	))
+			//}
 		}
 	}