Skip to content

Commit 74b10bb

Browse files
cpuguy83cpuguy83
committed
Add support for health start interval
This is a new option in the docker API to set the interval health-checks are run during the start period. Signed-off-by: Brian Goff <[email protected]>
1 parent 2bfb8e6 commit 74b10bb

File tree

8 files changed

+639
-516
lines changed

8 files changed

+639
-516
lines changed

‎agent/exec/dockerapi/container.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,14 @@ func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig {
193193
interval, _ := gogotypes.DurationFromProto(hcSpec.Interval)
194194
timeout, _ := gogotypes.DurationFromProto(hcSpec.Timeout)
195195
startPeriod, _ := gogotypes.DurationFromProto(hcSpec.StartPeriod)
196+
startInterval, _ := gogotypes.DurationFromProto(hcSpec.StartInterval)
196197
return &enginecontainer.HealthConfig{
197-
Test: hcSpec.Test,
198-
Interval: interval,
199-
Timeout: timeout,
200-
Retries: int(hcSpec.Retries),
201-
StartPeriod: startPeriod,
198+
Test: hcSpec.Test,
199+
Interval: interval,
200+
Timeout: timeout,
201+
Retries: int(hcSpec.Retries),
202+
StartPeriod: startPeriod,
203+
StartInterval: startInterval,
202204
}
203205
}
204206

‎agent/exec/dockerapi/container_test.go

+12-10
Original file line numberDiff line numberDiff line change
@@ -115,23 +115,25 @@ func TestHealthcheck(t *testing.T) {
115115
Spec: api.TaskSpec{Runtime: &api.TaskSpec_Container{
116116
Container: &api.ContainerSpec{
117117
Healthcheck: &api.HealthConfig{
118-
Test: []string{"a", "b", "c"},
119-
Interval: gogotypes.DurationProto(time.Second),
120-
Timeout: gogotypes.DurationProto(time.Minute),
121-
Retries: 10,
122-
StartPeriod: gogotypes.DurationProto(time.Minute),
118+
Test: []string{"a", "b", "c"},
119+
Interval: gogotypes.DurationProto(time.Second),
120+
Timeout: gogotypes.DurationProto(time.Minute),
121+
Retries: 10,
122+
StartPeriod: gogotypes.DurationProto(time.Minute),
123+
StartInterval: gogotypes.DurationProto(time.Minute),
123124
},
124125
},
125126
}},
126127
},
127128
}
128129
config := c.config()
129130
expected := &enginecontainer.HealthConfig{
130-
Test: []string{"a", "b", "c"},
131-
Interval: time.Second,
132-
Timeout: time.Minute,
133-
Retries: 10,
134-
StartPeriod: time.Minute,
131+
Test: []string{"a", "b", "c"},
132+
Interval: time.Second,
133+
Timeout: time.Minute,
134+
Retries: 10,
135+
StartPeriod: time.Minute,
136+
StartInterval: time.Minute,
135137
}
136138
if !reflect.DeepEqual(config.Healthcheck, expected) {
137139
t.Fatalf("expected %#v, got %#v", expected, config.Healthcheck)

‎api/api.pb.txt

+48-10
Original file line numberDiff line numberDiff line change
@@ -2621,6 +2621,36 @@ file {
26212621
}
26222622
json_name: "nonrecursive"
26232623
}
2624+
field {
2625+
name: "createmountpoint"
2626+
number: 3
2627+
label: LABEL_OPTIONAL
2628+
type: TYPE_BOOL
2629+
options {
2630+
65004: "CreateMountpoint"
2631+
}
2632+
json_name: "createmountpoint"
2633+
}
2634+
field {
2635+
name: "readonlynonrecursive"
2636+
number: 4
2637+
label: LABEL_OPTIONAL
2638+
type: TYPE_BOOL
2639+
options {
2640+
65004: "ReadOnlyNonRecursive"
2641+
}
2642+
json_name: "readonlynonrecursive"
2643+
}
2644+
field {
2645+
name: "readonlyforcerecursive"
2646+
number: 5
2647+
label: LABEL_OPTIONAL
2648+
type: TYPE_BOOL
2649+
options {
2650+
65004: "ReadOnlyForceRecursive"
2651+
}
2652+
json_name: "readonlyforcerecursive"
2653+
}
26242654
enum_type {
26252655
name: "Propagation"
26262656
value {
@@ -2735,8 +2765,8 @@ file {
27352765
label: LABEL_OPTIONAL
27362766
type: TYPE_UINT32
27372767
options {
2738-
65001: 0
27392768
65003: "os.FileMode"
2769+
65001: 0
27402770
}
27412771
json_name: "mode"
27422772
}
@@ -2904,8 +2934,8 @@ file {
29042934
type: TYPE_MESSAGE
29052935
type_name: ".google.protobuf.Duration"
29062936
options {
2907-
65001: 0
29082937
65011: 1
2938+
65001: 0
29092939
}
29102940
json_name: "delay"
29112941
}
@@ -3348,8 +3378,8 @@ file {
33483378
}
33493379
}
33503380
options {
3351-
62001: 0
33523381
62023: "PublishMode"
3382+
62001: 0
33533383
}
33543384
}
33553385
}
@@ -4055,8 +4085,8 @@ file {
40554085
label: LABEL_OPTIONAL
40564086
type: TYPE_UINT32
40574087
options {
4058-
65001: 0
40594088
65003: "os.FileMode"
4089+
65001: 0
40604090
}
40614091
json_name: "mode"
40624092
}
@@ -4182,6 +4212,14 @@ file {
41824212
type_name: ".google.protobuf.Duration"
41834213
json_name: "startPeriod"
41844214
}
4215+
field {
4216+
name: "start_interval"
4217+
number: 6
4218+
label: LABEL_OPTIONAL
4219+
type: TYPE_MESSAGE
4220+
type_name: ".google.protobuf.Duration"
4221+
json_name: "startInterval"
4222+
}
41854223
}
41864224
message_type {
41874225
name: "MaybeEncryptedRecord"
@@ -5052,8 +5090,8 @@ file {
50525090
}
50535091
}
50545092
options {
5055-
62001: 0
50565093
62023: "NodeRole"
5094+
62001: 0
50575095
}
50585096
}
50595097
syntax: "proto3"
@@ -9739,8 +9777,8 @@ file {
97399777
type: TYPE_MESSAGE
97409778
type_name: ".google.protobuf.Duration"
97419779
options {
9742-
65001: 0
97439780
65011: 1
9781+
65001: 0
97449782
}
97459783
json_name: "period"
97469784
}
@@ -10958,14 +10996,14 @@ file {
1095810996
}
1095910997
}
1096010998
options {
10961-
63001: 0
10962-
63002: 0
1096310999
63017: 1
10964-
63018: 1
1096511000
63020: 1
11001+
63018: 1
11002+
63001: 0
11003+
63002: 0
11004+
63035: 0
1096611005
63026: 0
1096711006
63034: 0
10968-
63035: 0
1096911007
}
1097011008
}
1097111009
file {

0 commit comments

Comments
 (0)