public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding more patroni fields. Added example result.

This commit is contained in:
Jan Mußler 2021-02-22 23:48:27 +01:00
parent 57af48d525
commit 3e0a5d03a9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/util/patroni/patroni.go
View File

@ -73,7 +73,9 @@ func (p *Patroni) httpPostOrPatch(method string, url string, body *bytes.Buffer)
return fmt.Errorf("could not create request: %v", err) return fmt.Errorf("could not create request: %v", err)
} }
p.logger.Debugf("making %s http request: %s", method, request.URL.String()) if p.logger != nil {
p.logger.Debugf("making %s http request: %s", method, request.URL.String())
}
resp, err := p.httpClient.Do(request) resp, err := p.httpClient.Do(request)
if err != nil { if err != nil {
@ -139,10 +141,12 @@ type MemberDataPatroni struct {
// MemberData Patroni member data from Patroni API // MemberData Patroni member data from Patroni API
type MemberData struct { type MemberData struct {
State string `json:"state"` State string `json:"state"`
Role string `json:"role"` Role string `json:"role"`
ServerVersion int `json:"server_version"` ServerVersion int `json:"server_version"`
Patroni MemberDataPatroni `json:"patroni"` PendingRestart string `json:"pending_restart"`
ClusterUnlocked bool `json:"cluster_unlocked"`
Patroni MemberDataPatroni `json:"patroni"`
} }
// GetMemberData read member data from patroni API // GetMemberData read member data from patroni API

2
pkg/util/patroni/patroni_test.go
View File

@ -84,7 +84,7 @@ func TestPatroniAPI(t *testing.T) {
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
json := `{"name":"Test Name","full_name":"test full name","owner":{"login": "octocat"}}` json := `{"state": "running", "postmaster_start_time": "2021-02-19 14:31:50.053 CET", "role": "master", "server_version": 90621, "cluster_unlocked": false, "xlog": {"location": 55978296057856}, "timeline": 6, "database_system_identifier": "6462555844314089962", "pending_restart": true, "patroni": {"version": "2.0.1", "scope": "acid-rest92-standby"}}`
r := ioutil.NopCloser(bytes.NewReader([]byte(json))) r := ioutil.NopCloser(bytes.NewReader([]byte(json)))
response := http.Response{ response := http.Response{