forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1516 from apache/master
Create a new pull request by comparing changes across two branches
- Loading branch information
Showing
47 changed files
with
1,322 additions
and
308 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
47 changes: 47 additions & 0 deletions
47
common/utils/src/main/scala/org/apache/spark/util/SparkFileUtils.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.spark.util | ||
|
|
||
| import java.io.File | ||
| import java.net.{URI, URISyntaxException} | ||
|
|
||
| private[spark] object SparkFileUtils { | ||
| /** | ||
| * Return a well-formed URI for the file described by a user input string. | ||
| * | ||
| * If the supplied path does not contain a scheme, or is a relative path, it will be | ||
| * converted into an absolute path with a file:// scheme. | ||
| */ | ||
| def resolveURI(path: String): URI = { | ||
| try { | ||
| val uri = new URI(path) | ||
| if (uri.getScheme() != null) { | ||
| return uri | ||
| } | ||
| // make sure to handle if the path has a fragment (applies to yarn | ||
| // distributed cache) | ||
| if (uri.getFragment() != null) { | ||
| val absoluteURI = new File(uri.getPath()).getAbsoluteFile().toURI() | ||
| return new URI(absoluteURI.getScheme(), absoluteURI.getHost(), absoluteURI.getPath(), | ||
| uri.getFragment()) | ||
| } | ||
| } catch { | ||
| case e: URISyntaxException => | ||
| } | ||
| new File(path).getCanonicalFile().toURI() | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
common/utils/src/main/scala/org/apache/spark/util/SparkThreadUtils.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.spark.util | ||
|
|
||
| import java.util.concurrent.TimeoutException | ||
|
|
||
| import scala.concurrent.Awaitable | ||
| import scala.concurrent.duration.Duration | ||
| import scala.util.control.NonFatal | ||
|
|
||
| import org.apache.spark.SparkException | ||
|
|
||
| private[spark] object SparkThreadUtils { | ||
| // scalastyle:off awaitresult | ||
| /** | ||
| * Preferred alternative to `Await.result()`. | ||
| * | ||
| * This method wraps and re-throws any exceptions thrown by the underlying `Await` call, ensuring | ||
| * that this thread's stack trace appears in logs. | ||
| * | ||
| * In addition, it calls `Awaitable.result` directly to avoid using `ForkJoinPool`'s | ||
| * `BlockingContext`. Codes running in the user's thread may be in a thread of Scala ForkJoinPool. | ||
| * As concurrent executions in ForkJoinPool may see some [[ThreadLocal]] value unexpectedly, this | ||
| * method basically prevents ForkJoinPool from running other tasks in the current waiting thread. | ||
| * In general, we should use this method because many places in Spark use [[ThreadLocal]] and it's | ||
| * hard to debug when [[ThreadLocal]]s leak to other tasks. | ||
| */ | ||
| @throws(classOf[SparkException]) | ||
| def awaitResult[T](awaitable: Awaitable[T], atMost: Duration): T = { | ||
| try { | ||
| // `awaitPermission` is not actually used anywhere so it's safe to pass in null here. | ||
| // See SPARK-13747. | ||
| val awaitPermission = null.asInstanceOf[scala.concurrent.CanAwait] | ||
| awaitable.result(atMost)(awaitPermission) | ||
| } catch { | ||
| case e: SparkFatalException => | ||
| throw e.throwable | ||
| // TimeoutException and RpcAbortException is thrown in the current thread, so not need to warp | ||
| // the exception. | ||
| case NonFatal(t) | ||
| if !t.isInstanceOf[TimeoutException] => | ||
| throw new SparkException("Exception thrown in awaitResult: ", t) | ||
| } | ||
| } | ||
| // scalastyle:on awaitresult | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.