check: stop checking when protocol not supported

This commit is contained in:
nadoo committed 2020-11-26 19:21:27 +08:00
1 parent 6820644073
commit 98ce20b295
9 files changed
+69 -122

No files matched your search

+26 -70
View File
@@ -2,18 +2,20 @@ package rule
import (
"bytes"
"errors"
"fmt"
"io"
"os"
"os/exec"
"time"
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy"
)
// Checker is a forwarder health checker.
type Checker interface {
Check(fwdr *Forwarder) (healthy bool)
Check(dialer proxy.Dialer) (elap time.Duration, err error)
}
type tcpChecker struct {
@@ -25,34 +27,16 @@ func newTcpChecker(addr string, timeout time.Duration) *tcpChecker {
return &tcpChecker{addr, timeout}
}
func (c *tcpChecker) Check(fwdr *Forwarder) bool {
// Check implements the Checker interface.
func (c *tcpChecker) Check(dialer proxy.Dialer) (time.Duration, error) {
startTime := time.Now()
rc, err := fwdr.Dial("tcp", c.addr)
rc, err := dialer.Dial("tcp", c.addr)
if err != nil {
log.F("[check] tcp:%s(%d), FAILED. error in dial: %s", fwdr.Addr(), fwdr.Priority(), err)
fwdr.Disable()
return false
return 0, err
}
defer rc.Close()
if c.timeout > 0 {
rc.SetDeadline(time.Now().Add(c.timeout))
}
elapsed := time.Since(startTime)
fwdr.SetLatency(int64(elapsed))
if elapsed > c.timeout {
log.F("[check] tcp:%s(%d), FAILED. check timeout: %s", fwdr.Addr(), fwdr.Priority(), elapsed)
fwdr.Disable()
return false
}
log.F("[check] tcp:%s(%d), SUCCESS. elapsed: %s", fwdr.Addr(), fwdr.Priority(), elapsed)
fwdr.Enable()
return true
return time.Since(startTime), nil
}
type httpChecker struct {
@@ -66,13 +50,12 @@ func newHttpChecker(addr, uri, expect string, timeout time.Duration) *httpChecke
return &httpChecker{addr, uri, expect, timeout}
}
func (c *httpChecker) Check(fwdr *Forwarder) bool {
// Check implements the Checker interface.
func (c *httpChecker) Check(dialer proxy.Dialer) (time.Duration, error) {
startTime := time.Now()
rc, err := fwdr.Dial("tcp", c.addr)
rc, err := dialer.Dial("tcp", c.addr)
if err != nil {
log.F("[check] %s(%d) -> http://%s, FAILED. error in dial: %s", fwdr.Addr(), fwdr.Priority(), c.addr, err)
fwdr.Disable()
return false
return 0, err
}
defer rc.Close()
@@ -80,11 +63,9 @@ func (c *httpChecker) Check(fwdr *Forwarder) bool {
rc.SetDeadline(time.Now().Add(c.timeout))
}
_, err = io.WriteString(rc, "GET "+c.uri+" HTTP/1.1\r\nHost:"+c.addr+"\r\nConnection: close"+"\r\n\r\n")
if err != nil {
log.F("[check] %s(%d) -> http://%s, FAILED. error in write: %s", fwdr.Addr(), fwdr.Priority(), c.addr, err)
fwdr.Disable()
return false
if _, err = io.WriteString(rc,
"GET "+c.uri+" HTTP/1.1\r\nHost:"+c.addr+"\r\nConnection: close"+"\r\n\r\n"); err != nil {
return 0, err
}
r := pool.GetBufReader(rc)
@@ -92,55 +73,30 @@ func (c *httpChecker) Check(fwdr *Forwarder) bool {
line, _, err := r.ReadLine()
if err != nil {
log.F("[check] %s(%d) -> http://%s, FAILED. error in read: %s", fwdr.Addr(), fwdr.Priority(), c.addr, err)
fwdr.Disable()
return false
return 0, err
}
if !bytes.Contains(line, []byte(c.expect)) {
log.F("[check] %s(%d) -> http://%s, FAILED. expect: %s, server response: %s", fwdr.Addr(), fwdr.Priority(), c.addr, c.expect, line)
fwdr.Disable()
return false
return 0, fmt.Errorf("expect: %s, got: %s", c.expect, line)
}
elapsed := time.Since(startTime)
fwdr.SetLatency(int64(elapsed))
if elapsed > c.timeout {
log.F("[check] %s(%d) -> http://%s, FAILED. check timeout: %s", fwdr.Addr(), fwdr.Priority(), c.addr, elapsed)
fwdr.Disable()
return false
return elapsed, errors.New("timeout")
}
log.F("[check] %s(%d) -> http://%s, SUCCESS. elapsed: %s", fwdr.Addr(), fwdr.Priority(), c.addr, elapsed)
fwdr.Enable()
return true
return elapsed, nil
}
type fileChecker struct {
path string
}
type fileChecker struct{ path string }
func newFileChecker(path string) *fileChecker {
return &fileChecker{path}
}
func newFileChecker(path string) *fileChecker { return &fileChecker{path} }
func (c *fileChecker) Check(fwdr *Forwarder) bool {
// Check implements the Checker interface.
func (c *fileChecker) Check(dialer proxy.Dialer) (time.Duration, error) {
cmd := exec.Command(c.path)
cmd.Stdout = os.Stdout
cmd.Env = os.Environ()
cmd.Env = append(cmd.Env, "FORWARDER_ADDR="+fwdr.Addr())
err := cmd.Run()
if err != nil {
log.F("[check] file:%s(%d), FAILED. err: %s", fwdr.Addr(), fwdr.Priority(), err)
fwdr.Disable()
return false
}
log.F("[check] file:%s(%d), SUCCESS.", fwdr.Addr(), fwdr.Priority())
fwdr.Enable()
return true
cmd.Env = append(cmd.Env, "FORWARDER_ADDR="+dialer.Addr())
return 0, cmd.Run()
}
+3 -2
View File
@@ -119,9 +119,10 @@ func (f *Forwarder) IncFailures() {
return
}
log.F("[forwarder] %s recorded %d failures, maxfailures: %d", f.addr, failures, f.MaxFailures())
// log.F("[forwarder] %s(%d) recorded %d failures, maxfailures: %d", f.addr, f.Priority(), failures, f.MaxFailures())
if failures >= f.MaxFailures() && f.Enabled() {
if failures == f.MaxFailures() && f.Enabled() {
log.F("[forwarder] %s(%d) reaches maxfailures: %d", f.addr, f.Priority(), f.MaxFailures())
f.Disable()
}
}
+25 -16
View File
@@ -1,6 +1,7 @@
package rule
import (
"errors"
"hash/fnv"
"net"
"net/url"
@@ -176,7 +177,6 @@ func (p *FwdrGroup) onStatusChanged(fwdr *Forwarder) {
// Check runs the forwarder checks.
func (p *FwdrGroup) Check() {
if len(p.fwdrs) == 1 {
p.config.MaxFailures = 0
log.F("[group] only 1 forwarder found, disable health checking")
return
}
@@ -212,17 +212,18 @@ func (p *FwdrGroup) Check() {
case "file":
checker = newFileChecker(u.Host + u.Path)
default:
p.config.MaxFailures = 0
log.F("[group] invalid check config `%s`, disable health checking", p.config.Check)
return
}
log.F("[group] using check config: %s", p.config.Check)
for i := 0; i < len(p.fwdrs); i++ {
go p.check(p.fwdrs[i], checker)
}
}
func (p *FwdrGroup) check(f *Forwarder, checker Checker) {
func (p *FwdrGroup) check(fwdr *Forwarder, checker Checker) {
wait := uint8(0)
intval := time.Duration(p.config.CheckInterval) * time.Second
@@ -230,27 +231,35 @@ func (p *FwdrGroup) check(f *Forwarder, checker Checker) {
time.Sleep(intval * time.Duration(wait))
// check all forwarders at least one time
if wait > 0 && (f.Priority() < p.Priority()) {
if wait > 0 && (fwdr.Priority() < p.Priority()) {
continue
}
if f.Enabled() && p.config.CheckDisabledOnly {
if fwdr.Enabled() && p.config.CheckDisabledOnly {
continue
}
if checker.Check(f) {
wait = 1
continue
elapsed, err := checker.Check(fwdr)
if err != nil {
if errors.Is(err, proxy.ErrNotSupported) {
fwdr.SetMaxFailures(0)
log.F("[check] %s(%d), %s, stop checking", fwdr.Addr(), fwdr.Priority(), err)
break
}
wait++
if wait > 16 {
wait = 16
}
log.F("[check] %s(%d), FAILED. error: %s", fwdr.Addr(), fwdr.Priority(), err)
fwdr.Disable()
}
if wait == 0 {
wait = 1
}
wait *= 2
if wait > 16 {
wait = 16
}
wait = 1
fwdr.Enable()
fwdr.SetLatency(int64(elapsed))
log.F("[check] %s(%d), SUCCESS. elapsed: %s", fwdr.Addr(), fwdr.Priority(), elapsed)
}
}
+1 -1
View File
@@ -45,7 +45,7 @@ func NewProxy(mainForwarders []string, mainStrategy *Strategy, rules []*Config)
if len(mainForwarders) > 0 {
direct := NewFwdrGroup("", nil, mainStrategy)
for _, f := range rd.main.fwdrs {
host := strings.Split(f.addr, ":")[0]
host, _, _ := net.SplitHostPort(f.addr)
if ip := net.ParseIP(host); ip == nil {
rd.domainMap.Store(strings.ToLower(host), direct)
}