Remove some unused code

Author: ssuchter

resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala

@@ -290,5 +290,5 @@ private[spark] object KubernetesSuite {
   // val CONTAINER_LOCAL_DOWNLOADED_PAGE_RANK_DATA_FILE =
   //   s"$CONTAINER_LOCAL_FILE_DOWNLOAD_PATH/pagerank_data.txt"
 
-  case object ShuffleNotReadyException extends Exception
+  // case object ShuffleNotReadyException extends Exception
 }

resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/Utils.scala

@@ -27,62 +27,4 @@ object Utils extends Logging {
     val resource = createResource
     try f.apply(resource) finally resource.close()
   }
-
-  def tryWithSafeFinally[T](block: => T)(finallyBlock: => Unit): T = {
-    var originalThrowable: Throwable = null
-    try {
-      block
-    } catch {
-      case t: Throwable =>
-        // Purposefully not using NonFatal, because even fatal exceptions
-        // we don't want to have our finallyBlock suppress
-        originalThrowable = t
-        throw originalThrowable
-    } finally {
-      try {
-        finallyBlock
-      } catch {
-        case t: Throwable =>
-          if (originalThrowable != null) {
-            originalThrowable.addSuppressed(t)
-            logWarning(s"Suppressing exception in finally: " + t.getMessage, t)
-            throw originalThrowable
-          } else {
-            throw t
-          }
-      }
-    }
-  }
-
-  def checkAndGetK8sMasterUrl(rawMasterURL: String): String = {
-    require(rawMasterURL.startsWith("k8s://"),
-      "Kubernetes master URL must start with k8s://.")
-    val masterWithoutK8sPrefix = rawMasterURL.substring("k8s://".length)
-
-    // To handle master URLs, e.g., k8s://host:port.
-    if (!masterWithoutK8sPrefix.contains("://")) {
-      val resolvedURL = s"https://$masterWithoutK8sPrefix"
-      logInfo("No scheme specified for kubernetes master URL, so defaulting to https. Resolved " +
-        s"URL is $resolvedURL.")
-      return s"k8s://$resolvedURL"
-    }
-
-    val masterScheme = new URI(masterWithoutK8sPrefix).getScheme
-    val resolvedURL = masterScheme.toLowerCase match {
-      case "https" =>
-        masterWithoutK8sPrefix
-      case "http" =>
-        logWarning("Kubernetes master URL uses HTTP instead of HTTPS.")
-        masterWithoutK8sPrefix
-      case null =>
-        val resolvedURL = s"https://$masterWithoutK8sPrefix"
-        logInfo("No scheme specified for kubernetes master URL, so defaulting to https. Resolved " +
-          s"URL is $resolvedURL.")
-        resolvedURL
-      case _ =>
-        throw new IllegalArgumentException("Invalid Kubernetes master scheme: " + masterScheme)
-    }
-
-    s"k8s://$resolvedURL"
-  }
 }