dev

Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
longhorn · Sep 27, 2024 · 95e1ee9 · 95e1ee9
1 parent 80dd23b
commit 95e1ee9
Show file tree

Hide file tree

Showing 8 changed files with 665 additions and 653 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.22.0
 
 toolchain go1.23.1
 
-replace github.com/longhorn/types => github.com/c3y1huang/types v0.0.0-20240927004343-3ad221f0cbfc
+replace github.com/longhorn/types => github.com/c3y1huang/types v0.0.0-20240927041714-8d0fe4126762
 
 replace github.com/longhorn/go-common-libs => github.com/c3y1huang/go-common-libs v0.0.0-20240927004544-ee33d7bb917c
 

diff --git a/go.sum b/go.sum
@@ -9,8 +9,8 @@ github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZ
 github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/c3y1huang/go-common-libs v0.0.0-20240927004544-ee33d7bb917c h1:hgqLyWxqr+8pswJTewMcNlO7gO8b8bYWeMnnRDOdVZw=
 github.com/c3y1huang/go-common-libs v0.0.0-20240927004544-ee33d7bb917c/go.mod h1:L8QlyY7cqL84FcxnJ8HK6DaQ1Ej9JiZtZ94OW5W+Yyw=
-github.com/c3y1huang/types v0.0.0-20240927004343-3ad221f0cbfc h1:bd/5OSsgduNklrcW0kM+rQEb9D90olY2L2ABXept1/Y=
-github.com/c3y1huang/types v0.0.0-20240927004343-3ad221f0cbfc/go.mod h1:KlJuZB8NfHchWshYxYgV9pPIxBKC04Vq05G2TfgMf7w=
+github.com/c3y1huang/types v0.0.0-20240927041714-8d0fe4126762 h1:Om8aVGJAP5ZyAL/nOTbsauGRJkv6bZDLiFZmhDSzoSE=
+github.com/c3y1huang/types v0.0.0-20240927041714-8d0fe4126762/go.mod h1:KlJuZB8NfHchWshYxYgV9pPIxBKC04Vq05G2TfgMf7w=
 github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 h1:SjZ2GvvOononHOpK84APFuMvxqsk3tEIaKH/z4Rpu3g=
 github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -515,7 +515,7 @@ func (c *SPDKClient) EngineDelete(name string) error {
 	return errors.Wrapf(err, "failed to delete SPDK engine %v", name)
 }
 
