Skip to content

Commit 8eeed9e

Browse files
danehlimdanehlim
committed
Move container instance health doctor to ecs-agent/
1 parent 81ca75a commit 8eeed9e

33 files changed

+1476
-35
lines changed

‎agent/acs/handler/acs_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
rolecredentials "github.com/aws/amazon-ecs-agent/agent/credentials"
3232
"github.com/aws/amazon-ecs-agent/agent/data"
3333
"github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi"
34-
"github.com/aws/amazon-ecs-agent/agent/doctor"
3534
"github.com/aws/amazon-ecs-agent/agent/engine"
3635
"github.com/aws/amazon-ecs-agent/agent/engine/dockerstate"
3736
"github.com/aws/amazon-ecs-agent/agent/eventhandler"
@@ -40,6 +39,7 @@ import (
4039
"github.com/aws/amazon-ecs-agent/agent/utils/ttime"
4140
"github.com/aws/amazon-ecs-agent/agent/version"
4241
"github.com/aws/amazon-ecs-agent/agent/wsclient"
42+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
4343

4444
"github.com/aws/aws-sdk-go/aws/credentials"
4545
"github.com/cihub/seelog"

‎agent/acs/handler/acs_handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
mock_credentials "github.com/aws/amazon-ecs-agent/agent/credentials/mocks"
4040
"github.com/aws/amazon-ecs-agent/agent/data"
4141
mock_dockerapi "github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi/mocks"
42-
"github.com/aws/amazon-ecs-agent/agent/doctor"
4342
"github.com/aws/amazon-ecs-agent/agent/engine/dockerstate"
4443
mock_engine "github.com/aws/amazon-ecs-agent/agent/engine/mocks"
4544
"github.com/aws/amazon-ecs-agent/agent/eventhandler"
@@ -49,6 +48,7 @@ import (
4948
"github.com/aws/amazon-ecs-agent/agent/version"
5049
"github.com/aws/amazon-ecs-agent/agent/wsclient"
5150
mock_wsclient "github.com/aws/amazon-ecs-agent/agent/wsclient/mock"
51+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
5252

5353
"github.com/aws/aws-sdk-go/aws"
5454
"github.com/aws/aws-sdk-go/aws/credentials"

‎agent/acs/handler/heartbeat_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
package handler
1515

1616
import (
17-
"github.com/aws/amazon-ecs-agent/agent/doctor"
1817
"github.com/aws/amazon-ecs-agent/agent/wsclient"
1918
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
19+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
2020
"github.com/aws/aws-sdk-go/aws"
2121
"github.com/cihub/seelog"
2222
)

‎agent/acs/handler/heartbeat_handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package handler
1919
import (
2020
"testing"
2121

22-
"github.com/aws/amazon-ecs-agent/agent/doctor"
2322
mock_wsclient "github.com/aws/amazon-ecs-agent/agent/wsclient/mock"
2423
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
24+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
2525

2626
"github.com/aws/aws-sdk-go/aws"
2727
"github.com/golang/mock/gomock"

‎agent/app/agent.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ import (
2323
"github.com/aws/amazon-ecs-agent/agent/logger"
2424
"github.com/aws/amazon-ecs-agent/agent/logger/field"
2525

26-
"github.com/aws/amazon-ecs-agent/agent/doctor"
26+
dockerdoctor "github.com/aws/amazon-ecs-agent/agent/doctor"
2727
"github.com/aws/amazon-ecs-agent/agent/eni/watcher"
28+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
2829
"github.com/aws/aws-sdk-go/aws/awserr"
2930

3031
"github.com/aws/amazon-ecs-agent/agent/credentials/instancecreds"
@@ -588,7 +589,7 @@ func (agent *ecsAgent) initMetricsEngine() {
588589
// the healthchecks that the doctor should be running
589590
func (agent *ecsAgent) newDoctorWithHealthchecks(cluster, containerInstanceARN string) (*doctor.Doctor, error) {
590591
// configure the required healthchecks
591-
runtimeHealthCheck := doctor.NewDockerRuntimeHealthcheck(agent.dockerClient)
592+
runtimeHealthCheck := dockerdoctor.NewDockerRuntimeHealthcheck(agent.dockerClient)
592593

593594
// put the healthechecks in a list
594595
healthcheckList := []doctor.Healthcheck{

‎agent/doctor/docker_runtime_healthcheck.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"time"
2020

2121
"github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi"
22+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
2223
"github.com/cihub/seelog"
2324
)
2425

@@ -28,14 +29,14 @@ type dockerRuntimeHealthcheck struct {
2829
// HealthcheckType is the reported healthcheck type
2930
HealthcheckType string `json:"HealthcheckType,omitempty"`
3031
// Status is the container health status
31-
Status HealthcheckStatus `json:"HealthcheckStatus,omitempty"`
32+
Status doctor.HealthcheckStatus `json:"HealthcheckStatus,omitempty"`
3233
// Timestamp is the timestamp when container health status changed
3334
TimeStamp time.Time `json:"TimeStamp,omitempty"`
3435
// StatusChangeTime is the latest time the health status changed
3536
StatusChangeTime time.Time `json:"StatusChangeTime,omitempty"`
3637

3738
// LastStatus is the last container health status
38-
LastStatus HealthcheckStatus `json:"LastStatus,omitempty"`
39+
LastStatus doctor.HealthcheckStatus `json:"LastStatus,omitempty"`
3940
// LastTimeStamp is the timestamp of last container health status
4041
LastTimeStamp time.Time `json:"LastTimeStamp,omitempty"`
4142

@@ -46,27 +47,27 @@ type dockerRuntimeHealthcheck struct {
4647
func NewDockerRuntimeHealthcheck(client dockerapi.DockerClient) *dockerRuntimeHealthcheck {
4748
nowTime := time.Now()
4849
return &dockerRuntimeHealthcheck{
49-
HealthcheckType: HealthcheckTypeContainerRuntime,
50-
Status: HealthcheckStatusInitializing,
50+
HealthcheckType: doctor.HealthcheckTypeContainerRuntime,
51+
Status: doctor.HealthcheckStatusInitializing,
5152
TimeStamp: nowTime,
5253
StatusChangeTime: nowTime,
5354
client: client,
5455
}
5556
}
5657

57-
func (dhc *dockerRuntimeHealthcheck) RunCheck() HealthcheckStatus {
58+
func (dhc *dockerRuntimeHealthcheck) RunCheck() doctor.HealthcheckStatus {
5859
// TODO pass in context as an argument
5960
res := dhc.client.SystemPing(context.TODO(), systemPingTimeout)
60-
resultStatus := HealthcheckStatusOk
61+
resultStatus := doctor.HealthcheckStatusOk
6162
if res.Error != nil {
6263
seelog.Infof("[DockerRuntimeHealthcheck] Docker Ping failed with error: %v", res.Error)
63-
resultStatus = HealthcheckStatusImpaired
64+
resultStatus = doctor.HealthcheckStatusImpaired
6465
}
6566
dhc.SetHealthcheckStatus(resultStatus)
6667
return resultStatus
6768
}
6869

69-
func (dhc *dockerRuntimeHealthcheck) SetHealthcheckStatus(healthStatus HealthcheckStatus) {
70+
func (dhc *dockerRuntimeHealthcheck) SetHealthcheckStatus(healthStatus doctor.HealthcheckStatus) {
7071
dhc.lock.Lock()
7172
defer dhc.lock.Unlock()
7273
nowTime := time.Now()
@@ -89,7 +90,7 @@ func (dhc *dockerRuntimeHealthcheck) GetHealthcheckType() string {
8990
return dhc.HealthcheckType
9091
}
9192

92-
func (dhc *dockerRuntimeHealthcheck) GetHealthcheckStatus() HealthcheckStatus {
93+
func (dhc *dockerRuntimeHealthcheck) GetHealthcheckStatus() doctor.HealthcheckStatus {
9394
dhc.lock.RLock()
9495
defer dhc.lock.RUnlock()
9596
return dhc.Status
@@ -107,7 +108,7 @@ func (dhc *dockerRuntimeHealthcheck) GetStatusChangeTime() time.Time {
107108
return dhc.StatusChangeTime
108109
}
109110

110-
func (dhc *dockerRuntimeHealthcheck) GetLastHealthcheckStatus() HealthcheckStatus {
111+
func (dhc *dockerRuntimeHealthcheck) GetLastHealthcheckStatus() doctor.HealthcheckStatus {
111112
dhc.lock.RLock()
112113
defer dhc.lock.RUnlock()
113114
return dhc.LastStatus

‎agent/doctor/docker_runtime_healthcheck_test.go

+15-14
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi"
88
mock_dockerapi "github.com/aws/amazon-ecs-agent/agent/dockerclient/dockerapi/mocks"
9+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
910
"github.com/docker/docker/api/types"
1011
"github.com/golang/mock/gomock"
1112
"github.com/stretchr/testify/assert"
@@ -16,33 +17,33 @@ func TestNewDockerRuntimeHealthCheck(t *testing.T) {
1617
defer ctrl.Finish()
1718
mockDockerClient := mock_dockerapi.NewMockDockerClient(ctrl)
1819
dockerRuntimeHealthCheck := NewDockerRuntimeHealthcheck(mockDockerClient)
19-
assert.Equal(t, HealthcheckStatusInitializing, dockerRuntimeHealthCheck.Status)
20+
assert.Equal(t, doctor.HealthcheckStatusInitializing, dockerRuntimeHealthCheck.Status)
2021
}
2122

2223
func TestRunCheck(t *testing.T) {
2324
testcases := []struct {
2425
name string
2526
dockerPingResponse *dockerapi.PingResponse
26-
expectedStatus HealthcheckStatus
27-
expectedLastStatus HealthcheckStatus
27+
expectedStatus doctor.HealthcheckStatus
28+
expectedLastStatus doctor.HealthcheckStatus
2829
}{
2930
{
3031
name: "empty checks",
3132
dockerPingResponse: &dockerapi.PingResponse{
3233
Response: &types.Ping{APIVersion: "test_api_version"},
3334
Error: nil,
3435
},
35-
expectedStatus: HealthcheckStatusOk,
36-
expectedLastStatus: HealthcheckStatusInitializing,
36+
expectedStatus: doctor.HealthcheckStatusOk,
37+
expectedLastStatus: doctor.HealthcheckStatusInitializing,
3738
},
3839
{
3940
name: "all true checks",
4041
dockerPingResponse: &dockerapi.PingResponse{
4142
Response: nil,
4243
Error: &dockerapi.DockerTimeoutError{},
4344
},
44-
expectedStatus: HealthcheckStatusImpaired,
45-
expectedLastStatus: HealthcheckStatusInitializing,
45+
expectedStatus: doctor.HealthcheckStatusImpaired,
46+
expectedLastStatus: doctor.HealthcheckStatusInitializing,
4647
},
4748
}
4849
ctrl := gomock.NewController(t)
@@ -66,9 +67,9 @@ func TestSetHealthCheckStatus(t *testing.T) {
6667
defer ctrl.Finish()
6768
dockerClient := mock_dockerapi.NewMockDockerClient(ctrl)
6869
dockerRuntimeHealthCheck := NewDockerRuntimeHealthcheck(dockerClient)
69-
healthCheckStatus := HealthcheckStatusOk
70+
healthCheckStatus := doctor.HealthcheckStatusOk
7071
dockerRuntimeHealthCheck.SetHealthcheckStatus(healthCheckStatus)
71-
assert.Equal(t, HealthcheckStatusOk, dockerRuntimeHealthCheck.Status)
72+
assert.Equal(t, doctor.HealthcheckStatusOk, dockerRuntimeHealthCheck.Status)
7273
}
7374

7475
func TestSetHealthcheckStatusChange(t *testing.T) {
@@ -78,21 +79,21 @@ func TestSetHealthcheckStatusChange(t *testing.T) {
7879
dockerRuntimeHealthcheck := NewDockerRuntimeHealthcheck(dockerClient)
7980

8081
// we should start in initializing status
81-
assert.Equal(t, HealthcheckStatusInitializing, dockerRuntimeHealthcheck.Status)
82+
assert.Equal(t, doctor.HealthcheckStatusInitializing, dockerRuntimeHealthcheck.Status)
8283
initializationChangeTime := dockerRuntimeHealthcheck.GetStatusChangeTime()
8384

8485
// we update to initializing again; our StatusChangeTime remains the same
85-
dockerRuntimeHealthcheck.SetHealthcheckStatus(HealthcheckStatusInitializing)
86+
dockerRuntimeHealthcheck.SetHealthcheckStatus(doctor.HealthcheckStatusInitializing)
8687
updateChangeTime := dockerRuntimeHealthcheck.GetStatusChangeTime()
87-
assert.Equal(t, HealthcheckStatusInitializing, dockerRuntimeHealthcheck.Status)
88+
assert.Equal(t, doctor.HealthcheckStatusInitializing, dockerRuntimeHealthcheck.Status)
8889
assert.Equal(t, initializationChangeTime, updateChangeTime)
8990

9091
// add a sleep so we know time has elapsed between the initial status and status change time
9192
time.Sleep(1 * time.Millisecond)
9293

9394
// change status. This should change the update time too
94-
dockerRuntimeHealthcheck.SetHealthcheckStatus(HealthcheckStatusOk)
95-
assert.Equal(t, HealthcheckStatusOk, dockerRuntimeHealthcheck.Status)
95+
dockerRuntimeHealthcheck.SetHealthcheckStatus(doctor.HealthcheckStatusOk)
96+
assert.Equal(t, doctor.HealthcheckStatusOk, dockerRuntimeHealthcheck.Status)
9697
okChangeTime := dockerRuntimeHealthcheck.GetStatusChangeTime()
9798
// have we updated our change time?
9899
assert.True(t, okChangeTime.After(initializationChangeTime))

‎agent/tcs/client/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"time"
2323

2424
"github.com/aws/amazon-ecs-agent/agent/config"
25-
"github.com/aws/amazon-ecs-agent/agent/doctor"
2625
"github.com/aws/amazon-ecs-agent/agent/stats"
2726
"github.com/aws/amazon-ecs-agent/agent/tcs/model/ecstcs"
2827
"github.com/aws/amazon-ecs-agent/agent/utils"
2928
"github.com/aws/amazon-ecs-agent/agent/wsclient"
29+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
3030
"github.com/aws/aws-sdk-go/aws"
3131
"github.com/aws/aws-sdk-go/aws/credentials"
3232
"github.com/aws/aws-sdk-go/private/protocol/json/jsonutil"

‎agent/tcs/client/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import (
3131
"time"
3232

3333
"github.com/aws/amazon-ecs-agent/agent/config"
34-
"github.com/aws/amazon-ecs-agent/agent/doctor"
3534
"github.com/aws/amazon-ecs-agent/agent/stats"
3635
mock_stats "github.com/aws/amazon-ecs-agent/agent/stats/mock"
3736
"github.com/aws/amazon-ecs-agent/agent/tcs/model/ecstcs"
3837
"github.com/aws/amazon-ecs-agent/agent/wsclient"
3938
mock_wsconn "github.com/aws/amazon-ecs-agent/agent/wsclient/wsconn/mock"
39+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
4040

4141
"github.com/aws/aws-sdk-go/aws"
4242
"github.com/aws/aws-sdk-go/aws/credentials"

‎agent/tcs/handler/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"time"
2222

2323
"github.com/aws/amazon-ecs-agent/agent/config"
24-
"github.com/aws/amazon-ecs-agent/agent/doctor"
2524
"github.com/aws/amazon-ecs-agent/agent/engine"
2625
"github.com/aws/amazon-ecs-agent/agent/eventstream"
2726
"github.com/aws/amazon-ecs-agent/agent/stats"
@@ -30,6 +29,7 @@ import (
3029
"github.com/aws/amazon-ecs-agent/agent/utils/retry"
3130
"github.com/aws/amazon-ecs-agent/agent/version"
3231
"github.com/aws/amazon-ecs-agent/agent/wsclient"
32+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
3333
"github.com/aws/aws-sdk-go/aws/credentials"
3434
"github.com/cihub/seelog"
3535
)

‎agent/tcs/handler/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131

3232
mock_api "github.com/aws/amazon-ecs-agent/agent/api/mocks"
3333
"github.com/aws/amazon-ecs-agent/agent/config"
34-
"github.com/aws/amazon-ecs-agent/agent/doctor"
3534
mock_engine "github.com/aws/amazon-ecs-agent/agent/engine/mocks"
3635
"github.com/aws/amazon-ecs-agent/agent/eventstream"
3736
"github.com/aws/amazon-ecs-agent/agent/stats"
@@ -40,6 +39,7 @@ import (
4039
"github.com/aws/amazon-ecs-agent/agent/version"
4140
"github.com/aws/amazon-ecs-agent/agent/wsclient"
4241
wsmock "github.com/aws/amazon-ecs-agent/agent/wsclient/mock/utils"
42+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
4343
"github.com/aws/aws-sdk-go/aws/credentials"
4444
"github.com/docker/docker/api/types"
4545
"github.com/golang/mock/gomock"

‎agent/tcs/handler/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919

2020
"github.com/aws/amazon-ecs-agent/agent/api"
2121
"github.com/aws/amazon-ecs-agent/agent/config"
22-
"github.com/aws/amazon-ecs-agent/agent/doctor"
2322
"github.com/aws/amazon-ecs-agent/agent/engine"
2423
"github.com/aws/amazon-ecs-agent/agent/eventstream"
2524
"github.com/aws/amazon-ecs-agent/agent/stats"
2625
"github.com/aws/amazon-ecs-agent/agent/utils/ttime"
26+
"github.com/aws/amazon-ecs-agent/ecs-agent/doctor"
2727
"github.com/aws/aws-sdk-go/aws/credentials"
2828
"github.com/pkg/errors"
2929
)

0 commit comments

Comments
 (0)