Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Revert "[18.09 backport] API: fix status code on conflicting service names"#142

Merged
thaJeztah merged 1 commit into
18.09from
revert-130-18.09_backport_fix_api_return_code
Dec 28, 2018
Merged

Revert "[18.09 backport] API: fix status code on conflicting service names"#142
thaJeztah merged 1 commit into
18.09from
revert-130-18.09_backport_fix_api_return_code

Conversation

@mavenugo
Copy link
Copy Markdown

Reverts #130

Unfortunately, since the Client library doesn't return the status code, the applications that rely on the error messages (though not a good idea), will be broken. Though this is a good fix, it will cause regression in a minor release and hence reverting the changes.

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown

@seemethere seemethere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a DCO,

git commit --amend -s --no-edit && git push -f

…names"

Signed-off-by: Madhu Venugopal <madhu@docker.com>
@mavenugo mavenugo force-pushed the revert-130-18.09_backport_fix_api_return_code branch from 84728b1 to 24f71e3 Compare December 28, 2018 17:43
@mavenugo
Copy link
Copy Markdown
Author

@seemethere updated.

@thaJeztah
Copy link
Copy Markdown
Member

PowerPC failure is a known flaky test, and unrelated (tracked through moby#32673)

19:18:52 FAIL: docker_api_swarm_test.go:296: DockerSwarmSuite.TestAPISwarmLeaderElection
19:18:52 
19:18:52 [d141db34c59d6] waiting for daemon to start
19:18:52 [d141db34c59d6] daemon started
19:18:52 
19:18:52 [df95cbf6f8fa0] waiting for daemon to start
19:18:52 [df95cbf6f8fa0] daemon started
19:18:52 
19:18:52 [d69c6bb98cc01] waiting for daemon to start
19:18:52 [d69c6bb98cc01] daemon started
19:18:52 
19:18:52 [d141db34c59d6] exiting daemon
19:18:52 assertion failed: error is not nil: Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded
19:18:52 [df95cbf6f8fa0] exiting daemon
19:18:52 [d69c6bb98cc01] exiting daemon

@thaJeztah thaJeztah dismissed seemethere’s stale review December 28, 2018 20:49

DCO sign-off was fixed

@thaJeztah thaJeztah merged commit ce8b8f1 into 18.09 Dec 28, 2018
@thaJeztah thaJeztah deleted the revert-130-18.09_backport_fix_api_return_code branch December 28, 2018 20:50
@thaJeztah
Copy link
Copy Markdown
Member

Follow-up; moby/swarmkit#2797

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants