### _Why are the changes needed?_ Fix #1293 This PR is a rework of #1303, also related to #962 We have two options to fix this issue. This PR implements option 2. ``` [option 1] kyuubi.engine.share.level.subdomain: String -- default: "default" kyuubi.engine.pool.size: Int -- default: -1 val subdomain = if (kyuubi.engine.share.level.subdomain == "default" && kyuubi.engine.pool.size > 0) { s"engine-pool-[num]" } else { kyuubi.engine.share.level.subdomain } [option 2] kyuubi.engine.share.level.subdomain: Option[String] -- default: None kyuubi.engine.pool.size: Int -- default: -1 val subdomain = kyuubi.engine.share.level.subdomain match { case Some(value) => value case None if kyuubi.engine.pool.size > 0 => s"engine-pool-[num]" case None => "default" } ``` ``` [diff] [[case1]] kyuubi.engine.share.level.subdomain=default kyuubi.engine.pool.size=2 option 1 result: subdomain="engine-pool-[num]" option 2 result: subdomain="default" [[case2]] kyuubi.engine.share.level.subdomain=hello kyuubi.engine.pool.size=2 option 1 result: subdomain="hello" option 2 result: subdomain="hello" [[case3]] kyuubi.engine.share.level.subdomain= kyuubi.engine.pool.size=2 option 1 result: subdomain="engine-pool-[num]" option 2 result: subdomain="engine-pool-[num]" [[case4]] kyuubi.engine.share.level.subdomain= kyuubi.engine.pool.size= option 1 result: subdomain="default" option 2 result: subdomain="default" [[case5]] kyuubi.engine.share.level.subdomain="hello" kyuubi.engine.pool.size= option 1 result: subdomain="hello" option 2 result: subdomain="hello" ``` ### _How was this patch tested?_ - [x] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [x] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #1402 from pan3793/1293. Closes #1293 f6c4a7db [Cheng Pan] nit fd427bfb [yanyu34946] [KYUUBI #1293] Fix bootstrap potential failure when mixed use subdomain Lead-authored-by: yanyu34946 <875082356@qq.com> Co-authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org> |
||
|---|---|---|
| .. | ||
| spark | ||
| engine_share_level.md | ||
| high_availability_guide.md | ||
| hive_metastore.md | ||
| index.rst | ||
| on_kubernetes.md | ||
| on_yarn.md | ||
| settings.md | ||