Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions haproxy/dataplane/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,16 @@ func (t *tnx) ReplaceServer(beName string, srv models.Server) error {
}

func (c *Dataplane) ReplaceServer(beName string, srv models.Server) error {
err := c.makeReq(http.MethodPut, fmt.Sprintf("/v1/services/haproxy/configuration/servers/%s?backend=%s&version=%d", srv.Name, beName, c.version), srv, nil)
v, err := c.ConfigVersion()
if err != nil {
return err
}

err = c.makeReq(http.MethodPut, fmt.Sprintf("/v1/services/haproxy/configuration/servers/%s?backend=%s&version=%d", srv.Name, beName, v), srv, nil)
if err != nil {
return err
}

c.version++
return nil
}

Expand Down
24 changes: 19 additions & 5 deletions haproxy/dataplane/dataplane.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ type Dataplane struct {
userName, password string
client *http.Client
lock sync.Mutex
version int
}

func New(addr, userName, password string, client *http.Client) *Dataplane {
Expand All @@ -28,7 +27,6 @@ func New(addr, userName, password string, client *http.Client) *Dataplane {
userName: userName,
password: password,
client: client,
version: 1,
}
}

Expand All @@ -49,8 +47,13 @@ func (t *tnx) ensureTnx() error {
if t.txID != "" {
return nil
}
v, err := t.client.ConfigVersion()
if err != nil {
return err
}

res := models.Transaction{}
err := t.client.makeReq(http.MethodPost, fmt.Sprintf("/v1/services/haproxy/transactions?version=%d", t.client.version), nil, &res)
err = t.client.makeReq(http.MethodPost, fmt.Sprintf("/v1/services/haproxy/transactions?version=%d", v), nil, &res)
if err != nil {
return err
}
Expand All @@ -69,6 +72,19 @@ func (c *Dataplane) Info() (*models.ProcessInfo, error) {
return res, nil
}

func (c *Dataplane) ConfigVersion() (int, error) {
var res struct {
Version int `json:"_version"`
}
err := c.makeReq(http.MethodGet, "/v1/services/haproxy/configuration/frontends", nil, &res)
if err != nil {
return 0, err
}
log.Debugf("dataplane version is %d", res.Version)

return res.Version, nil
}

func (c *Dataplane) Ping() error {
return c.makeReq(http.MethodGet, "/v1/specification", nil, nil)
}
Expand All @@ -84,8 +100,6 @@ func (t *tnx) Commit() error {
if err != nil {
return err
}

t.client.version++
}

for _, f := range t.after {
Expand Down