Merge lp:~jameinel/juju-core/desiredversion-not-newer-1304340 into lp:~go-bot/juju-core/trunk
| Status: | Merged |
|---|---|
| Approved by: | John A Meinel |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2592 |
| Proposed branch: | lp:~jameinel/juju-core/desiredversion-not-newer-1304340 |
| Merge into: | lp:~go-bot/juju-core/trunk |
| Diff against target: |
156 lines (+87/-2) 3 files modified
state/apiserver/upgrader/upgrader.go (+28/-1) state/apiserver/upgrader/upgrader_test.go (+56/-0) worker/upgrader/upgrader_test.go (+3/-1) |
| To merge this branch: | bzr merge lp:~jameinel/juju-core/desiredversion-not-newer-1304340 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Commit message
state/apiserver
This addresses bug #1304340. It gives us a step along the path of having
Manager nodes (API Servers) upgrade themselves before we have all the
other machine agents upgrade (before we have the Unit agents upgrade).
We already had the last two steps. This isn't 100% reliable in HA
circumstances, because we aren't waiting for *all* nodes to be upgraded.
We could potentially change the check so it was just if DesiredVersion
!= CurrentVersion (rather than >= CurrentVersion). It also doesn't probe
the database unless there is an upgrade pending, so DesiredVersion
should still be cheap. This doesn't change FindTools, but it doesn't
seem like it needs to. (All places that call FindTools first call
DesiredVersion, because we broke stuff in the past when we didn't have
API Credentials in time.)
Also, this falls back to returning version.Current rather than returning
the version of the machine/unit/etc had recorded in State. I'm not sure
if that is worth implementing, but when we do the DB lookup to find out
if this entity.IsManager() we could grab its current version.
Description of the change
state/apiserver
This addresses bug #1304340. It gives us a step along the path of having
Manager nodes (API Servers) upgrade themselves before we have all the
other machine agents upgrade (before we have the Unit agents upgrade).
We already had the last two steps. This isn't 100% reliable in HA
circumstances, because we aren't waiting for *all* nodes to be upgraded.
We could potentially change the check so it was just if DesiredVersion
!= CurrentVersion (rather than >= CurrentVersion). It also doesn't probe
the database unless there is an upgrade pending, so DesiredVersion
should still be cheap. This doesn't change FindTools, but it doesn't
seem like it needs to. (All places that call FindTools first call
DesiredVersion, because we broke stuff in the past when we didn't have
API Credentials in time.)
Also, this falls back to returning version.Current rather than returning
the version of the machine/unit/etc had recorded in State. I'm not sure
if that is worth implementing, but when we do the DB lookup to find out
if this entity.IsManager() we could grab its current version.
| John A Meinel (jameinel) wrote | # |
| William Reade (fwereade) wrote | # |
| Go Bot (go-bot) wrote | # |
| Go Bot (go-bot) wrote | # |
| Go Bot (go-bot) wrote | # |
Reviewers: mp+214743_
Message:
Please take a look.
Description:
state/apiserver
This addresses bug #1304340. It gives us a step along the path of having
Manager nodes (API Servers) upgrade themselves before we have all the
other machine agents upgrade (before we have the Unit agents upgrade).
We already had the last two steps. This isn't 100% reliable in HA
circumstances, because we aren't waiting for *all* nodes to be upgraded.
We could potentially change the check so it was just if DesiredVersion
!= CurrentVersion (rather than >= CurrentVersion). It also doesn't probe
the database unless there is an upgrade pending, so DesiredVersion
should still be cheap. This doesn't change FindTools, but it doesn't
seem like it needs to. (All places that call FindTools first call
DesiredVersion, because we broke stuff in the past when we didn't have
API Credentials in time.)
Also, this falls back to returning version.Current rather than returning
the version of the machine/unit/etc had recorded in State. I'm not sure
if that is worth implementing, but when we do the DB lookup to find out
if this entity.IsManager() we could grab its current version.
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files (+86, -1 lines):
A [revision details]
M state/apiserver
M state/apiserver
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: state/apiserver
=== modified file 'state/
--- state/apiserver
+++ state/apiserver
@@ -6,6 +6,8 @@
import (
"errors"
+ "github.
+
"launchpad.
"launchpad.
"launchpad.
@@ -14,6 +16,8 @@
"launchpad.
)
+var logger = loggo.GetLogger
+
type Upgrader interface {
WatchAPIVers
DesiredVersi
@@ -91,6 +95,22 @@
return agentVersion, cfg, nil
}
+type hasIsManager interface {
+ IsManager() bool
+}
+
+func (u *UpgraderAPI) entityIsManager(tag string) bool {
+ entity, err := u.st.FindEntity
+ if err != nil {
+ return false
+ }
+ if m, ok := entity.
+ return false
+ } else {
+ return m.IsManager()
+ }
+}
+
// DesiredVersion reports the Agent Version that we want that agent to be
running
func (u *UpgraderAPI) DesiredVersion(args params.Entities)
(params.
results := make([]
@@ -101...