Merge pull request #3142 from cpuguy83/health_start_interval

Add support for health start interval
moby · Jul 13, 2023 · bc71908 · bc71908
2 parents 6f78b81 + 74b10bb
commit bc71908
Show file tree

Hide file tree

Showing 8 changed files with 639 additions and 516 deletions.
diff --git a/agent/exec/dockerapi/container.go b/agent/exec/dockerapi/container.go
@@ -193,12 +193,14 @@ func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig {
 	interval, _ := gogotypes.DurationFromProto(hcSpec.Interval)
 	timeout, _ := gogotypes.DurationFromProto(hcSpec.Timeout)
 	startPeriod, _ := gogotypes.DurationFromProto(hcSpec.StartPeriod)
+	startInterval, _ := gogotypes.DurationFromProto(hcSpec.StartInterval)
 	return &enginecontainer.HealthConfig{
-		Test:        hcSpec.Test,
-		Interval:    interval,
-		Timeout:     timeout,
-		Retries:     int(hcSpec.Retries),
-		StartPeriod: startPeriod,
+		Test:          hcSpec.Test,
+		Interval:      interval,
+		Timeout:       timeout,
+		Retries:       int(hcSpec.Retries),
+		StartPeriod:   startPeriod,
+		StartInterval: startInterval,
 	}
 }
 

diff --git a/agent/exec/dockerapi/container_test.go b/agent/exec/dockerapi/container_test.go
@@ -115,23 +115,25 @@ func TestHealthcheck(t *testing.T) {
 			Spec: api.TaskSpec{Runtime: &api.TaskSpec_Container{
 				Container: &api.ContainerSpec{
 					Healthcheck: &api.HealthConfig{
-						Test:        []string{"a", "b", "c"},
-						Interval:    gogotypes.DurationProto(time.Second),
-						Timeout:     gogotypes.DurationProto(time.Minute),
-						Retries:     10,
-						StartPeriod: gogotypes.DurationProto(time.Minute),
+						Test:          []string{"a", "b", "c"},
+						Interval:      gogotypes.DurationProto(time.Second),
+						Timeout:       gogotypes.DurationProto(time.Minute),
+						Retries:       10,
+						StartPeriod:   gogotypes.DurationProto(time.Minute),
+						StartInterval: gogotypes.DurationProto(time.Minute),
 					},
 				},
 			}},
 		},
 	}
 	config := c.config()
 	expected := &enginecontainer.HealthConfig{
-		Test:        []string{"a", "b", "c"},
-		Interval:    time.Second,
-		Timeout:     time.Minute,
-		Retries:     10,
-		StartPeriod: time.Minute,
+		Test:          []string{"a", "b", "c"},
+		Interval:      time.Second,
+		Timeout:       time.Minute,
+		Retries:       10,
+		StartPeriod:   time.Minute,
+		StartInterval: time.Minute,
 	}
 	if !reflect.DeepEqual(config.Healthcheck, expected) {
 		t.Fatalf("expected %#v, got %#v", expected, config.Healthcheck)

diff --git a/api/api.pb.txt b/api/api.pb.txt
@@ -2621,6 +2621,36 @@ file {
         }
         json_name: "nonrecursive"
       }
+      field {
+        name: "createmountpoint"
+        number: 3
+        label: LABEL_OPTIONAL
+        type: TYPE_BOOL
+        options {
+          65004: "CreateMountpoint"
+        }
+        json_name: "createmountpoint"
+      }
+      field {
+        name: "readonlynonrecursive"
+        number: 4
+        label: LABEL_OPTIONAL
+        type: TYPE_BOOL
+        options {
+          65004: "ReadOnlyNonRecursive"
+        }
+        json_name: "readonlynonrecursive"
+      }
+      field {
+        name: "readonlyforcerecursive"
+        number: 5
+        label: LABEL_OPTIONAL
+        type: TYPE_BOOL
+        options {
+          65004: "ReadOnlyForceRecursive"
+        }
+        json_name: "readonlyforcerecursive"
+      }
       enum_type {
         name: "Propagation"
         value {
@@ -2735,8 +2765,8 @@ file {
         label: LABEL_OPTIONAL
         type: TYPE_UINT32
         options {
-          65001: 0
           65003: "os.FileMode"
+          65001: 0
         }
         json_name: "mode"
       }
@@ -2904,8 +2934,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65001: 0
         65011: 1
+        65001: 0
       }
       json_name: "delay"
     }
@@ -3348,8 +3378,8 @@ file {
         }
       }
       options {
-        62001: 0
         62023: "PublishMode"
+        62001: 0
       }
     }
   }
@@ -4055,8 +4085,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_UINT32
       options {
-        65001: 0
         65003: "os.FileMode"
+        65001: 0
       }
       json_name: "mode"
     }
@@ -4182,6 +4212,14 @@ file {
       type_name: ".google.protobuf.Duration"
       json_name: "startPeriod"
     }
+    field {
+      name: "start_interval"
+      number: 6
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".google.protobuf.Duration"
+      json_name: "startInterval"
+    }
   }
   message_type {
     name: "MaybeEncryptedRecord"
@@ -5052,8 +5090,8 @@ file {
       }
     }
     options {
-      62001: 0
       62023: "NodeRole"
+      62001: 0
     }
   }
   syntax: "proto3"
@@ -9739,8 +9777,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65001: 0
         65011: 1
+        65001: 0
       }
       json_name: "period"
     }
@@ -10958,14 +10996,14 @@ file {
     }
   }
   options {
-    63001: 0
-    63002: 0
     63017: 1
-    63018: 1
     63020: 1
+    63018: 1
+    63001: 0
+    63002: 0
+    63035: 0
     63026: 0
     63034: 0
-    63035: 0
   }
 }
 file {