apiserver: ALWAYS return apiserver.UpgradeInProgress #4629
Conversation
| @@ -527,7 +527,7 @@ func (s *loginSuite) TestLoginValidationDuringUpgrade(c *gc.C) { | |||
| c.Assert(err, jc.ErrorIsNil) | |||
|
|
|||
| err = st.APICall("Client", 1, "", "DestroyModel", nil, nil) | |||
| c.Assert(err, gc.ErrorMatches, ".*upgrade in progress - Juju functionality is limited.*") | |||
| c.Assert(errors.Cause(err), gc.DeepEquals, &rpc.RequestError{Message: "upgrade in progress", Code: ""}) | |||
There was a problem hiding this comment.
This still isn't right, the Code should be "upgrade in progress", not the message. But at least it's coming in an rpc.RequestError.
|
Please hold off on merging this until after we ship beta2 (should be in the next day or so). |
|
Will do, that'll give me more time for manual testing. On Wed, Mar 9, 2016 at 4:02 AM, Cheryl Jennings notifications@github.com
|
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Tests failed |
Always, _always_, return apiserver.UpgradeInProgress if there is an upgrade in progress.
UpgradeInProgressError used to be defined in apiserver/admin.go and used in apiserver/upgrading_root.go. __BUT__, the logic that turns errors into rpc messages is inside apiserver/common/error.go. This creates a potential import loop as apiserver already imports common, so common cannot import apiserver to get a type. So, to ~~solve~~ workaround this clusterfuck, we move UpgradeInProgressError to apiserver/params, which everyone imports and solve the import loop. This is _SHIT_. apiserver and apiserver/common are clearly the same package, thay cannot function without each other and have been bifurcated for reasons that no longer make sense. Once this PR is landed, I will merge the two packages and then we can define, and use UpgradeInProgressError in _one_ place, and then we can also unexport it because things should not be checking for it explicitly on that apiserver side of the blood/brain RPC layer.
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
apiserver: ALWAYS return apiserver.UpgradeInProgress Always, _always_, return apiserver.UpgradeInProgress if there is an upgrade in progress. (Review request: http://reviews.vapour.ws/r/4070/)
Always, always, return apiserver.UpgradeInProgress if there is an
upgrade in progress.
(Review request: http://reviews.vapour.ws/r/4070/)