From ce0228d50a380018677f5bad0ee15f662f764cad Mon Sep 17 00:00:00 2001 From: "Scott G. Miller" Date: Mon, 27 Apr 2020 12:08:05 -0500 Subject: [PATCH 1/2] Handle request errors during raft snapshot --- api/sys_raft.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/sys_raft.go b/api/sys_raft.go index 908a3c4f1131..4a6ca5ae6fd2 100644 --- a/api/sys_raft.go +++ b/api/sys_raft.go @@ -92,6 +92,11 @@ func (c *Sys) RaftSnapshot(snapWriter io.Writer) error { // to determine if the body contains error message. var result *Response resp, err := c.c.config.HttpClient.Do(req) + + if err != nil { + return err + } + if resp == nil { return nil } From 9eb89f1a6e8727a252404fb7af96d27e1847e189 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Mon, 27 Apr 2020 12:23:04 -0500 Subject: [PATCH 2/2] Update api/sys_raft.go Co-Authored-By: Brian Kassouf --- api/sys_raft.go | 1 - 1 file changed, 1 deletion(-) diff --git a/api/sys_raft.go b/api/sys_raft.go index 4a6ca5ae6fd2..1a8aa1176b63 100644 --- a/api/sys_raft.go +++ b/api/sys_raft.go @@ -92,7 +92,6 @@ func (c *Sys) RaftSnapshot(snapWriter io.Writer) error { // to determine if the body contains error message. var result *Response resp, err := c.c.config.HttpClient.Do(req) - if err != nil { return err }