WIP

Signed-off-by: Derek Su <derek.su@suse.com>
longhorn · Jun 4, 2024 · 762d26a · 762d26a
1 parent ad77af3
commit 762d26a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/app/cmd/start.go b/app/cmd/start.go
@@ -179,12 +179,6 @@ func start(c *cli.Context) (err error) {
 		return err
 	}
 
-	// if spdkEnabled {
-	// 	if err := cleanupStaledNvmeAndDmDevices(); err != nil {
-	// 		return err
-	// 	}
-	// }
-
 	// setup tls config
 	var tlsConfig *tls.Config
 	tlsDir := c.GlobalString("tls-dir")

diff --git a/pkg/api/instance.go b/pkg/api/instance.go
@@ -64,20 +64,22 @@ func RPCToInstanceList(obj *rpc.InstanceListResponse) map[string]*Instance {
 }
 
 type InstanceStatus struct {
-	State      string          `json:"state"`
-	ErrorMsg   string          `json:"errorMsg"`
-	Conditions map[string]bool `json:"conditions"`
-	PortStart  int32           `json:"portStart"`
-	PortEnd    int32           `json:"portEnd"`
+	State        string          `json:"state"`
+	ErrorMsg     string          `json:"errorMsg"`
+	Conditions   map[string]bool `json:"conditions"`
+	PortStart    int32           `json:"portStart"`
+	PortEnd      int32           `json:"portEnd"`
+	RemoteTarget bool            `json:"remoteTarget"`
 }
 
 func RPCToInstanceStatus(obj *rpc.InstanceStatus) InstanceStatus {
 	return InstanceStatus{
-		State:      obj.State,
-		ErrorMsg:   obj.ErrorMsg,
-		Conditions: obj.Conditions,
-		PortStart:  obj.PortStart,
-		PortEnd:    obj.PortEnd,
+		State:        obj.State,
+		ErrorMsg:     obj.ErrorMsg,
+		Conditions:   obj.Conditions,
+		PortStart:    obj.PortStart,
+		PortEnd:      obj.PortEnd,
+		RemoteTarget: obj.RemoteTarget,
 	}
 }
 

diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
@@ -711,11 +711,12 @@ func engineResponseToInstanceResponse(e *spdkapi.Engine) *rpc.InstanceResponse {
 			DataEngine:         rpc.DataEngine_DATA_ENGINE_V2,
 		},
 		Status: &rpc.InstanceStatus{
-			State:      e.State,
-			ErrorMsg:   e.ErrorMsg,
-			PortStart:  e.Port,
-			PortEnd:    e.Port,
-			Conditions: make(map[string]bool),
+			State:        e.State,
+			ErrorMsg:     e.ErrorMsg,
+			PortStart:    e.Port,
+			PortEnd:      e.Port,
+			Conditions:   make(map[string]bool),
+			RemoteTarget: e.RemoteTarget,
 		},
 	}
 }