This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch HDDS-7593
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-7593 by this push:
new d4314c94b6 HDDS-10591. [hsync] improve block token refresh message.
(#6444)
d4314c94b6 is described below
commit d4314c94b6fb31174b29981a05065dcb31c15cd9
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Fri Apr 5 11:20:03 2024 -0700
HDDS-10591. [hsync] improve block token refresh message. (#6444)
---
.../org/apache/hadoop/hdds/scm/XceiverClientGrpc.java | 2 +-
.../apache/hadoop/hdds/scm/storage/BlockInputStream.java | 16 ++++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
index 52f435dc82..80a6c5a86b 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
@@ -440,7 +440,7 @@ public class XceiverClientGrpc extends XceiverClientSpi {
LOG.debug(message + " on the pipeline {}.",
processForDebug(request), pipeline);
} else {
- LOG.error(message + " on the pipeline {}.",
+ LOG.warn(message + " on the pipeline {}.",
request.getCmdType(), pipeline);
}
throw ioException;
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
index b66999de1f..374e90a24c 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hdds.scm.storage;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -224,18 +225,25 @@ public class BlockInputStream extends
BlockExtendedInputStream {
}
private void refreshBlockInfo(IOException cause) throws IOException {
- LOG.info("Unable to read information for block {} from pipeline {}: {}",
+ LOG.info("Attempting to update pipeline and block token for block {} from
pipeline {}: {}",
blockID, pipelineRef.get().getId(), cause.getMessage());
if (refreshFunction != null) {
LOG.debug("Re-fetching pipeline and block token for block {}", blockID);
BlockLocationInfo blockLocationInfo = refreshFunction.apply(blockID);
if (blockLocationInfo == null) {
- LOG.debug("No new block location info for block {}", blockID);
+ LOG.warn("No new block location info for block {}", blockID);
} else {
- LOG.debug("New pipeline for block {}: {}", blockID,
- blockLocationInfo.getPipeline());
setPipeline(blockLocationInfo.getPipeline());
+ LOG.info("New pipeline for block {}: {}", blockID,
+ blockLocationInfo.getPipeline());
+
tokenRef.set(blockLocationInfo.getToken());
+ if (blockLocationInfo.getToken() != null) {
+ OzoneBlockTokenIdentifier tokenId = new OzoneBlockTokenIdentifier();
+ tokenId.readFromByteArray(tokenRef.get().getIdentifier());
+ LOG.info("A new token is added for block {}. Expiry: {}",
+ blockID, Instant.ofEpochMilli(tokenId.getExpiryDate()));
+ }
}
} else {
throw cause;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
