Skip to content

support JSON >= 1 #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support JSON >= 1 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ MPIExt = "MPI"
AzSessions = "2"
CodecZlib = "0.7"
HTTP = "1"
JSON = "0.21"
JSON = "0.21, 1"
JSONWebTokens = "1"
LibCURL = "0.6"
MPI = "0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.20"
Expand Down
34 changes: 17 additions & 17 deletions src/AzManagers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function write_manifest(;
manifest = Dict("resourcegroup"=>resourcegroup, "subscriptionid"=>subscriptionid, "ssh_user"=>ssh_user, "ssh_private_key_file"=>ssh_private_key_file, "ssh_public_key_file"=>ssh_public_key_file)
try
isdir(manifestpath()) || mkdir(manifestpath(); mode=0o700)
write(manifestfile(), json(manifest, 1))
write(manifestfile(), JSON.json(manifest, 1))
chmod(manifestfile(), 0o600)
catch e
@error "Failed to write manifest file, $(AzManagers.manifestfile())"
Expand Down Expand Up @@ -1313,7 +1313,7 @@ function azure_worker_init(cookie, master_address, master_port, ppi, exeflags, m
"mpi_size" => mpi_size,
"physical_hostname" => azure_physical_name()))

_vm = base64encode(json(vm))
_vm = base64encode(JSON.json(vm))

nbytes_written = write(c, _vm*"\n")
nbytes_written == length(_vm)+1 || error("wrote wrong number of bytes")
Expand Down Expand Up @@ -2235,7 +2235,7 @@ function resourcegraphrequest(manager, body)
manager.verbose,
"https://management.azure.com/providers/Microsoft.ResourceGraph/resources?api-version=2021-03-01",
["Authorization"=>"Bearer $(token(manager.session))", "Content-Type"=>"application/json"],
json(body)
JSON.json(body)
)
r = JSON.parse(String(_r.body))
data = [data;get(r, "data", [])]
Expand Down Expand Up @@ -2345,7 +2345,7 @@ function scaleset_capacity!(manager::AzManager, subscriptionid, resourcegroup, s
verbose,
"https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Compute/virtualMachineScaleSets/$scalesetname?api-version=2023-03-01",
["Authorization"=>"Bearer $(token(manager.session))", "Content-Type"=>"application/json"],
json(Dict("sku"=>Dict("capacity"=>capacity))))
JSON.json(Dict("sku"=>Dict("capacity"=>capacity))))
end

function scaleset_create_or_update(manager::AzManager, user, subscriptionid, resourcegroup, scalesetname, sigimagename, sigimageversion,
Expand Down Expand Up @@ -2469,7 +2469,7 @@ function scaleset_create_or_update(manager::AzManager, user, subscriptionid, res
verbose,
"https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Compute/virtualMachineScaleSets/$scalesetname?api-version=2023-03-01",
["Content-type"=>"application/json", "Authorization"=>"Bearer $(token(manager.session))"],
String(json(_template)))
String(JSON.json(_template)))

if manager.show_quota
@info "Quota after requesting that the scale-set is created or grows" remaining_resource(_r)
Expand All @@ -2485,7 +2485,7 @@ function delete_vms(manager::AzManager, subscriptionid, resourcegroup, scalesetn
verbose,
"https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Compute/virtualMachineScaleSets/$scalesetname/delete?forceDeletion=True&api-version=2023-07-01",
["Content-Type"=>"application/json", "Authorization"=>"Bearer $(token(manager.session))"],
json(body))
JSON.json(body))

if manager.show_quota
@info "Quota after requesting deletion of $(length(ids)) virtual machines" remaining_resource(_r)
Expand Down Expand Up @@ -2627,7 +2627,7 @@ function detachedrun(request::HTTP.Request)
r = JSON.parse(String(HTTP.payload(request)))

if !haskey(r, "code")
return HTTP.Response(400, ["Content-Type"=>"application/json"], json(Dict("error"=>"Malformed body: JSON body must contain the key: code")); request)
return HTTP.Response(400, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>"Malformed body: JSON body must contain the key: code")); request)
end

exename = get(r, "exename", "julia")
Expand All @@ -2652,7 +2652,7 @@ function detachedrun(request::HTTP.Request)
end
end
if length(codelines) == 0
return HTTP.Response(400, ["Content-Type"=>"application/json"], json(Dict("error"=>"No code to execute, missing end?", "code"=>code)); request)
return HTTP.Response(400, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>"No code to execute, missing end?", "code"=>code)); request)
end

