Skip to content

HDDS-10591. [hsync] improve block token refresh message. #6444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jojochuang merged 5 commits into from
Apr 5, 2024
Merged

HDDS-10591. [hsync] improve block token refresh message. #6444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc2e9ac
HDDS-10591. [hsync] improve block token refresh message.
jojochuang Mar 22, 2024
d9aab21
Log the expiry of token, not the token itself.
jojochuang Apr 1, 2024
7de11e3
Fix test failure
jojochuang Apr 1, 2024
60cd008
Remove warning log if token is not returned from OM. This is normal a…
jojochuang Apr 2, 2024
a3494eb
Update hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/st…
jojochuang Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ private XceiverClientReply sendCommandWithRetry(
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;
Expand Down
16 changes: 12 additions & 4 deletions hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
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;
Expand Down Expand Up @@ -217,18 +218,25 @@ private boolean isConnectivityIssue(IOException ex) {
}

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;
Expand Down