Skip to content

Commit

Permalink
Web console: totalNumMergeTasks can be set on range also (#12648) (#1…
Browse files Browse the repository at this point in the history
…2650)

* Web console: totalNumMergeTasks can be set on range also (#12648)

* totalNumMergeTasks can be set on range also

* fix formatting

* Update node to 14.19.3. (#12632)

Co-authored-by: Gian Merlino <gianmerlino@gmail.com>
  • Loading branch information
vogievetsky and gianm committed Jun 14, 2022
1 parent 7bb7add commit 170c825
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ jobs:
install: web-console/script/druid build
before_script:
- ./check_test_suite.py && travis_terminate 0 || echo 'Starting nvm install...'
- nvm install 14.19.0
- nvm install 14.19.3
- web-console/script/druid start
script: (cd web-console && npm run test-e2e)
after_script: web-console/script/druid stop
Expand Down
2 changes: 1 addition & 1 deletion web-console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"node": ">=14"
},
"volta": {
"node": "14.19.0",
"node": "14.19.3",
"npm": "6.14.16"
},
"browserslist": [
Expand Down
2 changes: 1 addition & 1 deletion web-console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<properties>
<resources.directory>${project.build.directory}/resources</resources.directory>
<druid.console.skip>false</druid.console.skip> <!-- this property is overidden in Travis CI to skip the javascript-related work -->
<node.version>v14.19.0</node.version>
<node.version>v14.19.3</node.version>
<npm.version>6.14.16</npm.version>
</properties>

Expand Down
3 changes: 2 additions & 1 deletion web-console/src/druid-models/compaction-config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ export const COMPACTION_CONFIG_FIELDS: Field<CompactionConfig>[] = [
type: 'number',
defaultValue: 10,
min: 1,
defined: t => oneOf(deepGet(t, 'tuningConfig.partitionsSpec.type'), 'hashed', 'single_dim'),
defined: t =>
oneOf(deepGet(t, 'tuningConfig.partitionsSpec.type'), 'hashed', 'single_dim', 'range'),
info: <>Maximum number of merge tasks which can be run at the same time.</>,
},
{
Expand Down

0 comments on commit 170c825

Please sign in to comment.