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
d3f095f9
Commit
d3f095f9
authored
12 years ago
by
Denny
Browse files
Options
Downloads
Patches
Plain Diff
Fixed bug when fetching Jar dependencies.
Instead of checking currentFiles check currentJars.
parent
1ac7bf89
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/src/main/scala/spark/executor/Executor.scala
+3
-3
3 additions, 3 deletions
core/src/main/scala/spark/executor/Executor.scala
core/src/main/scala/spark/scheduler/local/LocalScheduler.scala
+3
-3
3 additions, 3 deletions
...src/main/scala/spark/scheduler/local/LocalScheduler.scala
with
6 additions
and
6 deletions
core/src/main/scala/spark/executor/Executor.scala
+
3
−
3
View file @
d3f095f9
...
...
@@ -141,12 +141,12 @@ private[spark] class Executor extends Logging {
private
def
updateDependencies
(
newFiles
:
HashMap
[
String
,
Long
],
newJars
:
HashMap
[
String
,
Long
])
{
// Fetch missing dependencies
for
((
name
,
timestamp
)
<-
newFiles
if
currentFiles
.
getOrElse
(
name
,
-
1L
)
<
timestamp
)
{
logInfo
(
"Fetching "
+
name
)
logInfo
(
"Fetching "
+
name
+
" with timestamp "
+
timestamp
)
Utils
.
fetchFile
(
name
,
new
File
(
"."
))
currentFiles
(
name
)
=
timestamp
}
for
((
name
,
timestamp
)
<-
newJars
if
current
File
s
.
getOrElse
(
name
,
-
1L
)
<
timestamp
)
{
logInfo
(
"Fetching "
+
name
)
for
((
name
,
timestamp
)
<-
newJars
if
current
Jar
s
.
getOrElse
(
name
,
-
1L
)
<
timestamp
)
{
logInfo
(
"Fetching "
+
name
+
" with timestamp "
+
timestamp
)
Utils
.
fetchFile
(
name
,
new
File
(
"."
))
currentJars
(
name
)
=
timestamp
// Add it to our class loader
...
...
This diff is collapsed.
Click to expand it.
core/src/main/scala/spark/scheduler/local/LocalScheduler.scala
+
3
−
3
View file @
d3f095f9
...
...
@@ -109,12 +109,12 @@ private[spark] class LocalScheduler(threads: Int, maxFailures: Int, sc: SparkCon
private
def
updateDependencies
(
newFiles
:
HashMap
[
String
,
Long
],
newJars
:
HashMap
[
String
,
Long
])
{
// Fetch missing dependencies
for
((
name
,
timestamp
)
<-
newFiles
if
currentFiles
.
getOrElse
(
name
,
-
1L
)
<
timestamp
)
{
logInfo
(
"Fetching "
+
name
)
logInfo
(
"Fetching "
+
name
+
" with timestamp "
+
timestamp
)
Utils
.
fetchFile
(
name
,
new
File
(
"."
))
currentFiles
(
name
)
=
timestamp
}
for
((
name
,
timestamp
)
<-
newJars
if
current
File
s
.
getOrElse
(
name
,
-
1L
)
<
timestamp
)
{
logInfo
(
"Fetching "
+
name
)
for
((
name
,
timestamp
)
<-
newJars
if
current
Jar
s
.
getOrElse
(
name
,
-
1L
)
<
timestamp
)
{
logInfo
(
"Fetching "
+
name
+
" with timestamp "
+
timestamp
)
Utils
.
fetchFile
(
name
,
new
File
(
"."
))
currentJars
(
name
)
=
timestamp
// Add it to our class loader
...
...
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