fix: should fail fast when etcd returns error (#128)

Author: Yiyiyimu

lib/resty/etcd/v3.lua

@@ -81,6 +81,7 @@ local function _request_uri(self, endpoint, method, uri, opts, timeout, ignore_a
     if err then
         if health_check.conf ~= nil then
             health_check.report_failure(endpoint.http_host)
+            err = endpoint.http_host .. ": " .. err
         end
         return nil, err
     end
@@ -604,7 +605,7 @@ local function request_chunk(self, endpoint, method, scheme, host, port, path, o
         if health_check.conf ~= nil then
             health_check.report_failure(endpoint.http_host)
         end
-        return nil, err
+        return nil, endpoint.http_host .. ": " .. err
     end
 
     local res
@@ -647,9 +648,10 @@ local function request_chunk(self, endpoint, method, scheme, host, port, path, o
             if health_check.conf ~= nil then
                 health_check.report_failure(endpoint.http_host)
             end
+            return nil, endpoint.http_host .. ": " .. body.error.http_status
         end
 
-        if body.result.events then
+        if body.result and body.result.events then
             for _, event in ipairs(body.result.events) do
                 if event.kv.value then   -- DELETE not have value
                     event.kv.value = decode_base64(event.kv.value or "")

t/v3/auth.t

@@ -64,7 +64,7 @@ __DATA__
                 password = 'abc123',
                 timeout = 3,
                 http_host = {
-                    "http://127.0.0.1:12379", 
+                    "http://127.0.0.1:12379",
                 },
             })
             check_res(etcd, err)
@@ -118,7 +118,7 @@ uri: http://127.0.0.1:12379/v3/kv/deleterange, timeout: 3
                 password = '123',
                 timeout = 3,
                 http_host = {
-                    "http://127.0.0.1:12379", 
+                    "http://127.0.0.1:12379",
                 },
             })
             check_res(etcd, err)

t/v3/health_check.t

@@ -134,7 +134,7 @@ failed to get ngx.shared dict: error_shm_name
 
 
 
-=== TEST 4: trigger unhealthy
+=== TEST 4: trigger unhealthy with set
 --- http_config eval: $::HttpConfig
 --- config
     location /t {
@@ -157,19 +157,54 @@ failed to get ngx.shared dict: error_shm_name
             })
 
             local res, err = etcd:set("/trigger_unhealthy", { a='abc'})
-            ngx.say("done")
+            ngx.say(err)
         }
     }
 --- request
 GET /t
 --- error_log eval
 qr/update endpoint: http:\/\/127.0.0.1:42379 to unhealthy/
 --- response_body
-done
+http://127.0.0.1:42379: connection refused
+
+
+
+=== TEST 5: trigger unhealthy with watch
+--- http_config eval: $::HttpConfig
+--- config
+    location /t {
+        content_by_lua_block {
+            local health_check, err = require "resty.etcd.health_check" .init({
+                shm_name = "etcd_cluster_health_check",
+                fail_timeout = 10,
+                max_fails = 1,
+            })
+
+            local etcd, err = require "resty.etcd" .new({
+                protocol = "v3",
+                http_host = {
+                    "http://127.0.0.1:42379",
+                    "http://127.0.0.1:22379",
+                    "http://127.0.0.1:32379",
+                },
+            })
+
+            local body_chunk_fun, err = etcd:watch("/trigger_unhealthy")
+            if not body_chunk_fun then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- error_log eval
+qr/update endpoint: http:\/\/127.0.0.1:42379 to unhealthy/
+--- response_body
+http://127.0.0.1:42379: connection refused
 
 
 
-=== TEST 5: fault count
+=== TEST 6: fault count
 --- http_config eval: $::HttpConfig
 --- config
     location /t {
@@ -209,7 +244,7 @@ GET /t
 
 
 
-=== TEST 6: check endpoint is healthy
+=== TEST 7: check endpoint is healthy
 --- http_config eval: $::HttpConfig
 --- config
     location /t {
@@ -246,7 +281,7 @@ false
 
 
 
-=== TEST 7: make sure `fail_timeout` works
+=== TEST 8: make sure `fail_timeout` works
 --- http_config eval: $::HttpConfig
 --- config
     location /t {
@@ -293,7 +328,7 @@ done
 
 
 
-=== TEST 8: has no healthy etcd endpoint, directly return an error message
+=== TEST 9: has no healthy etcd endpoint, directly return an error message
 --- http_config eval: $::HttpConfig
 --- config
     location /t {
@@ -334,7 +369,7 @@ qr/has no healthy etcd endpoint available/
 
 
 
-=== TEST 9: `health_check` shared by different etcd clients
+=== TEST 10: `health_check` shared by different etcd clients
 --- http_config eval: $::HttpConfig
 --- config
     location /t {
@@ -383,7 +418,7 @@ qr/update endpoint: http:\/\/127.0.0.1:42379 to unhealthy/
 
 
 
-=== TEST 10: mock etcd error and report fault
+=== TEST 11: mock etcd error and report fault
 --- http_config eval: $::HttpConfig
 --- config
     location /v3/auth/authenticate {