MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-04 02:15:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

admin: Set Config returns errSet and errMsg (#3822)

Browse Source 
There is no way to see if a node encountered an error
when trying to set a new config set, this commit adds
a bool errSet field.
This commit is contained in:
Anis Elleuch 2017-03-03 11:53:48 +01:00 committed by Harshavardhana
parent 32d0d3d4ac
commit cddc684559
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/admin-handlers.go
View File

@ -718,9 +718,11 @@ func toAdminAPIErrCode(err error) APIErrorCode {
// SetConfigResult - represents detailed results of a set-config
// operation.
type nodeSummary struct {
Name string `json:"name"`
Err string `json:"err"`
Name string `json:"name"`
ErrSet bool `json:"errSet"`
ErrMsg string `json:"errMsg"`
}
type setConfigResult struct {
NodeResults []nodeSummary `json:"nodeResults"`
Status bool `json:"status"`
@ -733,8 +735,9 @@ func writeSetConfigResponse(w http.ResponseWriter, peers adminPeers, errs []erro
// set-config operation.
for i := range errs {
nodeResults = append(nodeResults, nodeSummary{
Name: peers[i].addr,
Err: fmt.Sprintf("%v", errs[i]),
Name: peers[i].addr,
ErrSet: errs[i] != nil,
ErrMsg: fmt.Sprintf("%v", errs[i]),
})
}

10
cmd/admin-handlers_test.go
View File

@ -1279,9 +1279,13 @@ func TestWriteSetConfigResponse(t *testing.T) {
if res.Name != testPeers[p].addr {
t.Errorf("Test %d: Expected node name %s but received %s", i+1, testPeers[p].addr, res.Name)
}
expectedErrStr := fmt.Sprintf("%v", test.errs[p])
if res.Err != expectedErrStr {
t.Errorf("Test %d: Expected error %s but received %s", i+1, expectedErrStr, res.Err)
expectedErrMsg := fmt.Sprintf("%v", test.errs[p])
if res.ErrMsg != expectedErrMsg {
t.Errorf("Test %d: Expected error %s but received %s", i+1, expectedErrMsg, res.ErrMsg)
}
expectedErrSet := test.errs[p] != nil
if res.ErrSet != expectedErrSet {
t.Errorf("Test %d: Expected ErrSet %v but received %v", i+1, expectedErrSet, res.ErrSet)
}
}
}

3
pkg/madmin/API.md
View File

@ -330,7 +330,8 @@ change to take effect.
|---|---|---|
|`st.Status` | _bool_ | true if set-config succeeded, false otherwise. |
|`st.NodeSummary.Name` | _string_ | Network address of the node. |
|`st.NodeSummary.Err` | _string_ | String representation of the error (if any) on the node.|
|`st.NodeSummary.ErrSet` | _bool_ | Bool representation indicating if an error is encountered with the node.|
|`st.NodeSummary.ErrMsg` | _string_ | String representation of the error (if any) on the node.|
__Example__

5
pkg/madmin/config-commands.go
View File

@ -33,8 +33,9 @@ const (
// NodeSummary - represents the result of an operation part of
// set-config on a node.
type NodeSummary struct {
Name string `json:"name"`
Err string `json:"err"`
Name string `json:"name"`
ErrSet bool `json:"errSet"`
ErrMsg string `json:"errMsg"`
}
// SetConfigResult - represents detailed results of a set-config