From 8e41c2eed873e215b13215844ba5ba73a8906c5b Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Tue, 7 Mar 2017 16:21:18 -0800
Subject: [PATCH] [SPARK-19857][YARN] Correctly calculate next credential
update time.
Add parentheses so that both lines form a single statement; also add
a log message so that the issue becomes more explicit if it shows up
again.
Tested manually with integration test that exercises the feature.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #17198 from vanzin/SPARK-19857.
---
.../spark/deploy/yarn/security/CredentialUpdater.scala | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/security/CredentialUpdater.scala b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/security/CredentialUpdater.scala
index 2fdb70a73c..41b7b5d60b 100644
--- a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/security/CredentialUpdater.scala
+++ b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/security/CredentialUpdater.scala
@@ -60,7 +60,7 @@ private[spark] class CredentialUpdater(
if (remainingTime <= 0) {
credentialUpdater.schedule(credentialUpdaterRunnable, 1, TimeUnit.MINUTES)
} else {
- logInfo(s"Scheduling credentials refresh from HDFS in $remainingTime millis.")
+ logInfo(s"Scheduling credentials refresh from HDFS in $remainingTime ms.")
credentialUpdater.schedule(credentialUpdaterRunnable, remainingTime, TimeUnit.MILLISECONDS)
}
}
@@ -81,8 +81,8 @@ private[spark] class CredentialUpdater(
UserGroupInformation.getCurrentUser.addCredentials(newCredentials)
logInfo("Credentials updated from credentials file.")
- val remainingTime = getTimeOfNextUpdateFromFileName(credentialsStatus.getPath)
- - System.currentTimeMillis()
+ val remainingTime = (getTimeOfNextUpdateFromFileName(credentialsStatus.getPath)
+ - System.currentTimeMillis())
if (remainingTime <= 0) TimeUnit.MINUTES.toMillis(1) else remainingTime
} else {
// If current credential file is older than expected, sleep 1 hour and check again.
@@ -100,6 +100,7 @@ private[spark] class CredentialUpdater(
TimeUnit.HOURS.toMillis(1)
}
+ logInfo(s"Scheduling credentials refresh from HDFS in $timeToNextUpdate ms.")
credentialUpdater.schedule(
credentialUpdaterRunnable, timeToNextUpdate, TimeUnit.MILLISECONDS)
}
--
GitLab