PWX-38611 : Replacing gob.Register with gob.RegisterName and passing …

…the value from px (libopenstorage#2474) Signed-off-by: Dolly Talreja <[email protected]>
twang-ps · Aug 28, 2024 · 2d20853 · 2d20853
1 parent f00296e
commit 2d20853
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/api/client/cluster/client.go b/api/client/cluster/client.go
@@ -299,7 +299,7 @@ func (c *clusterClient) Uuid() string {
 	return ""
 }
 
-func (c *clusterClient) StartWithConfiguration(bool, string, []string, string, *cluster.ClusterServerConfiguration) error {
+func (c *clusterClient) StartWithConfiguration(bool, string, []string, string, *cluster.ClusterServerConfiguration, string) error {
 	return nil
 }
 

diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -376,6 +376,7 @@ type Cluster interface {
 		snapshotPrefixes []string,
 		selfClusterDomain string,
 		config *ClusterServerConfiguration,
+		gobRegisterName string,
 	) error
 
 	// Get a unique identifier for this cluster. Depending on the implementation, this could

diff --git a/cluster/cluster_not_supported.go b/cluster/cluster_not_supported.go
@@ -11,8 +11,8 @@ import (
 	"github.com/libopenstorage/openstorage/pkg/defrag"
 	"github.com/libopenstorage/openstorage/pkg/diags"
 	"github.com/libopenstorage/openstorage/pkg/job"
-	"github.com/libopenstorage/openstorage/pkg/schedule"
 	"github.com/libopenstorage/openstorage/pkg/nodedrain"
+	"github.com/libopenstorage/openstorage/pkg/schedule"
 	"github.com/libopenstorage/openstorage/pkg/storagepool"
 	"github.com/libopenstorage/openstorage/schedpolicy"
 	"github.com/libopenstorage/openstorage/secrets"
@@ -117,7 +117,7 @@ func (m *NullClusterManager) Start(arg1 bool, arg2 string, arg3 string) error {
 }
 
 // StartWithConfiguration
-func (m *NullClusterManager) StartWithConfiguration(arg1 bool, arg2 string, arg3 []string, arg4 string, arg5 *ClusterServerConfiguration) error {
+func (m *NullClusterManager) StartWithConfiguration(arg1 bool, arg2 string, arg3 []string, arg4 string, arg5 *ClusterServerConfiguration, arg6 string) error {
 	return ErrNotImplemented
 }
 

diff --git a/cluster/manager/manager.go b/cluster/manager/manager.go
@@ -1448,7 +1448,8 @@ func (c *ClusterManager) Start(
 		gossipPort,
 		[]string{ClusterDBKey},
 		selfClusterDomain,
-		&cluster.ClusterServerConfiguration{})
+		&cluster.ClusterServerConfiguration{},
+		"")
 }
 
 func (c *ClusterManager) StartWithConfiguration(
@@ -1457,6 +1458,7 @@ func (c *ClusterManager) StartWithConfiguration(
 	snapshotPrefixes []string,
 	selfClusterDomain string,
 	config *cluster.ClusterServerConfiguration,
+	gobRegisterName string,
 ) error {
 	var err error
 
@@ -1511,7 +1513,7 @@ func (c *ClusterManager) StartWithConfiguration(
 	// Start the gossip protocol.
 	// Replacing gob.Register with gob.RegisterName to avoid any issue caused due to the movement from portworx to pure-px
 	// gossip: Error in unmarshalling peer's local data. Error : gob: name not registered for interface.
-	gob.RegisterName("github.com/portworx/porx/vendor/github.com/libopenstorage/openstorage/api.Node", api.Node{})
+	gob.RegisterName(gobRegisterName+"api.Node", api.Node{})
 	quorumTimeout := types.DEFAULT_QUORUM_TIMEOUT
 	if c.config.QuorumTimeoutInSeconds > 0 {
 		quorumTimeout = time.Duration(c.config.QuorumTimeoutInSeconds) * time.Second

diff --git a/cluster/manager/manager_test.go b/cluster/manager/manager_test.go
@@ -93,7 +93,7 @@ func TestUpdateSchedulerNodeName(t *testing.T) {
 
 	err = inst.StartWithConfiguration(false, "1001", []string{}, "", &cluster.ClusterServerConfiguration{
 		ConfigSystemTokenManager: manager,
-	})
+	}, "gobRegisterName/path")
 	assert.NoError(t, err)
 
 	node, err := inst.Inspect(nodeID)

diff --git a/cluster/mock/cluster.mock.go b/cluster/mock/cluster.mock.go
diff --git a/cmd/osd/main.go b/cmd/osd/main.go
@@ -630,6 +630,7 @@ func start(c *cli.Context) error {
 				ConfigObjectStoreManager: objectstore.NewfakeObjectstore(),
 				ConfigSystemTokenManager: auth.SystemTokenManagerInst(),
 			},
+			"",
 		); err != nil {
 			return fmt.Errorf("Unable to start cluster manager: %v", err)
 		}