Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
87437df0
Commit
87437df0
authored
10 years ago
by
Andrew Or
Browse files
Options
Downloads
Patches
Plain Diff
Revert "[HOT FIX] [YARN] Check whether `/lib` exists before listing its files"
This reverts commit
90ec643e
.
parent
ca379039
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
+12
-15
12 additions, 15 deletions
.../main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
with
12 additions
and
15 deletions
yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
+
12
−
15
View file @
87437df0
...
...
@@ -243,21 +243,18 @@ private[spark] trait ClientBase extends Logging {
val
libsURI
=
new
URI
(
libsDir
)
val
jarLinks
=
ListBuffer
.
empty
[
String
]
if
(
libsURI
.
getScheme
!=
LOCAL_SCHEME
)
{
val
localPath
=
getQualifiedLocalPath
(
libsURI
)
val
localFs
=
FileSystem
.
get
(
localPath
.
toUri
,
hadoopConf
)
if
(
localFs
.
exists
(
localPath
))
{
val
jars
=
localFs
.
listFiles
(
localPath
,
/* recursive */
false
)
while
(
jars
.
hasNext
)
{
val
jar
=
jars
.
next
()
val
name
=
jar
.
getPath
.
getName
if
(
name
.
startsWith
(
"datanucleus-"
))
{
// copy to remote and add to classpath
val
src
=
jar
.
getPath
val
destPath
=
copyFileToRemote
(
dst
,
src
,
replication
)
distCacheMgr
.
addResource
(
localFs
,
hadoopConf
,
destPath
,
localResources
,
LocalResourceType
.
FILE
,
name
,
statCache
)
jarLinks
+=
name
}
val
localURI
=
getQualifiedLocalPath
(
libsURI
).
toUri
()
val
jars
=
FileSystem
.
get
(
localURI
,
hadoopConf
).
listFiles
(
new
Path
(
localURI
.
getPath
),
false
)
while
(
jars
.
hasNext
)
{
val
jar
=
jars
.
next
()
val
name
=
jar
.
getPath
.
getName
if
(
name
.
startsWith
(
"datanucleus-"
))
{
// copy to remote and add to classpath
val
src
=
jar
.
getPath
val
destPath
=
copyFileToRemote
(
dst
,
src
,
replication
)
distCacheMgr
.
addResource
(
fs
,
hadoopConf
,
destPath
,
localResources
,
LocalResourceType
.
FILE
,
name
,
statCache
)
jarLinks
+=
name
}
}
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment