feat(v2 upgrade): support engine live upgrade

Longhorn 9104 Signed-off-by: Derek Su <[email protected]>
longhorn · Nov 19, 2024 · 5d51017 · 5d51017
1 parent f654d45
commit 5d51017
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/pkg/spdk/engine.go b/pkg/spdk/engine.go
@@ -141,10 +141,9 @@ func (e *Engine) checkInitiatorAndTargetCreationRequirements(podIP, initiatorIP,
 	return initiatorCreationRequired, targetCreationRequired, err
 }
 
-func (e *Engine) Create(spdkClient *spdkclient.Client, replicaAddressMap map[string]string, portCount int32, superiorPortAllocator *commonbitmap.Bitmap, initiatorAddress, targetAddress string, upgradeRequired, salvageRequested bool) (ret *spdkrpc.Engine, err error) {
+func (e *Engine) Create(spdkClient *spdkclient.Client, replicaAddressMap map[string]string, portCount int32, superiorPortAllocator *commonbitmap.Bitmap, initiatorAddress, targetAddress string, salvageRequested bool) (ret *spdkrpc.Engine, err error) {
 	logrus.WithFields(logrus.Fields{
 		"portCount":         portCount,
-		"upgradeRequired":   upgradeRequired,
 		"replicaAddressMap": replicaAddressMap,
 		"initiatorAddress":  initiatorAddress,
 		"targetAddress":     targetAddress,
@@ -306,7 +305,6 @@ func (e *Engine) Create(spdkClient *spdkclient.Client, replicaAddressMap map[str
 	log := e.log.WithFields(logrus.Fields{
 		"initiatorCreationRequired": initiatorCreationRequired,
 		"targetCreationRequired":    targetCreationRequired,
-		"upgradeRequired":           upgradeRequired,
 		"initiatorAddress":          initiatorAddress,
 		"targetAddress":             targetAddress,
 	})

diff --git a/pkg/spdk/engine_test.go b/pkg/spdk/engine_test.go
@@ -34,7 +34,7 @@ func (s *TestSuite) TestCheckInitiatorAndTargetCreationRequirements(c *C) {
 			expectedError:                     nil,
 		},
 		{
-			name:                              "Create local target instance only",
+			name:                              "Create local target instance on the node with initiator instance",
 			podIP:                             "192.168.1.1",
 			initiatorIP:                       "192.168.1.1",
 			targetIP:                          "192.168.1.1",
@@ -58,7 +58,7 @@ func (s *TestSuite) TestCheckInitiatorAndTargetCreationRequirements(c *C) {
 			expectedError:                     nil,
 		},
 		{
-			name:                              "Create remote target instance only",
+			name:                              "Create local target instance on the node without initiator instance",
 			podIP:                             "192.168.1.2",
 			initiatorIP:                       "192.168.1.1",
 			targetIP:                          "192.168.1.2",
@@ -94,9 +94,8 @@ func (s *TestSuite) TestCheckInitiatorAndTargetCreationRequirements(c *C) {
 			expectedError:                     nil,
 		},
 	}
-
 	for testName, testCase := range testCases {
-		c.Logf("testing TestCheckInitiatorAndTargetCreationRequirements.%v", testName)
+		c.Logf("testing checkInitiatorAndTargetCreationRequirements.%v", testName)
 
 		engine := &Engine{
 			Port:              testCase.port,

diff --git a/pkg/spdk/server.go b/pkg/spdk/server.go
@@ -876,7 +876,7 @@ func (s *Server) EngineCreate(ctx context.Context, req *spdkrpc.EngineCreateRequ
 	spdkClient := s.spdkClient
 	s.Unlock()
 
-	return e.Create(spdkClient, req.ReplicaAddressMap, req.PortCount, s.portAllocator, req.InitiatorAddress, req.TargetAddress, req.UpgradeRequired, req.SalvageRequested)
+	return e.Create(spdkClient, req.ReplicaAddressMap, req.PortCount, s.portAllocator, req.InitiatorAddress, req.TargetAddress, req.SalvageRequested)
 }
 
 func localTargetExists(e *Engine) bool {