Skip to content

Commit 6f690f3

Browse files
committed
Revert "fix: avoid instance creation if the engine image is not ready"
Longhorn 11397, 11994, 11995 This reverts commit 5c4ea9b.
1 parent 0d3a0fd commit 6f690f3

2 files changed

Lines changed: 1 addition & 16 deletions

File tree

controller/engine_controller.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -444,14 +444,6 @@ func (ec *EngineController) CreateInstance(obj interface{}) (*longhorn.InstanceP
444444
if e.Spec.VolumeName == "" || e.Spec.NodeID == "" {
445445
return nil, fmt.Errorf("missing parameters for engine instance creation: %v", e)
446446
}
447-
isReady, err := ec.ds.CheckDataEngineImageReadiness(e.Spec.Image, e.Spec.DataEngine, e.Spec.NodeID)
448-
if err != nil {
449-
return nil, err
450-
}
451-
if !isReady {
452-
return nil, fmt.Errorf("data engine %v image %v is not ready on node %v for engine %s instance creation", e.Spec.DataEngine, e.Spec.Image, e.Spec.NodeID, e.Name)
453-
}
454-
455447
frontend := e.Spec.Frontend
456448
if e.Spec.DisableFrontend {
457449
frontend = longhorn.VolumeFrontendEmpty

controller/replica_controller.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,7 @@ func (rc *ReplicaController) CreateInstance(obj interface{}) (*longhorn.Instance
322322
return nil, fmt.Errorf("missing parameters for replica instance creation: %v", r)
323323
}
324324

325-
isReady, err := rc.ds.CheckDataEngineImageReadiness(r.Spec.Image, r.Spec.DataEngine, r.Spec.NodeID)
326-
if err != nil {
327-
return nil, err
328-
}
329-
if !isReady {
330-
return nil, fmt.Errorf("data engine %v image %v is not ready on node %v for replica %s instance creation", r.Spec.DataEngine, r.Spec.Image, r.Spec.NodeID, r.Name)
331-
}
332-
325+
var err error
333326
backingImagePath := ""
334327
if r.Spec.BackingImage != "" {
335328
if backingImagePath, err = rc.GetBackingImagePathForReplicaStarting(r); err != nil {

0 commit comments

Comments
 (0)