minke.yu/sglang
1
0
Fork 0
Code Issues Pull Requests Actions 12 Packages Projects Releases Wiki Activity

[HiCache] fix: StorageMetricsCollector was initialized twice (#18354)

Browse Source
This commit is contained in:
shuwenn
2026-02-10 00:53:00 -08:00
committed by GitHub
parent d94d0af573
commit 8da14aea88
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/sglang/srt/mem_cache/hiradix_cache.py
+18 -15
View File
@@ -195,8 +195,14 @@ class HiRadixCache(RadixCache):
self.page_size / 1024 * prefetch_timeout_per_ki_token self.page_size / 1024 * prefetch_timeout_per_ki_token
) )
storage_metrics_collector = None self.enable_storage = enable_storage
if enable_storage_metrics: self.prefetch_threshold = prefetch_threshold
self.prefetch_timeout_base = prefetch_timeout_base
self.prefetch_timeout_per_page = prefetch_timeout_per_page
self.hicache_storage_pass_prefix_keys = hicache_storage_pass_prefix_keys
self.enable_storage_metrics = enable_storage_metrics
if self.enable_storage_metrics:
labels = { labels = {
"storage_backend": storage_backend, "storage_backend": storage_backend,
"tp_rank": self.cache_controller.tp_rank, "tp_rank": self.cache_controller.tp_rank,
@@ -206,19 +212,18 @@ class HiRadixCache(RadixCache):
} }
if extra_metric_labels: if extra_metric_labels:
labels.update(extra_metric_labels) labels.update(extra_metric_labels)
existing_collector = getattr(self, "storage_metrics_collector", None)
if existing_collector is None:
self.storage_metrics_collector = StorageMetricsCollector(labels=labels) self.storage_metrics_collector = StorageMetricsCollector(labels=labels)
storage_metrics_collector = StorageMetricsCollector(labels=labels) elif set(existing_collector.labels.keys()) == set(labels.keys()):
existing_collector.labels = labels
self.enable_storage = enable_storage
self.prefetch_threshold = prefetch_threshold
self.prefetch_timeout_base = prefetch_timeout_base
self.prefetch_timeout_per_page = prefetch_timeout_per_page
self.hicache_storage_pass_prefix_keys = hicache_storage_pass_prefix_keys
self.enable_storage_metrics = enable_storage_metrics
if self.enable_storage_metrics:
self.storage_metrics_collector = storage_metrics_collector
else: else:
self.storage_metrics_collector = None logger.warning(
"Storage metrics labels changed (%s -> %s). Keep existing labels to "
"avoid duplicate metric registration.",
sorted(existing_collector.labels.keys()),
sorted(labels.keys()),
)
def attach_storage_backend( def attach_storage_backend(
self, self,
@@ -366,8 +371,6 @@ class HiRadixCache(RadixCache):
self.enable_storage = False self.enable_storage = False
self.enable_storage_metrics = False self.enable_storage_metrics = False
if hasattr(self, "storage_metrics_collector"):
self.storage_metrics_collector = None
return True, "Detached HiCache storage backend successfully." return True, "Detached HiCache storage backend successfully."
def _force_release_pending_storage_ops(self): def _force_release_pending_storage_ops(self):