You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2021/02/04 16:34:43 UTC
[ozone] branch master updated: HDDS-4768. Refactor the repeated
exception conversion method into a common util class (#1864)
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 836072e HDDS-4768. Refactor the repeated exception conversion method into a common util class (#1864)
836072e is described below
commit 836072e8e85315ec104f5312544cc670d7582710
Author: lamber-ken <la...@163.com>
AuthorDate: Fri Feb 5 00:34:29 2021 +0800
HDDS-4768. Refactor the repeated exception conversion method into a common util class (#1864)
---
.../org/apache/hadoop/hdds/utils/HddsServerUtil.java | 19 +++++++++++++++++++
.../org/apache/hadoop/hdds/utils/RocksDBStore.java | 12 ++----------
.../apache/hadoop/hdds/utils/db/DBConfigFromFile.java | 4 +++-
.../org/apache/hadoop/hdds/utils/db/RDBStore.java | 12 ++----------
.../org/apache/hadoop/hdds/utils/db/RDBTable.java | 18 ++----------------
5 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
index 13e08a1..d2273c3 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
@@ -70,6 +70,8 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_HEARTBEAT_RPC_R
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL_DEFAULT;
import static org.apache.hadoop.hdds.server.ServerUtils.sanitizeUserArgs;
+
+import org.rocksdb.RocksDBException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -487,4 +489,21 @@ public final class HddsServerUtil {
}
return metricsSystem;
}
+
+ /**
+ * Converts RocksDB exception to IOE.
+ * @param msg - Message to add to exception.
+ * @param e - Original Exception.
+ * @return IOE.
+ */
+ public static IOException toIOException(String msg, RocksDBException e) {
+ String statusCode = e.getStatus() == null ? "N/A" :
+ e.getStatus().getCodeString();
+ String errMessage = e.getMessage() == null ? "Unknown error" :
+ e.getMessage();
+ String output = msg + "; status : " + statusCode
+ + "; message : " + errMessage;
+ return new IOException(output, e);
+ }
+
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/RocksDBStore.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/RocksDBStore.java
index b399b49..97c267f 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/RocksDBStore.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/RocksDBStore.java
@@ -45,6 +45,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static org.apache.hadoop.hdds.utils.HddsServerUtil.toIOException;
+
/**
* RocksDB implementation of ozone metadata store.
*/
@@ -97,16 +99,6 @@ public class RocksDBStore implements MetadataStore {
}
}
- public static IOException toIOException(String msg, RocksDBException e) {
- String statusCode = e.getStatus() == null ? "N/A" :
- e.getStatus().getCodeString();
- String errMessage = e.getMessage() == null ? "Unknown error" :
- e.getMessage();
- String output = msg + "; status : " + statusCode
- + "; message : " + errMessage;
- return new IOException(output, e);
- }
-
@Override
public void put(byte[] key, byte[] value) throws IOException {
try {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBConfigFromFile.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBConfigFromFile.java
index 5508010..50ac54f 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBConfigFromFile.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBConfigFromFile.java
@@ -35,6 +35,8 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
+import static org.apache.hadoop.hdds.utils.HddsServerUtil.toIOException;
+
/**
* A Class that controls the standard config options of RocksDB.
* <p>
@@ -134,7 +136,7 @@ public final class DBConfigFromFile {
env, options, cfDescs, true);
} catch (RocksDBException rdEx) {
- RDBTable.toIOException("Unable to find/open Options file.", rdEx);
+ toIOException("Unable to find/open Options file.", rdEx);
}
}
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
index 252363c..a7bad57 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
@@ -50,6 +50,8 @@ import org.rocksdb.WriteOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.hadoop.hdds.utils.HddsServerUtil.toIOException;
+
/**
* RocksDB Store that supports creating Tables in DB.
*/
@@ -189,16 +191,6 @@ public class RDBStore implements DBStore {
return columnFamiliesInDb;
}
- public static IOException toIOException(String msg, RocksDBException e) {
- String statusCode = e.getStatus() == null ? "N/A" :
- e.getStatus().getCodeString();
- String errMessage = e.getMessage() == null ? "Unknown error" :
- e.getMessage();
- String output = msg + "; status : " + statusCode
- + "; message : " + errMessage;
- return new IOException(output, e);
- }
-
@Override
public void compactDB() throws IOException {
if (db != null) {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBTable.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBTable.java
index 878a1f2..3e28170 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBTable.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBTable.java
@@ -39,6 +39,8 @@ import org.apache.hadoop.hdds.utils.MetadataKeyFilters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.hadoop.hdds.utils.HddsServerUtil.toIOException;
+
/**
* RocksDB implementation of ozone metadata store. This class should be only
* used as part of TypedTable as it's underlying implementation to access the
@@ -72,22 +74,6 @@ class RDBTable implements Table<byte[], byte[]> {
}
/**
- * Converts RocksDB exception to IOE.
- * @param msg - Message to add to exception.
- * @param e - Original Exception.
- * @return IOE.
- */
- public static IOException toIOException(String msg, RocksDBException e) {
- String statusCode = e.getStatus() == null ? "N/A" :
- e.getStatus().getCodeString();
- String errMessage = e.getMessage() == null ? "Unknown error" :
- e.getMessage();
- String output = msg + "; status : " + statusCode
- + "; message : " + errMessage;
- return new IOException(output, e);
- }
-
- /**
* Returns the Column family Handle.
*
* @return ColumnFamilyHandle.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org