This is an automated email from the ASF dual-hosted git repository.
bharat 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 b5cbb65 HDDS-5164. Improve client and server logging. (#2234)
b5cbb65 is described below
commit b5cbb65de415a6da44c02ba997434e89d37ce0c9
Author: Hanisha Koneru <[email protected]>
AuthorDate: Tue May 11 22:29:10 2021 -0700
HDDS-5164. Improve client and server logging. (#2234)
---
.../hadoop/hdds/scm/storage/BlockOutputStream.java | 8 +++----
.../client/io/BlockOutputStreamEntryPool.java | 2 +-
.../org/apache/hadoop/ozone/om/OzoneManager.java | 6 +++++
...OzoneManagerProtocolServerSideTranslatorPB.java | 27 +++++++++++-----------
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
index 272120b..e80c1a3 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
@@ -673,10 +673,10 @@ public class BlockOutputStream extends OutputStream {
}
return e;
}, responseExecutor).exceptionally(e -> {
- LOG.error("writing chunk failed " + chunkInfo.getChunkName() +
- " blockID " + blockID + " with exception "
- + e.getLocalizedMessage());
- CompletionException ce = new CompletionException(e);
+ String msg = "Failed to write chunk " + chunkInfo.getChunkName() + " "
+
+ "into block " + blockID;
+ LOG.debug("{}, exception: {}", msg, e.getLocalizedMessage());
+ CompletionException ce = new CompletionException(msg, e);
setIoException(ce);
throw ce;
});
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntryPool.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntryPool.java
index cf7e841..ea7c3bb 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntryPool.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntryPool.java
@@ -238,7 +238,7 @@ public class BlockOutputStreamEntryPool {
*/
private void allocateNewBlock() throws IOException {
if (!excludeList.isEmpty()) {
- LOG.info("Allocating block with {}", excludeList);
+ LOG.debug("Allocating block with {}", excludeList);
}
OmKeyLocationInfo subKeyInfo =
omClient.allocateBlock(keyArgs, openID, excludeList);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 6c18e0e..2a89440 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -106,6 +106,8 @@ import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.common.Storage.StorageState;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
+import org.apache.hadoop.ozone.om.exceptions.OMLeaderNotReadyException;
+import org.apache.hadoop.ozone.om.exceptions.OMNotLeaderException;
import org.apache.hadoop.ozone.om.ha.OMHANodeDetails;
import org.apache.hadoop.ozone.om.ha.OMNodeDetails;
import org.apache.hadoop.ozone.om.helpers.DBUpdates;
@@ -883,6 +885,10 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
false)) {
rpcServer.refreshServiceAcl(conf, OMPolicyProvider.getInstance());
}
+
+ rpcServer.addSuppressedLoggingExceptions(OMNotLeaderException.class,
+ OMLeaderNotReadyException.class);
+
return rpcServer;
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
index c118307..ccb4c24 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
@@ -193,6 +193,15 @@ public class OzoneManagerProtocolServerSideTranslatorPB
implements
}
}
+ private ServiceException createLeaderErrorException(
+ RaftServerStatus raftServerStatus) {
+ if (raftServerStatus == NOT_LEADER) {
+ return createNotLeaderException();
+ } else {
+ return createLeaderNotReadyException();
+ }
+ }
+
private ServiceException createNotLeaderException() {
RaftPeerId raftPeerId = omRatisServer.getRaftPeerId();
@@ -202,29 +211,19 @@ public class OzoneManagerProtocolServerSideTranslatorPB
implements
OMNotLeaderException notLeaderException =
new OMNotLeaderException(raftPeerId);
- if (LOG.isDebugEnabled()) {
- LOG.debug(notLeaderException.getMessage());
- }
+ LOG.debug(notLeaderException.getMessage());
return new ServiceException(notLeaderException);
}
- private ServiceException createLeaderErrorException(
- RaftServerStatus raftServerStatus) {
- if (raftServerStatus == NOT_LEADER) {
- return createNotLeaderException();
- } else {
- return createLeaderNotReadyException();
- }
- }
-
-
private ServiceException createLeaderNotReadyException() {
RaftPeerId raftPeerId = omRatisServer.getRaftPeerId();
OMLeaderNotReadyException leaderNotReadyException =
new OMLeaderNotReadyException(raftPeerId.toString() + " is Leader " +
- "but not ready to process request");
+ "but not ready to process request yet.");
+
+ LOG.debug(leaderNotReadyException.getMessage());
return new ServiceException(leaderNotReadyException);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
