Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

fix bug: ReadTopologyInstanceBufferable can not return error when crash #1034

Merged
merged 3 commits into from
Jan 8, 2020
Merged

fix bug: ReadTopologyInstanceBufferable can not return error when crash #1034

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4dfd4f
fix bug: ReadTopologyInstanceBufferable can not return error when crash
Dec 7, 2019
9050cd1
Merge branch 'master' into master
yangeagle Dec 10, 2019
8d7a69e
Merge branch 'master' into master
Jan 8, 2020
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
6 changes: 3 additions & 3 deletions go/inst/instance_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,10 @@ func expectReplicationThreadsState(instanceKey *InstanceKey, expectedState Repli
// It writes the information retrieved into orchestrator's backend.
// - writes are optionally buffered.
// - timing information can be collected for the stages performed.
func ReadTopologyInstanceBufferable(instanceKey *InstanceKey, bufferWrites bool, latency *stopwatch.NamedStopwatch) (*Instance, error) {
func ReadTopologyInstanceBufferable(instanceKey *InstanceKey, bufferWrites bool, latency *stopwatch.NamedStopwatch) (inst *Instance, err error) {
defer func() {
if err := recover(); err != nil {
logReadTopologyInstanceError(instanceKey, "Unexpected, aborting", fmt.Errorf("%+v", err))
if r := recover(); r != nil {
err = logReadTopologyInstanceError(instanceKey, "Unexpected, aborting", fmt.Errorf("%+v", r))
}
}()

Expand Down