Skip to content

HDDS-1245. OM delegation expiration time should use Time.now instead … #587

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
ajayydv merged 2 commits into from
Mar 12, 2019
Merged

HDDS-1245. OM delegation expiration time should use Time.now instead … #587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dba7cf
HDDS-1245. OM delegation expiration time should use Time.now instead …
xiaoyuyao Mar 11, 2019
9987732
Minor update based on Ajay's feedback. avoid dupldiate Time.now call
xiaoyuyao Mar 11, 2019
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
14 changes: 7 additions & 7 deletions ...mon/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,12 @@ private void addToTokenStore(OzoneTokenIdentifier identifier, byte[] password)
*/
private void updateIdentifierDetails(OzoneTokenIdentifier identifier) {
int sequenceNum;
long now = Time.monotonicNow();
long now = Time.now();
sequenceNum = incrementDelegationTokenSeqNum();
identifier.setIssueDate(now);
identifier.setMasterKeyId(getCurrentKey().getKeyId());
identifier.setSequenceNumber(sequenceNum);
identifier.setMaxDate(Time.monotonicNow() + getTokenMaxLifetime());
identifier.setMaxDate(now + getTokenMaxLifetime());
identifier.setOmCertSerialId(getOmCertificateSerialId());
}

Expand Down Expand Up @@ -198,7 +198,7 @@ public synchronized long renewToken(Token<OzoneTokenIdentifier> token,
formatTokenId(id), currentTokens.size());
}

long now = Time.monotonicNow();
long now = Time.now();
if (id.getMaxDate() < now) {
throw new OMException(renewer + " tried to renew an expired token "
+ formatTokenId(id) + " max expiration date: "
Expand Down Expand Up @@ -293,7 +293,7 @@ public TokenInfo validateToken(OzoneTokenIdentifier identifier)
throw new InvalidToken("token " + formatTokenId(identifier)
+ " can't be found in cache");
}
long now = Time.monotonicNow();
long now = Time.now();
if (info.getRenewDate() < now) {
throw new InvalidToken("token " + formatTokenId(identifier) + " is " +
"expired, current time: " + Time.formatTime(now) +
Expand Down Expand Up @@ -329,7 +329,7 @@ public boolean verifySignature(OzoneTokenIdentifier identifier,

// TODO: handle roll private key/certificate
private synchronized void removeExpiredKeys() {
long now = Time.monotonicNow();
long now = Time.now();
for (Iterator<Map.Entry<Integer, OzoneSecretKey>> it = allKeys.entrySet()
.iterator(); it.hasNext();) {
Map.Entry<Integer, OzoneSecretKey> e = it.next();
Expand Down Expand Up @@ -447,7 +447,7 @@ public void stop() throws IOException {
* Remove expired delegation tokens from cache and persisted store.
*/
private void removeExpiredToken() {
long now = Time.monotonicNow();
long now = Time.now();
synchronized (this) {
Iterator<Map.Entry<OzoneTokenIdentifier,
TokenInfo>> i = currentTokens.entrySet().iterator();
Expand Down Expand Up @@ -480,7 +480,7 @@ public void run() {
/ (60 * 1000) + " min(s)");
try {
while (isRunning()) {
long now = Time.monotonicNow();
long now = Time.now();
if (lastTokenCacheCleanup + getTokenRemoverScanInterval()
< now) {
removeExpiredToken();
Expand Down