Skip to content

HADOOP-17578. Improve UGI debug log to help troubleshooting TokenCach… #2762

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
merged 4 commits into from
Mar 17, 2021
Merged

HADOOP-17578. Improve UGI debug log to help troubleshooting TokenCach… #2762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f98790
HADOOP-17578. Improve UGI debug log to help troubleshooting TokenCach…
xiaoyuyao Mar 11, 2021
61fb9ed
refactor to trigger jenkins.
xiaoyuyao Mar 15, 2021
54b0ae4
Fix ut issue.
xiaoyuyao Mar 16, 2021
6655d22
fix checkstyle
xiaoyuyao Mar 16, 2021
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
7 changes: 4 additions & 3 deletions ...-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1925,11 +1925,12 @@ public <T> T doAs(PrivilegedExceptionAction<T> action
@InterfaceAudience.LimitedPrivate({"HDFS", "KMS"})
@InterfaceStability.Unstable
public static void logUserInfo(Logger log, String caption,
UserGroupInformation ugi) throws IOException {
UserGroupInformation ugi) {
if (log.isDebugEnabled()) {
log.debug(caption + " UGI: " + ugi);
for (Token<?> token : ugi.getTokens()) {
log.debug("+token:" + token);
for (Map.Entry<Text, Token<? extends TokenIdentifier>> kv :
ugi.getCredentials().getTokenMap().entrySet()) {
log.debug("+token: {} -> {}", kv.getKey(), kv.getValue());
}
}
}
Expand Down
17 changes: 16 additions & 1 deletion ...t/hadoop-common/src/main/java/org/apache/hadoop/security/token/DelegationTokenIssuer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.security.Credentials;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -32,7 +34,7 @@
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce", "Yarn"})
@InterfaceStability.Unstable
public interface DelegationTokenIssuer {

Logger TOKEN_LOG = LoggerFactory.getLogger(DelegationTokenIssuer.class);
/**
* The service name used as the alias for the token in the credential
* token map. addDelegationTokens will use this to determine if
Expand Down Expand Up @@ -88,15 +90,28 @@ static void collectDelegationTokens(
final List<Token<?>> tokens) throws IOException {
final String serviceName = issuer.getCanonicalServiceName();
// Collect token of the this issuer and then of its embedded children
if (TOKEN_LOG.isDebugEnabled()) {
TOKEN_LOG.debug("Search token for service {} in credentials",
serviceName);
}
if (serviceName != null) {
final Text service = new Text(serviceName);
Token<?> token = credentials.getToken(service);
if (token == null) {
if (TOKEN_LOG.isDebugEnabled()) {
TOKEN_LOG.debug("Token for service {} not found in credentials," +
" try getDelegationToken.", serviceName);
}
token = issuer.getDelegationToken(renewer);
if (token != null) {
tokens.add(token);
credentials.addToken(service, token);
}
} else {
if (TOKEN_LOG.isDebugEnabled()) {
TOKEN_LOG.debug("Token for service {} found in credentials," +
"skip getDelegationToken.", serviceName);
}
}
}
// Now collect the tokens from the children.
Expand Down