Skip to content

Add slow-start to upstream server #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 19, 2018
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
1 change: 1 addition & 0 deletions client/nginx_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ type UpstreamServer struct {
Server string `json:"server"`
MaxFails int64 `json:"max_fails"`
FailTimeout string `json:"fail_timeout,omitempty"`
SlowStart string `json:"slow_start,omitempty"`
}

type apiErrorResponse struct {
Expand Down
38 changes: 37 additions & 1 deletion tests/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func TestClient(t *testing.T) {
// test updating servers
servers1 := []client.UpstreamServer{
client.UpstreamServer{
Server: "127.0.0.2:8001",
Server: "127.0.0.2:8001",
},
client.UpstreamServer{
Server: "127.0.0.2:8002",
Expand Down Expand Up @@ -163,6 +163,42 @@ func TestClient(t *testing.T) {
t.Errorf("The number of servers %v != 0", len(servers))
}
}
// Test adding the slow_start property on an upstream server
func TestUpstreamServerSlowStart(t *testing.T) {
httpClient := &http.Client{}
c, err := client.NewNginxClient(httpClient, "http://127.0.0.1:8080/api")
if err != nil {
t.Fatalf("Error connecting to nginx: %v", err)
}

// Add a server with slow_start
// (And FailTimeout, since the default is 10s)
server := client.UpstreamServer{
Server: "127.0.0.1:2000",
SlowStart: "11s",
FailTimeout: "10s",
}
err = c.AddHTTPServer(upstream, server)
if err != nil {
t.Errorf("Error adding upstream server: %v", err)
}
servers, err := c.GetHTTPServers(upstream)
if len(servers) != 1 {
t.Errorf("Too many servers")
}
// don't compare IDs
servers[0].ID = 0

if !reflect.DeepEqual(server, servers[0]) {
t.Errorf("Expected: %v Got: %v", server, servers[0])
}

// remove upstream servers
_, _, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{})
if err != nil {
t.Errorf("Couldn't remove servers: %v", err)
}
}

func compareUpstreamServers(x []client.UpstreamServer, y []client.UpstreamServer) bool {
var xServers []string
Expand Down