grpc-proxy: add proxy API version for live upgrade

Longhorn-3546 Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
longhorn · May 16, 2022 · ae762d0 · ae762d0
1 parent 40b0ffe
commit ae762d0
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 59 deletions.
diff --git a/integration/rpc/instance_manager/imrpc_pb2.py b/integration/rpc/instance_manager/imrpc_pb2.py
diff --git a/pkg/client/process_manager.go b/pkg/client/process_manager.go
@@ -208,12 +208,16 @@ func (c *ProcessManagerClient) VersionGet() (*meta.VersionOutput, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to get version: %v", err)
 	}
+
 	return &meta.VersionOutput{
 		Version:   resp.Version,
 		GitCommit: resp.GitCommit,
 		BuildDate: resp.BuildDate,
 
 		InstanceManagerAPIVersion:    int(resp.InstanceManagerAPIVersion),
 		InstanceManagerAPIMinVersion: int(resp.InstanceManagerAPIMinVersion),
+
+		InstanceManagerProxyAPIVersion:    int(resp.InstanceManagerProxyAPIVersion),
+		InstanceManagerProxyAPIMinVersion: int(resp.InstanceManagerProxyAPIMinVersion),
 	}, nil
 }
diff --git a/pkg/client/proxy.go b/pkg/client/proxy.go
@@ -10,6 +10,7 @@ import (
 	"google.golang.org/grpc"
 
 	rpc "github.com/longhorn/longhorn-instance-manager/pkg/imrpc"
+	"github.com/longhorn/longhorn-instance-manager/pkg/meta"
 	"github.com/longhorn/longhorn-instance-manager/pkg/util"
 
 	emeta "github.com/longhorn/longhorn-engine/pkg/meta"
@@ -39,6 +40,8 @@ func (c *ProxyClient) Close() error {
 type ProxyClient struct {
 	ServiceURL string
 	ServiceContext
+
+	Version int
 }
 
 func NewProxyClient(ctx context.Context, ctxCancel context.CancelFunc, address string, port int) (*ProxyClient, error) {
@@ -65,6 +68,7 @@ func NewProxyClient(ctx context.Context, ctxCancel context.CancelFunc, address s
 	return &ProxyClient{
 		ServiceURL:     serviceURL,
 		ServiceContext: serviceCtx,
+		Version:        meta.InstanceManagerProxyAPIVersion,
 	}, nil
 }
 

diff --git a/pkg/imrpc/imrpc.pb.go b/pkg/imrpc/imrpc.pb.go
diff --git a/pkg/imrpc/imrpc.proto b/pkg/imrpc/imrpc.proto
@@ -74,4 +74,7 @@ message VersionResponse {
 
     int64 instanceManagerAPIVersion = 4;
     int64 instanceManagerAPIMinVersion = 5;
+
+    int64 instanceManagerProxyAPIVersion = 6;
+    int64 instanceManagerProxyAPIMinVersion = 7;
 }