-func (c *SPDKClient) EngineGet(name string) (*api.Engine, error) {
+func (c *SPDKClient) EngineGet(name string, runtimeRequested bool) (*api.Engine, error) {
 	if name == "" {
 		return nil, fmt.Errorf("failed to get SPDK engine: missing required parameter")
 	}
@@ -525,7 +525,8 @@ func (c *SPDKClient) EngineGet(name string) (*api.Engine, error) {
 	defer cancel()
 
 	resp, err := client.EngineGet(ctx, &spdkrpc.EngineGetRequest{
-		Name: name,
+		Name:             name,
+		RuntimeRequested: runtimeRequested,
 	})
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get SPDK engine %v", name)

diff --git a/pkg/spdk/engine.go b/pkg/spdk/engine.go
@@ -215,7 +215,7 @@ func (e *Engine) Create(spdkClient *spdkclient.Client, replicaAddressMap map[str
 			}
 		}
 
-		e.checkAndUpdateInfoFromReplicaNoLock()
+		e.checkAndUpdateInfoFromReplicaNoLock(false)
 
 		e.log.Infof("Connected all available replicas %+v, then launching raid during engine creation", e.ReplicaModeMap)
 		if _, err := spdkClient.BdevRaidCreate(e.Name, spdktypes.BdevRaidLevel1, 0, replicaBdevList); err != nil {
@@ -241,7 +241,7 @@ func (e *Engine) Create(spdkClient *spdkclient.Client, replicaAddressMap map[str
 
 		var engineWithTarget *api.Engine
 		if initiatorIP != targetIP {
-			engineWithTarget, err = targetSPDKClient.EngineGet(e.Name)
+			engineWithTarget, err = targetSPDKClient.EngineGet(e.Name, false)
 			if err != nil {
 				return nil, errors.Wrapf(err, "failed to get engine %v from %v", e.Name, targetAddress)
 			}
@@ -716,12 +716,12 @@ func (e *Engine) ValidateAndUpdate(spdkClient *spdkclient.Client) (err error) {
 		// TODO: should we delete the engine automatically here?
 	}
 
-	e.checkAndUpdateInfoFromReplicaNoLock()
+	e.checkAndUpdateInfoFromReplicaNoLock(false)
 
 	return nil
 }
 
-func (e *Engine) checkAndUpdateInfoFromReplicaNoLock() {
+func (e *Engine) checkAndUpdateInfoFromReplicaNoLock(runtimeRequested bool) {
 	replicaMap := map[string]*api.Replica{}
 	replicaAncestorMap := map[string]*api.Lvol{}
 	// hasBackingImage := false
@@ -750,7 +750,7 @@ func (e *Engine) checkAndUpdateInfoFromReplicaNoLock() {
 				}
 			}()
 
-			replica, err := replicaServiceCli.ReplicaGet(replicaName, true)
+			replica, err := replicaServiceCli.ReplicaGet(replicaName, runtimeRequested)
 			if err != nil {
 				e.log.WithError(err).Warnf("Failed to get replica %s with address %s, mark the mode from %v to ERR", replicaName, address, e.ReplicaModeMap[replicaName])
 				e.ReplicaModeMap[replicaName] = types.ModeERR
@@ -1081,7 +1081,7 @@ func (e *Engine) ReplicaAdd(spdkClient *spdkclient.Client, dstReplicaName, dstRe
 	if err != nil {
 		return err
 	}
-	e.checkAndUpdateInfoFromReplicaNoLock()
+	e.checkAndUpdateInfoFromReplicaNoLock(false)
 
 	rebuildingSnapshotList, err = getRebuildingSnapshotList(srcReplicaServiceCli, srcReplicaName)
 	if err != nil {
@@ -1292,7 +1292,7 @@ func (e *Engine) replicaAddFinish(srcReplicaServiceCli, dstReplicaServiceCli *cl
 		}
 		updateRequired = true
 	}
-	e.checkAndUpdateInfoFromReplicaNoLock()
+	e.checkAndUpdateInfoFromReplicaNoLock(false)
 
 	// The source replica blindly stops exposing the snapshot and wipe the rebuilding info.
 	if srcReplicaErr := srcReplicaServiceCli.ReplicaRebuildingSrcFinish(srcReplicaName, dstReplicaName); srcReplicaErr != nil {
@@ -1510,7 +1510,7 @@ func (e *Engine) snapshotOperation(spdkClient *spdkclient.Client, inputSnapshotN
 		return "", err
 	}
 
-	e.checkAndUpdateInfoFromReplicaNoLock()
+	e.checkAndUpdateInfoFromReplicaNoLock(false)
 
 	e.log.Infof("Engine finished snapshot operation %s %s", snapshotOp, snapshotName)
 
@@ -1557,7 +1557,7 @@ func (e *Engine) snapshotOperationPreCheckWithoutLock(replicaClients map[string]
 			if e.ReplicaModeMap[replicaName] == types.ModeWO {
 				return "", fmt.Errorf("engine %s contains WO replica %s during snapshot %s delete", e.Name, replicaName, snapshotName)
 			}
-			e.checkAndUpdateInfoFromReplicaNoLock()
+			e.checkAndUpdateInfoFromReplicaNoLock(false)
 			if len(e.SnapshotMap[snapshotName].Children) > 1 {
 				return "", fmt.Errorf("engine %s cannot delete snapshot %s since it contains multiple children %+v", e.Name, snapshotName, e.SnapshotMap[snapshotName].Children)
 			}

diff --git a/pkg/spdk/server.go b/pkg/spdk/server.go
@@ -1043,7 +1043,7 @@ func (s *Server) EngineGet(ctx context.Context, req *spdkrpc.EngineGetRequest) (
 		return nil, grpcstatus.Errorf(grpccodes.NotFound, "cannot find engine %v", req.Name)
 	}
 
-	e.checkAndUpdateInfoFromReplicaNoLock()
+	e.checkAndUpdateInfoFromReplicaNoLock(req.RuntimeRequested)
 
 	return e.Get(), nil
 }

diff --git a/pkg/spdk_test.go b/pkg/spdk_test.go
@@ -380,7 +380,7 @@ func (s *TestSuite) TestSPDKMultipleThread(c *C) {
 			c.Assert(err, IsNil)
 			err = spdkCli.EngineReplicaDelete(engineName, replicaName2, net.JoinHostPort(ip, strconv.Itoa(int(replica2.PortStart))))
 			c.Assert(err, IsNil)
-			engine, err = spdkCli.EngineGet(engineName)
+			engine, err = spdkCli.EngineGet(engineName, false)
 			c.Assert(err, IsNil)
 			c.Assert(engine.State, Equals, types.InstanceStateRunning)
 			c.Assert(engine.Frontend, Equals, types.FrontendSPDKTCPBlockdev)
@@ -410,7 +410,7 @@ func (s *TestSuite) TestSPDKMultipleThread(c *C) {
 				replica1.Name: net.JoinHostPort(ip, strconv.Itoa(int(replica1.PortStart))),
 				replica3.Name: net.JoinHostPort(ip, strconv.Itoa(int(replica3.PortStart))),
 			}
-			engine, err = spdkCli.EngineGet(engineName)
+			engine, err = spdkCli.EngineGet(engineName, false)
 			c.Assert(err, IsNil)
 			c.Assert(engine.State, Equals, types.InstanceStateRunning)
 			c.Assert(engine.Frontend, Equals, types.FrontendSPDKTCPBlockdev)
@@ -859,7 +859,7 @@ func (s *TestSuite) TestSPDKMultipleThreadSnapshotOpsAndRebuilding(c *C) {
 			c.Assert(err, IsNil)
 			err = spdkCli.EngineReplicaDelete(engineName, replicaName1, net.JoinHostPort(ip, strconv.Itoa(int(replica1.PortStart))))
 			c.Assert(err, IsNil)
-			engine, err = spdkCli.EngineGet(engineName)
+			engine, err = spdkCli.EngineGet(engineName, false)
 			c.Assert(err, IsNil)
 			c.Assert(engine.State, Equals, types.InstanceStateRunning)
 			c.Assert(engine.Frontend, Equals, types.FrontendSPDKTCPBlockdev)
@@ -904,7 +904,7 @@ func (s *TestSuite) TestSPDKMultipleThreadSnapshotOpsAndRebuilding(c *C) {
 			c.Assert(snapshotNameRebuild1, Not(Equals), "")
 
 			// Verify the 1st rebuilding result
-			engine, err = spdkCli.EngineGet(engineName)
+			engine, err = spdkCli.EngineGet(engineName, false)
 			c.Assert(err, IsNil)
 			c.Assert(engine.State, Equals, types.InstanceStateRunning)
 			c.Assert(engine.Frontend, Equals, types.FrontendSPDKTCPBlockdev)
@@ -953,7 +953,7 @@ func (s *TestSuite) TestSPDKMultipleThreadSnapshotOpsAndRebuilding(c *C) {
 			c.Assert(err, IsNil)
 			err = spdkCli.EngineReplicaDelete(engineName, replicaName2, net.JoinHostPort(ip, strconv.Itoa(int(replica2.PortStart))))
 			c.Assert(err, IsNil)
-			engine, err = spdkCli.EngineGet(engineName)
+			engine, err = spdkCli.EngineGet(engineName, false)
 			c.Assert(err, IsNil)
 			c.Assert(engine.State, Equals, types.InstanceStateRunning)
 			c.Assert(engine.Frontend, Equals, types.FrontendSPDKTCPBlockdev)
@@ -1002,7 +1002,7 @@ func (s *TestSuite) TestSPDKMultipleThreadSnapshotOpsAndRebuilding(c *C) {
 			c.Assert(snapshotNameRebuild2, Not(Equals), "")
 
 			// Verify the 2nd rebuilding result
-			engine, err = spdkCli.EngineGet(engineName)
+			engine, err = spdkCli.EngineGet(engineName, false)
 			c.Assert(err, IsNil)
 			c.Assert(engine.State, Equals, types.InstanceStateRunning)
 			c.Assert(engine.Frontend, Equals, types.FrontendSPDKTCPBlockdev)
@@ -1174,7 +1174,7 @@ func (s *TestSuite) TestSPDKMultipleThreadSnapshotOpsAndRebuilding(c *C) {
 }
 
 func checkReplicaSnapshots(c *C, spdkCli *client.SPDKClient, engineName string, replicaList []string, snapshotMap map[string][]string, snapshotOpts map[string]api.SnapshotOptions) {
-	engine, err := spdkCli.EngineGet(engineName)
+	engine, err := spdkCli.EngineGet(engineName, false)
 	c.Assert(err, IsNil)
 
 	for _, replicaName := range replicaList {
@@ -1212,7 +1212,7 @@ func revertSnapshot(c *C, spdkCli *client.SPDKClient, snapshotName, volumeName,
 	c.Assert(err, IsNil)
 	os.Setenv(commonnet.EnvPodIP, ip)
 
-	engine, err := spdkCli.EngineGet(engineName)
+	engine, err := spdkCli.EngineGet(engineName, false)
 	c.Assert(err, IsNil)
 
 	if engine.State != types.InstanceStateRunning {
@@ -1287,7 +1287,7 @@ func WaitForReplicaRebuildingComplete(c *C, spdkCli *client.SPDKClient, engineNa
 		}
 
 		if rebuildingStatus.TotalState == types.ProgressStateComplete {
-			engine, err := spdkCli.EngineGet(engineName)
+			engine, err := spdkCli.EngineGet(engineName, false)
 			c.Assert(err, IsNil)
 			c.Assert(engine.State, Equals, types.InstanceStateRunning)
 			if engine.ReplicaModeMap[replicaName] == types.ModeRW {
@@ -1367,7 +1367,7 @@ func (s *TestSuite) TestSPDKEngineOnlyWithTarget(c *C) {
 	err = spdkCli.EngineDeleteTarget(engineName)
 	c.Assert(err, IsNil)
 
-	_, err = spdkCli.EngineGet(engineName)
+	_, err = spdkCli.EngineGet(engineName, false)
 	c.Assert(strings.Contains(err.Error(), "cannot find engine"), Equals, true)
 
 	err = spdkCli.ReplicaDelete(replicaName1, false)