feat(v2 upgrade): support engine live upgrade

Longhorn 9104 Signed-off-by: Derek Su <[email protected]>
longhorn · Dec 11, 2024 · fda9a8d · fda9a8d
1 parent bbc7234
commit fda9a8d
Show file tree

Hide file tree

Showing 6 changed files with 597 additions and 224 deletions.
diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -1,9 +1,10 @@
 package api
 
 import (
-	"github.com/longhorn/types/pkg/generated/spdkrpc"
 	"google.golang.org/protobuf/types/known/emptypb"
 
+	"github.com/longhorn/types/pkg/generated/spdkrpc"
+
 	"github.com/longhorn/longhorn-spdk-engine/pkg/types"
 )
 
@@ -129,6 +130,7 @@ type Engine struct {
 	Port              int32                 `json:"port"`
 	TargetIP          string                `json:"target_ip"`
 	TargetPort        int32                 `json:"target_port"`
+	StandbyTargetPort int32                 `json:"standby_target_port"`
 	ReplicaAddressMap map[string]string     `json:"replica_address_map"`
 	ReplicaModeMap    map[string]types.Mode `json:"replica_mode_map"`
 	Head              *Lvol                 `json:"head"`
@@ -149,6 +151,7 @@ func ProtoEngineToEngine(e *spdkrpc.Engine) *Engine {
 		Port:              e.Port,
 		TargetIP:          e.TargetIp,
 		TargetPort:        e.TargetPort,
+		StandbyTargetPort: e.StandbyTargetPort,
 		ReplicaAddressMap: e.ReplicaAddressMap,
 		ReplicaModeMap:    map[string]types.Mode{},
 		Head:              ProtoLvolToLvol(e.Head),

diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -474,7 +474,7 @@ func (c *SPDKClient) ReplicaRebuildingDstSnapshotRevert(name, snapshotName strin
 }
 
 func (c *SPDKClient) EngineCreate(name, volumeName, frontend string, specSize uint64, replicaAddressMap map[string]string, portCount int32,
-	initiatorAddress, targetAddress string, upgradeRequired, salvageRequested bool) (*api.Engine, error) {
+	initiatorAddress, targetAddress string, salvageRequested bool) (*api.Engine, error) {
 	if name == "" || volumeName == "" || len(replicaAddressMap) == 0 {
 		return nil, fmt.Errorf("failed to start SPDK engine: missing required parameters")
 	}
@@ -490,7 +490,6 @@ func (c *SPDKClient) EngineCreate(name, volumeName, frontend string, specSize ui
 		ReplicaAddressMap: replicaAddressMap,
 		Frontend:          frontend,
 		PortCount:         portCount,
-		UpgradeRequired:   upgradeRequired,
 		TargetAddress:     targetAddress,
 		InitiatorAddress:  initiatorAddress,
 		SalvageRequested:  salvageRequested,