Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: v2 data engine live upgrade #3282

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/daemon.go
Original file line number Diff line number Diff line change
@@ -169,7 +169,7 @@ func startManager(c *cli.Context) error {
if err != nil {
return err
}
if err := webhook.StartWebhook(ctx, types.WebhookTypeConversion, clientsWithoutDatastore); err != nil {
if err := webhook.StartWebhook(ctx, currentNodeID, types.WebhookTypeConversion, clientsWithoutDatastore); err != nil {
return err
}

@@ -195,7 +195,7 @@ func startManager(c *cli.Context) error {
return err
}

if err := webhook.StartWebhook(ctx, types.WebhookTypeAdmission, clients); err != nil {
if err := webhook.StartWebhook(ctx, currentNodeID, types.WebhookTypeAdmission, clients); err != nil {
return err
}
if err := clients.Datastore.AddLabelToManagerPod(currentNodeID, types.GetAdmissionWebhookLabel()); err != nil {
8 changes: 8 additions & 0 deletions controller/backup_controller.go
Original file line number Diff line number Diff line change
@@ -596,6 +596,14 @@ func (bc *BackupController) isResponsibleFor(b *longhorn.Backup, defaultEngineIm
err = errors.Wrap(err, "error while checking isResponsibleFor")
}()

upgradeRequested, err := bc.ds.IsNodeDataEngineUpgradeRequested(bc.controllerID)
if err != nil {
return false, err
}
if upgradeRequested {
return false, nil
}

isResponsible := isControllerResponsibleFor(bc.controllerID, bc.ds, b.Name, "", b.Status.OwnerID)

currentOwnerEngineAvailable, err := bc.ds.CheckEngineImageReadiness(defaultEngineImage, b.Status.OwnerID)
15 changes: 14 additions & 1 deletion controller/controller_manager.go
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ func StartControllers(logger logrus.FieldLogger, clients *client.Clients,
stopCh := clients.StopCh

// Longhorn controllers
replicaController, err := NewReplicaController(logger, ds, scheme, kubeClient, namespace, controllerID)
replicaController, err := NewReplicaController(logger, ds, scheme, kubeClient, namespace, controllerID, proxyConnCounter)
if err != nil {
return nil, err
}
@@ -154,6 +154,16 @@ func StartControllers(logger logrus.FieldLogger, clients *client.Clients,
return nil, err
}

dataEngineUpgradeManagerController, err := NewDataEngineUpgradeManagerController(logger, ds, scheme, kubeClient, controllerID, namespace)
if err != nil {
return nil, err
}

nodeDataEngineUpgradeController, err := NewNodeDataEngineUpgradeController(logger, ds, scheme, kubeClient, controllerID, namespace)
if err != nil {
return nil, err
}

// Kubernetes controllers
kubernetesPVController, err := NewKubernetesPVController(logger, ds, scheme, kubeClient, controllerID)
if err != nil {
@@ -213,6 +223,9 @@ func StartControllers(logger logrus.FieldLogger, clients *client.Clients,
go volumeEvictionController.Run(Workers, stopCh)
go volumeCloneController.Run(Workers, stopCh)
go volumeExpansionController.Run(Workers, stopCh)
// The two controllers do not support upgrade in parallel
go dataEngineUpgradeManagerController.Run(1, stopCh)
go nodeDataEngineUpgradeController.Run(1, stopCh)

// Start goroutines for Kubernetes controllers
go kubernetesPVController.Run(Workers, stopCh)
Loading