From 598aa3739907878241cd31b1415de82fe22bc51b Mon Sep 17 00:00:00 2001 From: horizonzy Date: Tue, 23 Jul 2024 20:53:04 +0800 Subject: [PATCH 1/2] Fix ReadOnlyLedgerHandle leak issue when checkAllLedgers. --- .../src/main/java/org/apache/bookkeeper/replication/Auditor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java index 9ddc659fa6c..36978bf7726 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java @@ -1380,6 +1380,7 @@ void checkAllLedgers() throws BKException, IOException, InterruptedException { numFragmentsPerLedger.registerSuccessfulValue(lh.getNumFragments()); numBookiesPerLedger.registerSuccessfulValue(lh.getNumBookies()); numLedgersChecked.inc(); + lh.closeAsync(); } else if (Code.NoSuchLedgerExistsOnMetadataServerException == rc) { if (LOG.isDebugEnabled()) { LOG.debug("Ledger {} was deleted before we could check it", ledgerId); From 199fc9e1c16c71d898df00dae435e932c331a88e Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Mon, 29 Jul 2024 14:33:02 +0800 Subject: [PATCH 2/2] fix: install netcat-openbsd instead of netcat in test image build (#4476) Signed-off-by: ZhangJian He (cherry picked from commit 56625245d53ce37525fc3f8eb4f3274beecf52eb) --- tests/docker-images/all-released-versions-image/Dockerfile | 4 ++-- tests/docker-images/current-version-image/Dockerfile | 2 +- tests/docker-images/statestore-image/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/docker-images/all-released-versions-image/Dockerfile b/tests/docker-images/all-released-versions-image/Dockerfile index a8c761c7e88..b7fd4e2fd10 100644 --- a/tests/docker-images/all-released-versions-image/Dockerfile +++ b/tests/docker-images/all-released-versions-image/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -FROM eclipse-temurin:8-jdk +FROM eclipse-temurin:8-jdk-jammy MAINTAINER Apache BookKeeper ENV BK_JOURNALDIR=/opt/bookkeeper/data/journal @@ -31,7 +31,7 @@ RUN sed -i -e "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://arc -e "s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g" /etc/apt/sources.list \ && echo 'Acquire::http::Timeout "30";\nAcquire::http::ConnectionAttemptDelayMsec "2000";\nAcquire::https::Timeout "30";\nAcquire::https::ConnectionAttemptDelayMsec "2000";\nAcquire::ftp::Timeout "30";\nAcquire::ftp::ConnectionAttemptDelayMsec "2000";\nAcquire::Retries "15";' > /etc/apt/apt.conf.d/99timeout_and_retries \ && apt-get update && apt-get install -qy wget curl supervisor bash ca-certificates apt-transport-https \ - && apt-get -y install netcat dnsutils less procps iputils-ping \ + && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \ && apt-get install -y --no-install-recommends gpg gpg-agent sudo \ && echo "dash dash/sh boolean false" | debconf-set-selections \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash \ diff --git a/tests/docker-images/current-version-image/Dockerfile b/tests/docker-images/current-version-image/Dockerfile index 0e489eb5ea6..ae171625f4f 100644 --- a/tests/docker-images/current-version-image/Dockerfile +++ b/tests/docker-images/current-version-image/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && apt-get install -y --no-install-recommends python3 pip \ && ln -s /usr/bin/python3 /usr/bin/python \ && apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \ - && apt-get -y install netcat dnsutils less procps iputils-ping \ + && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \ && apt-get -y --purge autoremove \ && apt-get autoclean \ && apt-get clean \ diff --git a/tests/docker-images/statestore-image/Dockerfile b/tests/docker-images/statestore-image/Dockerfile index 5a7a1688855..974d11b50c8 100644 --- a/tests/docker-images/statestore-image/Dockerfile +++ b/tests/docker-images/statestore-image/Dockerfile @@ -40,7 +40,7 @@ RUN set -x \ && apt-get install -y --no-install-recommends openjdk-17-jdk \ && apt-get install -y --no-install-recommends python3 pip \ && ln -s /usr/bin/python3 /usr/bin/python \ - && apt-get -y install netcat dnsutils less procps iputils-ping \ + && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \ && apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \ && apt-get -y --purge autoremove \ && apt-get autoclean \