From f83faa8356dca2717ab8970d887319d9c677bd5e Mon Sep 17 00:00:00 2001
From: Kent Yao <yao@apache.org>
Date: Wed, 3 Mar 2021 19:37:59 +0800
Subject: [PATCH] [KYUUBI #389] Bump up curator to 2.12.0

![yaooqinn](https://badgen.net/badge/Hello/yaooqinn/green) [![Closes #389](https://badgen.net/badge/Preview/Closes%20%23389/blue)](https://github.com/yaooqinn/kyuubi/pull/389) ![1](https://badgen.net/badge/%2B/1/red) ![28](https://badgen.net/badge/-/28/green) ![1](https://badgen.net/badge/commits/1/yellow) ![Target Issue](https://badgen.net/badge/Missing/Target%20Issue/ff0000) ![Test Plan](https://badgen.net/badge/Missing/Test%20Plan/ff0000) [&#10088;?&#10089;](https://pullrequestbadge.com/?utm_medium=github&utm_source=yaooqinn&utm_campaign=badge_info)<!-- PR-BADGE: PLEASE DO NOT REMOVE THIS COMMENT -->

<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/yaooqinn/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->

2.12.0 is the last update for curator-test to support zk v3.4.x

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [ ] [Run test](https://kyuubi.readthedocs.io/en/latest/tools/testing.html#running-tests) locally before make a pull request

Closes #389 from yaooqinn/curator.

0b12323 [Kent Yao] Bump up curator to 2.12.0

Authored-by: Kent Yao <yao@apache.org>
Signed-off-by: Cheng Pan <379377944@qq.com>
---
 docs/deployment/settings.md | 27 ---------------------------
 pom.xml                     |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/docs/deployment/settings.md b/docs/deployment/settings.md
index 7cacf1b00..a86b12931 100644
--- a/docs/deployment/settings.md
+++ b/docs/deployment/settings.md
@@ -140,19 +140,6 @@ You can configure the Kyuubi properties in `$KYUUBI_HOME/conf/kyuubi-defaults.co
 # spark.scheduler.listenerbus.eventqueue.shared.capacity             100000
 # spark.scheduler.listenerbus.eventqueue.eventLog.capacity           20000
 
-## Dynamic Allocation
-# spark.dynamicAllocation.enabled                           true
-# spark.dynamicAllocation.initialExecutors                  10
-# spark.dynamicAllocation.minExecutors                      10
-# spark.dynamicAllocation.maxExecutors                      500
-# spark.dynamicAllocation.executorAllocationRatio           0.8
-# spark.dynamicAllocation.executorIdleTimeout               60s
-# spark.dynamicAllocation.cachedExecutorIdleTimeout         1h
-# spark.dynamicAllocation.shuffleTracking.enabled           false
-# spark.dynamicAllocation.shuffleTracking.timeout           30min
-# spark.dynamicAllocation.schedulerBacklogTimeout           1s
-# spark.dynamicAllocation.sustainedSchedulerBacklogTimeout  1s
-
 ## External Shuffle Service
 # spark.shuffle.service.enabled                             true
 # spark.shuffle.service.fetch.rdd.enabled                   true
@@ -224,20 +211,6 @@ You can configure the Kyuubi properties in `$KYUUBI_HOME/conf/kyuubi-defaults.co
 # spark.sql.optimizer.dynamicPartitionPruning.fallbackFilterRatio 0.5
 # spark.sql.optimizer.dynamicPartitionPruning.reuseBroadcastOnly  true
 
-# Adaptive Query Execution
-# spark.sql.adaptive.enabled                                true
-# spark.sql.adaptive.forceApply                             false
-# spark.sql.adaptive.logLevel                               info
-# spark.sql.adaptive.advisoryPartitionSizeInBytes           128m
-# spark.sql.adaptive.coalescePartitions.enabled             true
-# spark.sql.adaptive.coalescePartitions.minPartitionNum     64
-# spark.sql.adaptive.coalescePartitions.initialPartitionNum
-# spark.sql.adaptive.fetchShuffleBlocksInBatch              true
-# spark.sql.adaptive.localShuffleReader.enabled             true
-# spark.sql.adaptive.skewJoin.enabled                       true
-# spark.sql.adaptive.skewJoin.skewedPartitionFactor         5
-# spark.sql.adaptive.skewJoin.skewedPartitionThresholdInBytes 256m
-# spark.sql.adaptive.nonEmptyPartitionRatioForBroadcastJoin 0.2
 ```
 ### Authentication
 
diff --git a/pom.xml b/pom.xml
index c029f6457..377203fbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <commons.httpclient.version>4.5.6</commons.httpclient.version>
         <commons.httpcore.version>4.4.12</commons.httpcore.version>
         <guava.version>11.0.2</guava.version>
-        <curator.version>2.7.1</curator.version>
+        <curator.version>2.12.0</curator.version>
         <hadoop.version>2.7.4</hadoop.version>
         <hive.version>2.3.7</hive.version>
         <netty3.version>3.7.0.Final</netty3.version>