Skip to content

Commit 7e6fa55

Browse files
authored
[improve] Upgrade oxia-java to 0.4.10 and fix closing of OxiaMetadataStore (#23653)
1 parent 68eb8f2 commit 7e6fa55

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

distribution/server/src/assemble/LICENSE.bin.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,8 @@ The Apache Software License, Version 2.0
481481
* Prometheus
482482
- io.prometheus-simpleclient_httpserver-0.16.0.jar
483483
* Oxia
484-
- io.streamnative.oxia-oxia-client-api-0.4.9.jar
485-
- io.streamnative.oxia-oxia-client-0.4.9.jar
484+
- io.streamnative.oxia-oxia-client-api-0.4.10.jar
485+
- io.streamnative.oxia-oxia-client-0.4.10.jar
486486
* OpenHFT
487487
- net.openhft-zero-allocation-hashing-0.16.jar
488488
* Java JSON WebTokens

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ flexible messaging model and an intuitive client API.</description>
251251
<apache-http-client.version>4.5.13</apache-http-client.version>
252252
<apache-httpcomponents.version>4.4.15</apache-httpcomponents.version>
253253
<jetcd.version>0.7.7</jetcd.version>
254-
<oxia.version>0.4.9</oxia.version>
254+
<oxia.version>0.4.10</oxia.version>
255255
<snakeyaml.version>2.0</snakeyaml.version>
256256
<ant.version>1.10.12</ant.version>
257257
<seancfoley.ipaddress.version>5.5.0</seancfoley.ipaddress.version>

pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,12 @@ private CompletableFuture<Void> createParents(String path) {
297297

298298
@Override
299299
public void close() throws Exception {
300-
if (client != null) {
301-
client.close();
300+
if (isClosed.compareAndSet(false, true)) {
301+
if (client != null) {
302+
client.close();
303+
}
304+
super.close();
302305
}
303-
super.close();
304306
}
305307

306308
public Optional<MetadataEventSynchronizer> getMetadataEventSynchronizer() {

0 commit comments

Comments
 (0)