From c92d52971694246e5a0ed7acb8f1b864c7ef0495 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Thu, 28 Nov 2024 14:43:41 +0200
Subject: [PATCH] [improve][metadata] Upgrade oxia-java to 0.4.10 and fix
 closing of OxiaMetadataStore

---
 distribution/server/src/assemble/LICENSE.bin.txt          | 4 ++--
 pom.xml                                                   | 2 +-
 .../pulsar/metadata/impl/oxia/OxiaMetadataStore.java      | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 7c66460c21656..fd393cfec9b76 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -481,8 +481,8 @@ The Apache Software License, Version 2.0
   * Prometheus
     - io.prometheus-simpleclient_httpserver-0.16.0.jar
   * Oxia
-    - io.streamnative.oxia-oxia-client-api-0.4.9.jar
-    - io.streamnative.oxia-oxia-client-0.4.9.jar
+    - io.streamnative.oxia-oxia-client-api-0.4.10.jar
+    - io.streamnative.oxia-oxia-client-0.4.10.jar
   * OpenHFT
     - net.openhft-zero-allocation-hashing-0.16.jar
   * Java JSON WebTokens
diff --git a/pom.xml b/pom.xml
index 40afef1241a54..de05eae5755c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,7 +251,7 @@ flexible messaging model and an intuitive client API.</description>
     <apache-http-client.version>4.5.13</apache-http-client.version>
     <apache-httpcomponents.version>4.4.15</apache-httpcomponents.version>
     <jetcd.version>0.7.7</jetcd.version>
-    <oxia.version>0.4.9</oxia.version>
+    <oxia.version>0.4.10</oxia.version>
     <snakeyaml.version>2.0</snakeyaml.version>
     <ant.version>1.10.12</ant.version>
     <seancfoley.ipaddress.version>5.5.0</seancfoley.ipaddress.version>
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
index 27cd4a2d2f60b..4073eb8dcca2a 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
@@ -297,10 +297,12 @@ private CompletableFuture<Void> createParents(String path) {
 
     @Override
     public void close() throws Exception {
-        if (client != null) {
-            client.close();
+        if (isClosed.compareAndSet(false, true)) {
+            if (client != null) {
+                client.close();
+            }
+            super.close();
         }
-        super.close();
     }
 
     public Optional<MetadataEventSynchronizer> getMetadataEventSynchronizer() {