rat-excludes

Michael Gummelt · Michael Gummelt · commit e15f1abcd708 · 2017-04-21T14:12:36.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/deploy/security/ConfigurableCredentialManager.scala b/core/src/main/scala/org/apache/spark/deploy/security/ConfigurableCredentialManager.scala
@@ -130,17 +130,4 @@ private[spark] class ConfigurableCredentialManager(
       }
     }.foldLeft(Long.MaxValue)(math.min)
   }
-
-  /**
-   * Returns a copy of the current user's credentials, augmented with new delegation tokens.
-   */
-  def obtainUserCredentials: Credentials = {
-    val userCreds = UserGroupInformation.getCurrentUser.getCredentials
-    val numTokensBefore = userCreds.numberOfTokens
-    obtainCredentials(hadoopConf, userCreds)
-
-    logDebug(s"Fetched ${userCreds.numberOfTokens - numTokensBefore} delegation token(s).")
-
-    userCreds
-  }
 }
diff --git a/core/src/test/scala/org/apache/spark/deploy/security/ConfigurableCredentialManagerSuite.scala b/core/src/test/scala/org/apache/spark/deploy/security/ConfigurableCredentialManagerSuite.scala
@@ -79,14 +79,6 @@ class ConfigurableCredentialManagerSuite extends SparkFunSuite with Matchers wit
     tokens.iterator().next().getService should be (new Text("test"))
   }
 
-  test("verify obtaining user credentials") {
-    credentialManager = new ConfigurableCredentialManager(sparkConf, hadoopConf)
-
-    val initNumTokens = UserGroupInformation.getCurrentUser.getCredentials.numberOfTokens
-    val creds = credentialManager.obtainUserCredentials
-    creds.numberOfTokens() should be (initNumTokens + 1)
-  }
-
   test("verify getting credential renewal info") {
     credentialManager = new ConfigurableCredentialManager(sparkConf, hadoopConf)
     val creds = new Credentials()
diff --git a/dev/.rat-excludes b/dev/.rat-excludes
@@ -102,7 +102,7 @@ spark-deps-.*
 org.apache.spark.scheduler.ExternalClusterManager
 .*\.sql
 .Rbuildignore
-org.apache.spark.deploy.security.ServiceCredentialProvider
+META-INF/services/*
 spark-warehouse
 structured-streaming/*
 kafka-source-initial-offset-version-2.1.0.bin
diff --git a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/security/ServiceCredentialProvider.scala b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/security/ServiceCredentialProvider.scala
@@ -47,7 +47,7 @@ trait ServiceCredentialProvider {
    * Obtain credentials for this service and get the time of the next renewal.
    *
    * @param hadoopConf Configuration of current Hadoop Compatible system.
-   * @param sparkConf SparkConf
+   * @param sparkConf Spark configuration.
    * @param creds Credentials to add tokens and security keys to.
    * @return If this Credential is renewable and can be renewed, return the time of the next
    *         renewal, otherwise None should be returned.
@@ -56,6 +56,4 @@ trait ServiceCredentialProvider {
       hadoopConf: Configuration,
       sparkConf: SparkConf,
       creds: Credentials): Option[Long]
-}
-
-
+}

Original file line number	Diff line number	Diff line change
`@@ -130,17 +130,4 @@ private[spark] class ConfigurableCredentialManager(`
`130`	`130`	`}`
`131`	`131`	`}.foldLeft(Long.MaxValue)(math.min)`
`132`	`132`	`}`
`133`		`-`
`134`		`- /**`
`135`		`- * Returns a copy of the current user's credentials, augmented with new delegation tokens.`
`136`		`- */`
`137`		`- def obtainUserCredentials: Credentials = {`
`138`		`- val userCreds = UserGroupInformation.getCurrentUser.getCredentials`
`139`		`- val numTokensBefore = userCreds.numberOfTokens`
`140`		`- obtainCredentials(hadoopConf, userCreds)`
`141`		`-`
`142`		`- logDebug(s"Fetched ${userCreds.numberOfTokens - numTokensBefore} delegation token(s).")`
`143`		`-`
`144`		`- userCreds`
`145`		`- }`
`146`	`133`	`}`