HeartSaVioR commented on a change in pull request #23418: [MINOR] Fix
inconsistency log level among delegation token providers
URL: https://github.com/apache/spark/pull/23418#discussion_r244621528
##########
File path:
core/src/main/scala/org/apache/spark/deploy/security/HadoopFSDelegationTokenProvider.scala
##########
@@ -44,28 +45,34 @@ private[deploy] class
HadoopFSDelegationTokenProvider(fileSystems: () => Set[Fil
hadoopConf: Configuration,
sparkConf: SparkConf,
creds: Credentials): Option[Long] = {
- val fsToGetTokens = fileSystems()
- val fetchCreds = fetchDelegationTokens(getTokenRenewer(hadoopConf),
fsToGetTokens, creds)
+ try {
+ val fsToGetTokens = fileSystems()
+ val fetchCreds = fetchDelegationTokens(getTokenRenewer(hadoopConf),
fsToGetTokens, creds)
- // Get the token renewal interval if it is not set. It will only be called
once.
- if (tokenRenewalInterval == null) {
- tokenRenewalInterval = getTokenRenewalInterval(hadoopConf, sparkConf,
fsToGetTokens)
- }
+ // Get the token renewal interval if it is not set. It will only be
called once.
+ if (tokenRenewalInterval == null) {
+ tokenRenewalInterval = getTokenRenewalInterval(hadoopConf, sparkConf,
fsToGetTokens)
+ }
- // Get the time of next renewal.
- val nextRenewalDate = tokenRenewalInterval.flatMap { interval =>
- val nextRenewalDates = fetchCreds.getAllTokens.asScala
-
.filter(_.decodeIdentifier().isInstanceOf[AbstractDelegationTokenIdentifier])
- .map { token =>
- val identifier = token
- .decodeIdentifier()
- .asInstanceOf[AbstractDelegationTokenIdentifier]
- identifier.getIssueDate + interval
- }
- if (nextRenewalDates.isEmpty) None else Some(nextRenewalDates.min)
- }
+ // Get the time of next renewal.
+ val nextRenewalDate = tokenRenewalInterval.flatMap { interval =>
+ val nextRenewalDates = fetchCreds.getAllTokens.asScala
+
.filter(_.decodeIdentifier().isInstanceOf[AbstractDelegationTokenIdentifier])
+ .map { token =>
+ val identifier = token
+ .decodeIdentifier()
+ .asInstanceOf[AbstractDelegationTokenIdentifier]
+ identifier.getIssueDate + interval
+ }
+ if (nextRenewalDates.isEmpty) None else Some(nextRenewalDates.min)
+ }
- nextRenewalDate
+ nextRenewalDate
+ } catch {
+ case NonFatal(e) =>
Review comment:
This is another one of inconsistency between HDFS delegation token provider
and others. While others log the error message and swallow the exception, this
doesn't swallow the exception.
Personally I prefer not to swallow the error, but majority are swallowing so
I just changed this. Please let me know if we think it would be better to
re-raise the exception.
If we are unclear about this, I'm OK to make changes to only log level.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
