make mem and cpu spec optional for yarn submit

JuliaParallel · Jan 7, 2020 · 1c6ddc4 · 1c6ddc4
1 parent 880a14f
commit 1c6ddc4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/api_yarn_appmaster.jl b/src/api_yarn_appmaster.jl
@@ -111,7 +111,7 @@ callback(yam::YarnAppMaster, on_container_alloc::Union{Nothing,Function}, on_con
 function submit(client::YarnClient, unmanagedappmaster::YarnAppMaster)
     @debug("submitting unmanaged application")
     clc = launchcontext()
-    app = submit(client, clc, YARN_CONTAINER_MEM_DEFAULT, YARN_CONTAINER_CPU_DEFAULT; unmanaged=true)
+    app = submit(client, clc; unmanaged=true)
 
     # keep the am_rm token
     tok = am_rm_token(app)

diff --git a/src/api_yarn_client.jl b/src/api_yarn_client.jl
@@ -173,12 +173,12 @@ function _new_app(client::YarnClient)
     resp.application_id, resp.maximumCapability.memory, resp.maximumCapability.virtual_cores
 end
 
-function submit(client::YarnClient, cmd::Union{AbstractString,Vector}, mem::Integer=YARN_CONTAINER_MEM_DEFAULT, cores::Integer=YARN_CONTAINER_CPU_DEFAULT, env::Dict{String,String}=Dict{String,String}(); kwargs...)
+function submit(client::YarnClient, cmd::Union{AbstractString,Vector}, env::Dict{String,String}=Dict{String,String}(); kwargs...)
     container_spec = launchcontext(cmd=cmd, env=env)
-    submit(client, container_spec, mem, cores; kwargs...)
+    submit(client, container_spec; kwargs...)
 end
 
-function submit(client::YarnClient, container_spec::ContainerLaunchContextProto, mem::Integer=YARN_CONTAINER_MEM_DEFAULT, cores::Integer=YARN_CONTAINER_CPU_DEFAULT;
+function submit(client::YarnClient, container_spec::ContainerLaunchContextProto; mem::Integer=YARN_CONTAINER_MEM_DEFAULT, cores::Integer=YARN_CONTAINER_CPU_DEFAULT,
         priority::Int32=one(Int32), appname::AbstractString="EllyApp", queue::AbstractString="default", apptype::AbstractString="YARN", 
         reuse::Bool=false, unmanaged::Bool=false, schedaddr::String="")
     @debug("submitting application", unmanaged=unmanaged, cmd=container_spec.command)

diff --git a/test/yarntests.jl b/test/yarntests.jl
@@ -93,7 +93,7 @@ function test_managed_yarn_clustermanager(host="localhost", rmport=8032, schedpo
     @info("starting managed julia with environment", env)
 
     testscript = joinpath(@__DIR__, "yarnmanagedcm.jl")
-    app = submit(clnt, [Elly._currprocname(), testscript], Elly.YARN_CONTAINER_MEM_DEFAULT, Elly.YARN_CONTAINER_CPU_DEFAULT, env; schedaddr="$(host):$(schedport)")
+    app = submit(clnt, [Elly._currprocname(), testscript], env; schedaddr="$(host):$(schedport)")
     Elly.wait_for_state(app, Elly.YarnApplicationStateProto.FINISHED)
     @info("app complete", status=status(app))
     @test isfile("/tmp/ellytest.log")