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

Merge pull request #3438 from SUSE/fix-merge-bug-in-master

Browse Source 
Ceph: Fix crit bug in call to detect Ceph version
This commit is contained in:
Blaine Gardner
2019-07-11 17:02:17 -06:00
committed by GitHub
parent c2225ce453 cc359b6d6b
commit 582fe014e4
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/cluster/controller.go
+10 -9
View File
@@ -49,12 +49,13 @@ import (
)
const (
crushConfigMapName = "rook-crush-config"
crushmapCreatedKey = "initialCrushMapCreated"
clusterCreateInterval = 6 * time.Second
clusterCreateTimeout = 60 * time.Minute
updateClusterInterval = 30 * time.Second
updateClusterTimeout = 1 * time.Hour
crushConfigMapName = "rook-crush-config"
crushmapCreatedKey = "initialCrushMapCreated"
clusterCreateInterval = 6 * time.Second
clusterCreateTimeout = 60 * time.Minute
updateClusterInterval = 30 * time.Second
updateClusterTimeout = 1 * time.Hour
detectCephVersionTimeout = 15 * time.Minute
)
const (
@@ -283,7 +284,7 @@ func (c *ClusterController) onAdd(obj interface{}) {
// Start the Rook cluster components. Retry several times in case of failure.
validOrchestration := true
err = wait.Poll(clusterCreateInterval, clusterCreateTimeout, func() (bool, error) {
cephVersion, err := cluster.detectCephVersion(c.rookImage, cluster.Spec.CephVersion.Image, 15*time.Minute)
cephVersion, err := cluster.detectCephVersion(c.rookImage, cluster.Spec.CephVersion.Image, detectCephVersionTimeout)
if err != nil {
logger.Errorf("unknown ceph major version. %+v", err)
return false, nil
@@ -496,7 +497,7 @@ func (c *ClusterController) onUpdate(oldObj, newObj interface{}) {
// if the image changed, we need to detect the new image version
if oldClust.Spec.CephVersion.Image != newClust.Spec.CephVersion.Image {
logger.Infof("the ceph version changed. detecting the new image version...")
version, err := cluster.detectCephVersion(c.rookImage, newClust.Spec.CephVersion.Image, 15*time.Minute)
version, err := cluster.detectCephVersion(c.rookImage, newClust.Spec.CephVersion.Image, detectCephVersionTimeout)
if err != nil {
logger.Errorf("unknown ceph major version. %+v", err)
return
@@ -516,7 +517,7 @@ func (c *ClusterController) onUpdate(oldObj, newObj interface{}) {
}
// Re-setting cluster version too since LoadClusterInfo does not load it
version, err := cluster.detectCephVersion(newClust.Spec.CephVersion.Image, 15*time.Minute)
version, err := cluster.detectCephVersion(c.rookImage, newClust.Spec.CephVersion.Image, detectCephVersionTimeout)
if err != nil {
logger.Errorf("unknown ceph major version. %+v", err)
return