code = join(codelines, "\n")
Expand Down Expand Up @@ -2712,7 +2712,7 @@ function detachedrun(request::HTTP.Request)
catch e
io = IOBuffer()
logerror(e, Logging.Warn)
return HTTP.Response(500, ["Content-Type"=>"application/json"], json(Dict("error"=>String(take!(io)))); request)
return HTTP.Response(500, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>String(take!(io)))); request)
end

Threads.@spawn begin
Expand All @@ -2725,7 +2725,7 @@ function detachedrun(request::HTTP.Request)
rmproc(vm; session=sessionbundle(:management))
end
end
HTTP.Response(200, ["Content-Type"=>"application/json"], json(Dict("id"=>id, "pid"=>pid)); request)
HTTP.Response(200, ["Content-Type"=>"application/json"], JSON.json(Dict("id"=>id, "pid"=>pid)); request)
end

function detachedkill(request::HTTP.Request)
Expand Down Expand Up @@ -2778,9 +2778,9 @@ function detachedstatus(request::HTTP.Request)
status = "starting"
end
catch e
return HTTP.Response(500, ["Content-Type"=>"application/json"], json(Dict("error"=>show(e), "trace"=>show(stacktrace()))); request)
return HTTP.Response(500, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>show(e), "trace"=>show(stacktrace()))); request)
end
HTTP.Response(200, ["Content-Type"=>"application/json"], json(Dict("id"=>id, "status"=>status)); request)
HTTP.Response(200, ["Content-Type"=>"application/json"], JSON.json(Dict("id"=>id, "status"=>status)); request)
end

function detachedstdout(request::HTTP.Request)
Expand Down Expand Up @@ -2857,7 +2857,7 @@ function detachedwait(request::HTTP.Request)
end
write(io, "\n")

return HTTP.Response(400, ["Content-Type"=>"application/json"], json(Dict("error"=>String(take!(io)))); request)
return HTTP.Response(400, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>String(take!(io)))); request)
end
HTTP.Response(200, ["Content-Type"=>"application/text"], "OK, job $id is finished"; request)
end
Expand All @@ -2867,7 +2867,7 @@ function detachedping(request::HTTP.Request)
end

function detachedvminfo(request::HTTP.Request)
HTTP.Response(200, ["Content-Type"=>"application/json"], json(AzManagers.DETACHED_VM[]); request)
HTTP.Response(200, ["Content-Type"=>"application/json"], JSON.json(AzManagers.DETACHED_VM[]); request)
end

#
Expand Down Expand Up @@ -2974,7 +2974,7 @@ function addproc(vm_template::Dict, nic_template=nothing;
verbose,
"https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Network/networkInterfaces/$nicname?api-version=2022-09-01",
["Content-Type"=>"application/json", "Authorization"=>"Bearer $(token(session))"],
String(json(nic_template)))
String(JSON.json(nic_template)))

sleep(5)

Expand Down Expand Up @@ -3077,7 +3077,7 @@ function addproc(vm_template::Dict, nic_template=nothing;
verbose,
"https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Compute/virtualMachines/$vmname?api-version=2023-09-01",
["Content-Type"=>"application/json", "Authorization"=>"Bearer $(token(session))"],
String(json(vm_template["value"])))
String(JSON.json(vm_template["value"])))

spincount = 1
starttime = tic = time()
Expand Down Expand Up @@ -3398,7 +3398,7 @@ function detached_run(code, ip::String="", port=detached_port();
"POST",
"http://$(vm["ip"]):$(vm["port"])/cofii/detached/run",
["Content-Type"=>"application/json"],
json(body))
JSON.json(body))
r = JSON.parse(String(_r.body))

@info "detached job id is $(r["id"]) at $(vm["name"]),$(vm["ip"]):$(vm["port"])"
Expand Down
2 changes: 1 addition & 1 deletion src/templates.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function save_template(templates_filename::AbstractString, name::AbstractString,
if !ispath(templates_folder())
mkdir(templates_folder())
end
write(templates_filename, json(templates, 1))
write(templates_filename, JSON.json(templates, 1))
nothing
end

Expand Down
Loading