Skip to content

Commit e9a2bb4

Browse files
authored
fix JuliaLang/julia#40337, no error info from serialized TaskFailedException (JuliaLang/julia#40395)
1 parent d94e168 commit e9a2bb4

File tree

2 files changed

+1
-25
lines changed

2 files changed

+1
-25
lines changed

src/clusterserialize.jl

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,6 @@ function serialize(s::ClusterSerializer, t::Core.TypeName)
102102
nothing
103103
end
104104

105-
function serialize(s::ClusterSerializer, t::Task)
106-
serialize_cycle(s, t) && return
107-
if istaskstarted(t) && !istaskdone(t)
108-
error("cannot serialize a running Task")
109-
end
110-
writetag(s.io, TASK_TAG)
111-
serialize(s, t.code)
112-
serialize(s, t.storage)
113-
serialize(s, t._state)
114-
serialize(s, t.result)
115-
serialize(s, t._isexception)
116-
end
117-
118105
function serialize(s::ClusterSerializer, g::GlobalRef)
119106
# Record if required and then invoke the default GlobalRef serializer.
120107
sym = g.name
@@ -244,17 +231,6 @@ function deserialize(s::ClusterSerializer, t::Type{<:CapturedException})
244231
return CapturedException(capex, bt)
245232
end
246233

247-
function deserialize(s::ClusterSerializer, ::Type{Task})
248-
t = Task(nothing)
249-
deserialize_cycle(s, t)
250-
t.code = deserialize(s)
251-
t.storage = deserialize(s)
252-
t._state = deserialize(s)::UInt8
253-
t.result = deserialize(s)
254-
t._isexception = deserialize(s)
255-
t
256-
end
257-
258234
"""
259235
clear!(syms, pids=workers(); mod=Main)
260236

test/distributed_exec.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ let e = @test_throws RemoteException pmap(1) do _
16751675
es = sprint(showerror, e.value)
16761676
@test contains(es, ":\nTaskFailedException\nStacktrace:\n")
16771677
@test contains(es, "\n\n nested task error:")
1678-
@test_broken contains(es, "\n\n nested task error: 42\n")
1678+
@test contains(es, "\n\n nested task error: 42\n")
16791679
end
16801680

16811681
# issue #27429, propagate relative `include` path to workers

0 commit comments

Comments
 (0)