Skip to content

Commit

Permalink
fix(server-core): Specify maximum for continueWaitTimeout (90 seconds) (
Browse files Browse the repository at this point in the history 
#7301)
  • Loading branch information
@ovr
ovr authored Oct 26, 2023
1 parent 1e722dd commit 148fb96
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions docs/content/Reference/Configuration/Config.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -711,8 +711,8 @@ these values can result in application instability and/or downtime.
You can pass this object to set advanced options for Cube Query Orchestrator.

| Option | Description | Default Value |
| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------- |
| continueWaitTimeout | Long polling interval | `5` |
|----------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------|
| continueWaitTimeout | Long polling interval in seconds, maximum is 90 | `5` |
| redisPrefix | Prefix to be set an all Redis keys | `STANDALONE` |
| rollupOnlyMode | When enabled, an error will be thrown if a query can't be served from a pre-aggregation (rollup) | `false` |
| queryCacheOptions | Query cache options for DB queries | `{}` |
Expand Down
8 changes: 4 additions & 4 deletions docs/docs-new/pages/reference/configuration/config.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ these values can result in application instability and/or downtime.
You can pass this object to set advanced options for the query orchestrator.

| Option | Description | Default Value |
| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------- |
| continueWaitTimeout | Long polling interval | `5` |
|----------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------|
| continueWaitTimeout | Long polling interval in seconds, maximum is 90 | `5` |
| rollupOnlyMode | When enabled, an error will be thrown if a query can't be served from a pre-aggregation (rollup) | `false` |
| queryCacheOptions | Query cache options for DB queries | `{}` |
| queryCacheOptions.refreshKeyRenewalThreshold | Time in seconds to cache the result of [`refresh_key`][ref-schema-cube-ref-refresh-key] check | `defined by DB dialect` |
Expand Down Expand Up @@ -479,7 +479,7 @@ Timeout and interval options' values are in seconds.
from cube import config

config.orchestrator_options = {
'continueWaitTimeout': 1000,
'continueWaitTimeout': 10,
'rollupOnlyMode': False,
'queryCacheOptions': {
'refreshKeyRenewalThreshold': 30,
Expand Down Expand Up @@ -507,7 +507,7 @@ config.orchestrator_options = {
```javascript
module.exports = {
orchestratorOptions: {
continueWaitTimeout: 1000,
continueWaitTimeout: 10,
rollupOnlyMode: false,
queryCacheOptions: {
refreshKeyRenewalThreshold: 30,
Expand Down
4 changes: 2 additions & 2 deletions packages/cubejs-server-core/src/core/optionsValidate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import DriverDependencies from './DriverDependencies';

const schemaQueueOptions = Joi.object().strict(true).keys({
concurrency: Joi.number().min(1).integer(),
continueWaitTimeout: Joi.number().min(0).integer(),
continueWaitTimeout: Joi.number().min(0).max(90).integer(),
executionTimeout: Joi.number().min(0).integer(),
orphanedTimeout: Joi.number().min(0).integer(),
heartBeatInterval: Joi.number().min(0).integer(),
Expand Down Expand Up @@ -128,7 +128,7 @@ const schemaOptions = Joi.object().keys({
idleTimeoutMillis: Joi.number().min(0),
})
}),
continueWaitTimeout: Joi.number().min(0).integer(),
continueWaitTimeout: Joi.number().min(0).max(90).integer(),
skipExternalCacheAndQueue: Joi.boolean(),
queryCacheOptions: Joi.object().keys({
refreshKeyRenewalThreshold: Joi.number().min(0).integer(),
Expand Down

0 comments on commit 148fb96

Please sign in to comment.