feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

ceph: only set isUpgrade when the image changes

Browse Source 
The isUpgrade flag was being set every time the operator
was started. This caused the upgrade checks to be run every
time the operator restarted. Thus, if any mons were down,
you likely would get stuck on the upgrade checks since another
mon could not be stopped. We need to rely on the upgrade being
detected either by a different image name from the cluster CR
update, or from different versions of the daemons running
in case the operator was restarted in the middle of an upgrade.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
This commit is contained in:
Travis Nielsen
2019-12-17 10:57:26 -07:00
parent 29e5fae591
commit b79c223986
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/cluster/cluster.go
+2 -3
View File
@@ -379,7 +379,7 @@ func (c *cluster) checkSetOrchestrationStatus() bool {
}
// This function compare the Ceph spec image and the cluster running version
// It returns false if the image is different and true if identical
// It returns true if the image is different and false if identical
func diffImageSpecAndClusterRunningVersion(imageSpecVersion cephver.CephVersion, runningVersions client.CephDaemonsVersions) (bool, error) {
numberOfCephVersions := len(runningVersions.Overall)
if numberOfCephVersions == 0 {
@@ -403,10 +403,9 @@ func diffImageSpecAndClusterRunningVersion(imageSpecVersion cephver.CephVersion,
clusterRunningVersion := *version
// If this is the same version
// We return 'true' so that we restart using the Ceph checks
if cephver.IsIdentical(clusterRunningVersion, imageSpecVersion) {
logger.Debugf("both cluster and image spec versions are identical, doing nothing %s", imageSpecVersion.String())
return true, nil
return false, nil
}
if cephver.IsSuperior(imageSpecVersion, clusterRunningVersion) {
pkg/operator/ceph/cluster/cluster_test.go
+1 -1
View File
@@ -109,7 +109,7 @@ func TestDiffImageSpecAndClusterRunningVersion(t *testing.T) {
m, err = diffImageSpecAndClusterRunningVersion(fakeImageVersion, dummyRunningVersions5)
assert.NoError(t, err)
assert.True(t, m)
assert.False(t, m)
}
func TestMinVersion(t *testing.T) {
pkg/operator/ceph/cluster/controller.go
+3 -2
View File
@@ -624,6 +624,7 @@ func (c *ClusterController) onUpdate(oldObj, newObj interface{}) {
// Also we make sure there is actually an upgrade to perform
// It's not because the image spec changed that the ceph version did
// Someone could use the same Ceph version but with a different base OS content
cluster.isUpgrade = false
if versionChanged {
// we compare against cluster.Info.CephVersion since it received the new spec version earlier
// so don't get confused by the name of the function and its arguments
@@ -645,9 +646,9 @@ func (c *ClusterController) onUpdate(oldObj, newObj interface{}) {
return
}
}
// If Ceph is healthy let's start the upgrade!
cluster.isUpgrade = true
}
// If Ceph is healthy let's start the upgrade!
cluster.isUpgrade = true
} else {
logger.Infof("ceph daemons running versions are: %+v", runningVersions)
}