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
cae8a679
Commit
cae8a679
authored
12 years ago
by
Stephen Haberman
Browse files
Options
Downloads
Patches
Plain Diff
Fix dangling old variable names.
parent
696eec32
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
core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
+2
-2
2 additions, 2 deletions
...n/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
with
2 additions
and
2 deletions
core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
+
2
−
2
View file @
cae8a679
...
@@ -79,7 +79,7 @@ private[spark] class MesosSchedulerBackend(
...
@@ -79,7 +79,7 @@ private[spark] class MesosSchedulerBackend(
val
memory
=
Resource
.
newBuilder
()
val
memory
=
Resource
.
newBuilder
()
.
setName
(
"mem"
)
.
setName
(
"mem"
)
.
setType
(
Value
.
Type
.
SCALAR
)
.
setType
(
Value
.
Type
.
SCALAR
)
.
setScalar
(
Value
.
Scalar
.
newBuilder
().
setValue
(
EXECUTOR_MEMORY
).
build
())
.
setScalar
(
Value
.
Scalar
.
newBuilder
().
setValue
(
executorMemory
).
build
())
.
build
()
.
build
()
val
command
=
CommandInfo
.
newBuilder
()
val
command
=
CommandInfo
.
newBuilder
()
.
setValue
(
execScript
)
.
setValue
(
execScript
)
...
@@ -151,7 +151,7 @@ private[spark] class MesosSchedulerBackend(
...
@@ -151,7 +151,7 @@ private[spark] class MesosSchedulerBackend(
def
enoughMemory
(
o
:
Offer
)
=
{
def
enoughMemory
(
o
:
Offer
)
=
{
val
mem
=
getResource
(
o
.
getResourcesList
,
"mem"
)
val
mem
=
getResource
(
o
.
getResourcesList
,
"mem"
)
val
slaveId
=
o
.
getSlaveId
.
getValue
val
slaveId
=
o
.
getSlaveId
.
getValue
mem
>=
EXECUTOR_MEMORY
||
slaveIdsWithExecutors
.
contains
(
slaveId
)
mem
>=
executorMemory
||
slaveIdsWithExecutors
.
contains
(
slaveId
)
}
}
for
((
offer
,
index
)
<-
offers
.
zipWithIndex
if
enoughMemory
(
offer
))
{
for
((
offer
,
index
)
<-
offers
.
zipWithIndex
if
enoughMemory
(
offer
))
{
...
...
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