This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 15b62de75f HDDS-10333. RocksDB logger not closed (#6200)
15b62de75f is described below
commit 15b62de75fcaafa6fe4e747a2c23794083957db3
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Feb 9 12:35:37 2024 +0100
HDDS-10333. RocksDB logger not closed (#6200)
---
.../hadoop/hdds/utils/db/DBStoreBuilder.java | 8 ++----
.../hdds/utils/db/managed/ManagedDBOptions.java | 14 ++++++++++
.../{ManagedDBOptions.java => ManagedLogger.java} | 32 +++++++++++++++-------
3 files changed, 38 insertions(+), 16 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
index 32fcbfec6e..31089bc1c0 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
@@ -52,6 +52,7 @@ import static org.rocksdb.RocksDB.DEFAULT_COLUMN_FAMILY;
import org.apache.hadoop.hdds.conf.StorageUnit;
import org.apache.hadoop.hdds.utils.db.managed.ManagedColumnFamilyOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedDBOptions;
+import org.apache.hadoop.hdds.utils.db.managed.ManagedLogger;
import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksDB;
import org.apache.hadoop.hdds.utils.db.managed.ManagedStatistics;
import org.apache.hadoop.hdds.utils.db.managed.ManagedWriteOptions;
@@ -405,12 +406,7 @@ public final class DBStoreBuilder {
// Apply logging settings.
if (rocksDBConfiguration.isRocksdbLoggingEnabled()) {
- org.rocksdb.Logger logger = new org.rocksdb.Logger(dbOptions) {
- @Override
- protected void log(InfoLogLevel infoLogLevel, String s) {
- ROCKS_DB_LOGGER.info(s);
- }
- };
+ ManagedLogger logger = new ManagedLogger(dbOptions, (infoLogLevel, s) ->
ROCKS_DB_LOGGER.info(s));
InfoLogLevel level = InfoLogLevel.valueOf(rocksDBConfiguration
.getRocksdbLogLevel() + "_LEVEL");
logger.setInfoLogLevel(level);
diff --git
a/hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedDBOptions.java
b/hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedDBOptions.java
index 638739ff55..4eb2a0d2bc 100644
---
a/hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedDBOptions.java
+++
b/hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedDBOptions.java
@@ -18,20 +18,34 @@
*/
package org.apache.hadoop.hdds.utils.db.managed;
+import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.ratis.util.UncheckedAutoCloseable;
import org.rocksdb.DBOptions;
+import org.rocksdb.Logger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static
org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.LOG;
import static
org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
/**
* Managed DBOptions.
*/
public class ManagedDBOptions extends DBOptions {
+
private final UncheckedAutoCloseable leakTracker = track(this);
+ private final AtomicReference<Logger> loggerRef = new AtomicReference<>();
+
+ @Override
+ public DBOptions setLogger(Logger logger) {
+ IOUtils.close(LOG, loggerRef.getAndSet(logger));
+ return super.setLogger(logger);
+ }
@Override
public void close() {
try {
+ IOUtils.close(LOG, loggerRef.getAndSet(null));
super.close();
} finally {
leakTracker.close();
diff --git
a/hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedDBOptions.java
b/hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedLogger.java
similarity index 62%
copy from
hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedDBOptions.java
copy to
hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedLogger.java
index 638739ff55..d04f91cd4e 100644
---
a/hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedDBOptions.java
+++
b/hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedLogger.java
@@ -5,29 +5,41 @@
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
package org.apache.hadoop.hdds.utils.db.managed;
import org.apache.ratis.util.UncheckedAutoCloseable;
-import org.rocksdb.DBOptions;
+import org.rocksdb.InfoLogLevel;
+import org.rocksdb.Logger;
+
+import java.util.function.BiConsumer;
import static
org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
-/**
- * Managed DBOptions.
- */
-public class ManagedDBOptions extends DBOptions {
+/** Managed {@link Logger}. */
+public class ManagedLogger extends Logger {
+
private final UncheckedAutoCloseable leakTracker = track(this);
+ private final BiConsumer<InfoLogLevel, String> delegate;
+
+ public ManagedLogger(ManagedDBOptions dbOptions, BiConsumer<InfoLogLevel,
String> delegate) {
+ super(dbOptions);
+ this.delegate = delegate;
+ }
+
+ @Override
+ protected void log(InfoLogLevel infoLogLevel, String logMsg) {
+ delegate.accept(infoLogLevel, logMsg);
+ }
@Override
public void close() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
