From 13d54c49dc346d472d3f174dffe74880f327ee79 Mon Sep 17 00:00:00 2001 From: xiaoxmeng Date: Thu, 7 Dec 2023 00:55:22 -0800 Subject: [PATCH] Set task wait timeout to 5 mins by default and docs fixes (#7911) Summary: Pull Request resolved: https://github.com/facebookincubator/velox/pull/7911 Reviewed By: mbasmanova Differential Revision: D51927483 Pulled By: xiaoxmeng fbshipit-source-id: 78ba34a28b57eb0971bed835263f460eec589069 --- velox/common/memory/Memory.h | 4 ++-- velox/docs/index.rst | 2 +- velox/docs/{stats.rst => metrics.rst} | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) rename velox/docs/{stats.rst => metrics.rst} (99%) diff --git a/velox/common/memory/Memory.h b/velox/common/memory/Memory.h index b6335011a0c8..ac4e44339951 100644 --- a/velox/common/memory/Memory.h +++ b/velox/common/memory/Memory.h @@ -116,8 +116,8 @@ struct MemoryManagerOptions { /// Specifies the max time to wait for memory reclaim by arbitration. The /// memory reclaim might fail if the max wait time has exceeded. If it is - /// zero, then there is no timeout. - uint64_t memoryReclaimWaitMs{0}; + /// zero, then there is no timeout. The default is 5 mins. + uint64_t memoryReclaimWaitMs{300'000}; /// Provided by the query system to validate the state after a memory pool /// enters arbitration if not null. For instance, Prestissimo provides diff --git a/velox/docs/index.rst b/velox/docs/index.rst index a36cfd6dc052..36df74329d9e 100644 --- a/velox/docs/index.rst +++ b/velox/docs/index.rst @@ -10,7 +10,7 @@ Velox Documentation functions spark_functions configs - stats + metrics bindings/python/README_generated_pyvelox develop programming-guide diff --git a/velox/docs/stats.rst b/velox/docs/metrics.rst similarity index 99% rename from velox/docs/stats.rst rename to velox/docs/metrics.rst index 1037af658edc..e5a99849b2cb 100644 --- a/velox/docs/stats.rst +++ b/velox/docs/metrics.rst @@ -26,6 +26,8 @@ implementation of BaseStatsReporter is required to integrate with a specific monitoring service. The metric aggregation granularity and export interval are also configured based on the actual used monitoring service. +Velox supports five metric types: + **Count**: tracks the count of events, such as the number of query failures. **Sum**: tracks the sum of event data point values, such as sum of query scan