BUG/MEDIUM: server fall and rise options are not time but counters

Author: hdurand0710

configuration/server.go

@@ -414,7 +414,10 @@ func parseServerParams(serverOptions []params.ServerOption, serverParams *models
 					serverParams.ErrorLimit = c
 				}
 			case "fall":
-				serverParams.Fall = misc.ParseTimeout(v.Value)
+				f, err := strconv.ParseInt(v.Value, 10, 64)
+				if err == nil {
+					serverParams.Fall = &f
+				}
 			case "guid":
 				serverParams.GUID = v.Value
 			case "idle-ping":
@@ -492,7 +495,10 @@ func parseServerParams(serverOptions []params.ServerOption, serverParams *models
 			case "redir":
 				serverParams.Redir = v.Value
 			case "rise":
-				serverParams.Rise = misc.ParseTimeout(v.Value)
+				r, err := strconv.ParseInt(v.Value, 10, 64)
+				if err == nil {
+					serverParams.Rise = &r
+				}
 			case "resolve-opts":
 				serverParams.ResolveOpts = v.Value
 			case "resolve-prefer":

test/configuration_test.go

@@ -375,7 +375,7 @@ defaults unnamed_defaults_1
   timeout server-fin 1000
   timeout client-fin 1000
   timeout tarpit 2000
-  default-server fall 2s rise 4s inter 5s port 8888
+  default-server fall 2 rise 4 inter 5s port 8888
   default_backend test
   option external-check
   external-check path /bin
@@ -767,7 +767,7 @@ backend test # my comment
   option splice-response
   option http-restrict-req-hdr-names preserve
   option http-drop-request-trailers
-  default-server fall 2s rise 4s inter 5s port 8888 ws auto pool-low-conn 128 log-bufsize 6 force-sslv3
+  default-server fall 2 rise 4 inter 5s port 8888 ws auto pool-low-conn 128 log-bufsize 6 force-sslv3
   stick store-request src table test # my comment
   stick match src table test
   stick on src table test
@@ -891,7 +891,7 @@ backend test # my comment
 
 peers mycluster
   enabled
-  default-server fall 2s rise 4s inter 5s port 8888 slowstart 6000
+  default-server fall 2 rise 4 inter 5s port 8888 slowstart 6000
   default-bind v4v6 ssl crt /etc/haproxy/site.pem alpn h2,http/1.1
   peer hapee 192.168.1.1:1023 shard 1
   peer aggregator HARDCODEDCLUSTERIP:10023
@@ -1061,7 +1061,7 @@ backend test_2 from test_defaults_2 # {"comment": "my comment"}
   no option splice-auto
   no option splice-request
   no option splice-response
-  default-server fall 2s rise 4s inter 5s port 8888 slowstart 6000 no-tlsv10
+  default-server fall 2 rise 4 inter 5s port 8888 slowstart 6000 no-tlsv10
   option contstats
   timeout check 2s
   timeout tunnel 5s

test/expected/structured.json

@@ -522,12 +522,12 @@
                 "type": "rewrite"
             },
             "default_server": {
-                "fall": 2000,
+                "fall": 2,
                 "health_check_port": 8888,
                 "inter": 5000,
                 "log-bufsize": 6,
                 "pool_low_conn": 128,
-                "rise": 4000,
+                "rise": 4,
                 "ws": "auto",
                 "sslv3": "enabled",
                 "force_sslv3": "enabled"
@@ -1145,10 +1145,10 @@
                 "type": "rewrite"
             },
             "default_server": {
-                "fall": 2000,
+                "fall": 2,
                 "health_check_port": 8888,
                 "inter": 5000,
-                "rise": 4000,
+                "rise": 4,
                 "slowstart": 6000,
                 "tlsv10": "disabled",
                 "force_tlsv10": "disabled"
@@ -3398,10 +3398,10 @@
             "connect_timeout": 5000,
             "default_backend": "test",
             "default_server": {
-                "fall": 2000,
+                "fall": 2,
                 "health_check_port": 8888,
                 "inter": 5000,
-                "rise": 4000
+                "rise": 4
             },
             "disable_h2_upgrade": "enabled",
             "dontlog_normal": "enabled",
@@ -3536,10 +3536,10 @@
                 "v4v6": true
             },
             "default_server": {
-                "fall": 2000,
+                "fall": 2,
                 "health_check_port": 8888,
                 "inter": 5000,
-                "rise": 4000,
+                "rise": 4,
                 "slowstart": 6000
             },
             "enabled": true,