From 9cb507d3d1ecf903c1bbe3bb5fc04a25ba2ece7b Mon Sep 17 00:00:00 2001
From: ulysses-you <ulyssesyou18@gmail.com>
Date: Fri, 5 Mar 2021 17:14:07 +0800
Subject: [PATCH] [KYUUBI #395] [WIP] FIx flaky test in
 ConnectionLevelSparkEngineSuite

![ulysses-you](https://badgen.net/badge/Hello/ulysses-you/green) [![Closes #395](https://badgen.net/badge/Preview/Closes%20%23395/blue)](https://github.com/yaooqinn/kyuubi/pull/395) ![2](https://badgen.net/badge/%2B/2/red) ![1](https://badgen.net/badge/-/1/green) ![10](https://badgen.net/badge/commits/10/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.
-->

### _How was this patch tested?_

Closes #395 from ulysses-you/flaky-test.

e8bdd4d [ulysses-you] empty
08febfc [ulysses-you] empty
c3805d1 [ulysses-you] empty
702ac2c [ulysses-you] empty
a544ef0 [ulysses-you] empty
0bd8878 [ulysses-you] empty
dbd53e4 [ulysses-you] fix
f4be895 [ulysses-you] empty
195933a [ulysses-you] empty
cb69e0d [ulysses-you] wip

Authored-by: ulysses-you <ulyssesyou18@gmail.com>
Signed-off-by: ulysses-you <ulyssesyou18@gmail.com>
---
 .../org/apache/kyuubi/ha/client/EngineServiceDiscovery.scala   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/EngineServiceDiscovery.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/EngineServiceDiscovery.scala
index 3c823fffc..d941de185 100644
--- a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/EngineServiceDiscovery.scala
+++ b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/EngineServiceDiscovery.scala
@@ -34,7 +34,8 @@ class EngineServiceDiscovery private(
   def this(server: Serverable) =
     this(classOf[EngineServiceDiscovery].getSimpleName, server)
 
-  override def stop(): Unit = {
+  override def stop(): Unit = synchronized {
+    closeServiceNode()
     conf.get(ENGINE_SHARED_LEVEL) match {
       // For connection level, we should clean up the namespace in zk in case the disk stress.
       case "CONNECTION" if namespace != null =>