fix: make cpuquota, MemorySwappiness validation compatible with docker

refactor: logCreateOption before validation, it enable developer to see what's wrong.

Signed-off-by: zhuangqh <zhuangqhc@gmail.com>

apis/server/container_bridge.go

@@ -38,13 +38,14 @@ func (s *Server) createContainer(ctx context.Context, rw http.ResponseWriter, re
  if err := json.NewDecoder(reader).Decode(config); err != nil {
  return httputils.NewHTTPError(err, http.StatusBadRequest)
  }
+
+ logCreateOptions("container", config)
+
  // validate request body
  if err := config.Validate(strfmt.NewFormats()); err != nil {
  return httputils.NewHTTPError(err, http.StatusBadRequest)
  }
 
- logCreateOptions("container", config)
-
  name := req.FormValue("name")
  //consider set specific id by url params
  specificID := req.FormValue("specificId")

apis/server/exec_bridge.go

@@ -24,15 +24,15 @@ func (s *Server) createContainerExec(ctx context.Context, rw http.ResponseWriter
  if err := json.NewDecoder(req.Body).Decode(config); err != nil {
  return httputils.NewHTTPError(err, http.StatusBadRequest)
  }
+ name := mux.Vars(req)["name"]
+
+ logCreateOptions("container exec for "+name, config)
+
  // validate request body
  if err := config.Validate(strfmt.NewFormats()); err != nil {
  return httputils.NewHTTPError(err, http.StatusBadRequest)
  }
 
- name := mux.Vars(req)["name"]
-
- logCreateOptions("container exec for "+name, config)
-
  id, err := s.ContainerMgr.CreateExec(ctx, name, config)
  if err != nil {
  return err

apis/server/network_bridge.go

@@ -20,13 +20,14 @@ func (s *Server) createNetwork(ctx context.Context, rw http.ResponseWriter, req
  if err := json.NewDecoder(req.Body).Decode(config); err != nil {
  return httputils.NewHTTPError(err, http.StatusBadRequest)
  }
+
+ logCreateOptions("network", config)
+
  // validate request body
  if err := config.Validate(strfmt.NewFormats()); err != nil {
  return httputils.NewHTTPError(err, http.StatusBadRequest)
  }
 
- logCreateOptions("network", config)
-
  network, err := s.NetworkMgr.Create(ctx, *config)
  if err != nil {
  return err

apis/server/volume_bridge.go

@@ -20,13 +20,14 @@ func (s *Server) createVolume(ctx context.Context, rw http.ResponseWriter, req *
  if err := json.NewDecoder(req.Body).Decode(config); err != nil {
  return httputils.NewHTTPError(err, http.StatusBadRequest)
  }
+
+ logCreateOptions("volume", config)
+
  // validate request body
  if err := config.Validate(strfmt.NewFormats()); err != nil {
  return httputils.NewHTTPError(err, http.StatusBadRequest)
  }
 
- logCreateOptions("volume", config)
-
  name := config.Name
  driver := config.Driver
  options := config.DriverOpts

apis/swagger.yml

@@ -2598,7 +2598,6 @@ definitions:
  Microseconds of CPU time that the container can get in a CPU period."
  type: "integer"
  format: "int64"
- minimum: 1000
  x-nullable: false
  x-omitempty: false
  CpuRealtimePeriod:
@@ -2663,7 +2662,7 @@ definitions:
  description: "Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100."
  type: "integer"
  format: "int64"
- minimum: 0
+ minimum: -1
  maximum: 100
  x-omitempty: false
  NanoCpus:

test/cli_run_memory_test.go

@@ -115,7 +115,7 @@ func (suite *PouchRunMemorySuite) TestRunWithMemoryswappiness(c *check.C) {
  "--memory-swappiness", "-1",
  "--name", cname, busyboxImage, "top")
  DelContainerForceMultyTime(c, cname)
- c.Assert(res.ExitCode, check.Equals, 1)
+ c.Assert(res.ExitCode, check.Equals, 0)
 
  cname = "TestRunWithMemoryswappiness"
  memory := "100m"