docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1729 from dongluochen/errHandlingCompatibility 

Ignore 404 error from old engine versions
This commit is contained in:
Alexandre Beslic 2016-02-02 10:16:59 -08:00
parent 58baa9ea29 388b8fd50f
commit 76d0171319
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/engine.go
View File

@ -280,7 +280,7 @@ func (e *Engine) ValidationComplete() {
func (e *Engine) setErrMsg(errMsg string) { func (e *Engine) setErrMsg(errMsg string) {
e.Lock() e.Lock()
defer e.Unlock() defer e.Unlock()
e.lastError = errMsg e.lastError = strings.TrimSpace(errMsg)
e.updatedAt = time.Now() e.updatedAt = time.Now()
} }
@ -342,9 +342,6 @@ func (e *Engine) CheckConnectionErr(err error) {
return return
} }
// update engine error message
e.setErrMsg(err.Error())
// dockerclient defines ErrConnectionRefused error. but if http client is from swarm, it's not using // dockerclient defines ErrConnectionRefused error. but if http client is from swarm, it's not using
// dockerclient. We need string matching for these cases. Remove the first character to deal with // dockerclient. We need string matching for these cases. Remove the first character to deal with
// case sensitive issue // case sensitive issue
@ -357,6 +354,8 @@ func (e *Engine) CheckConnectionErr(err error) {
// can track last error time. Only increase failure count if last error is // can track last error time. Only increase failure count if last error is
// not too recent, e.g., last error is at least 1 seconds ago. // not too recent, e.g., last error is at least 1 seconds ago.
e.incFailureCount() e.incFailureCount()
// update engine error message
e.setErrMsg(err.Error())
return return
} }
// other errors may be ambiguous. // other errors may be ambiguous.

5
cluster/engine_test.go
View File

@ -69,6 +69,11 @@ func TestCheckConnectionErr(t *testing.T) {
engine.CheckConnectionErr(err) engine.CheckConnectionErr(err)
assert.True(t, engine.failureCount == 0) assert.True(t, engine.failureCount == 0)
assert.True(t, len(engine.ErrMsg()) == 0) assert.True(t, len(engine.ErrMsg()) == 0)
// Do not accept random error
err = fmt.Errorf("random error")
engine.CheckConnectionErr(err)
assert.True(t, engine.failureCount == 0)
assert.True(t, len(engine.ErrMsg()) == 0)
} }
func TestEngineFailureCount(t *testing.T) { func TestEngineFailureCount(t *testing.T) {