Sync from server repo (efeb056c184)

vertica · Apr 25, 2024 · 06053a0 · 06053a0
1 parent fa19124
commit 06053a0
Show file tree

Hide file tree

Showing 138 changed files with 258 additions and 151 deletions.
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2023] Open Text.
+   Copyright [2023-2024] Open Text.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/commands/cluster_command_launcher.go b/commands/cluster_command_launcher.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cluster_command_launcher_test.go b/commands/cluster_command_launcher_test.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_add_node.go b/commands/cmd_add_node.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_add_subcluster.go b/commands/cmd_add_subcluster.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_base.go b/commands/cmd_base.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_create_db.go b/commands/cmd_create_db.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_drop_db.go b/commands/cmd_drop_db.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_install_packages.go b/commands/cmd_install_packages.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_list_all_nodes.go b/commands/cmd_list_all_nodes.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -107,9 +107,9 @@ func (c *CmdListAllNodes) Run(vcc vclusterops.ClusterCommands) error {
 		}
 	}
 
-	bytes, err := json.MarshalIndent(nodeStates, "", "  ")
+	bytes, err := c.marshalNoteStates(nodeStates)
 	if err != nil {
-		return fmt.Errorf("fail to marshal the node state result, details %w", err)
+		return err
 	}
 
 	c.writeCmdOutputToFile(globals.file, bytes, vcc.GetLog())
@@ -121,3 +121,37 @@ func (c *CmdListAllNodes) Run(vcc vclusterops.ClusterCommands) error {
 func (c *CmdListAllNodes) SetDatabaseOptions(opt *vclusterops.DatabaseOptions) {
 	c.fetchNodeStateOptions.DatabaseOptions = *opt
 }
+
+func (c *CmdListAllNodes) marshalNoteStates(nodeStates []vclusterops.NodeInfo) (bytes []byte, err error) {
+	var isEon bool
+	if len(nodeStates) > 0 {
+		// node in Eon database should not have an empty sc name
+		if nodeStates[0].Subcluster != "" {
+			isEon = true
+		}
+	}
+
+	if isEon {
+		bytes, err = json.MarshalIndent(nodeStates, "", "  ")
+		if err != nil {
+			return bytes, fmt.Errorf("fail to marshal the node state result, details %w", err)
+		}
+	} else {
+		var nodeStatesEnterprise []vclusterops.NodeInfoEnterprise
+		for _, n := range nodeStates {
+			var nEnterprise vclusterops.NodeInfoEnterprise
+			nEnterprise.Address = n.Address
+			nEnterprise.Name = n.Name
+			nEnterprise.State = n.State
+			nEnterprise.CatalogPath = n.CatalogPath
+			nEnterprise.Version = n.Version
+			nodeStatesEnterprise = append(nodeStatesEnterprise, nEnterprise)
+		}
+		bytes, err = json.MarshalIndent(nodeStatesEnterprise, "", "  ")
+		if err != nil {
+			return bytes, fmt.Errorf("fail to marshal the node state result, details %w", err)
+		}
+	}
+
+	return bytes, nil
+}
diff --git a/commands/cmd_re_ip.go b/commands/cmd_re_ip.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_remove_node.go b/commands/cmd_remove_node.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_remove_subcluster.go b/commands/cmd_remove_subcluster.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_restart_node.go b/commands/cmd_restart_node.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_revive_db.go b/commands/cmd_revive_db.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_sandbox.go b/commands/cmd_sandbox.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_scrutinize.go b/commands/cmd_scrutinize.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_show_restore_points.go b/commands/cmd_show_restore_points.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_start_db.go b/commands/cmd_start_db.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_stop_db.go b/commands/cmd_stop_db.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/cmd_unsandbox.go b/commands/cmd_unsandbox.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/commands/helpers.go b/commands/helpers.go
@@ -1,5 +1,5 @@
 /*
-(c) Copyright [2023] Open Text.
+(c) Copyright [2023-2024] Open Text.
 Licensed under the Apache License, Version 2.0 (the "License");
 You may not use this file except in compliance with the License.
 You may obtain a copy of the License at

diff --git a/commands/init.go b/commands/init.go
@@ -1,5 +1,5 @@
 /*
-(c) Copyright [2023] Open Text.
+(c) Copyright [2023-2024] Open Text.
 Licensed under the Apache License, Version 2.0 (the "License");
 You may not use this file except in compliance with the License.
 You may obtain a copy of the License at

diff --git a/commands/scrutinize_test.go b/commands/scrutinize_test.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/logging-utils.sh b/logging-utils.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# (c) Copyright [2023] Open Text.
+# (c) Copyright [2023-2024] Open Text.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # You may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

diff --git a/main.go b/main.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/rfc7807/errors.go b/rfc7807/errors.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/rfc7807/rfc7807.go b/rfc7807/rfc7807.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/rfc7807/rfc7807_test.go b/rfc7807/rfc7807_test.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/sync-to-github.sh b/sync-to-github.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# (c) Copyright [2023] Open Text.
+# (c) Copyright [2023-2024] Open Text.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # You may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

diff --git a/vclusterops/adapter_pool.go b/vclusterops/adapter_pool.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/add_node.go b/vclusterops/add_node.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/add_subcluster.go b/vclusterops/add_subcluster.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/cluster_op.go b/vclusterops/cluster_op.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/cluster_op_engine.go b/vclusterops/cluster_op_engine.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/cluster_op_engine_context.go b/vclusterops/cluster_op_engine_context.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -36,6 +36,9 @@ type opEngineExecContext struct {
 	dbInfo                        string              // store the db info that retrieved from communal storage
 	restorePoints                 []RestorePoint      // store list existing restore points that queried from an archive
 	systemTableList               systemTableListInfo // used for staging system tables
+
+	// hosts on which the wrong authentication occurred
+	hostsWithWrongAuth []string
 }
 
 func makeOpEngineExecContext(logger vlog.Printer) opEngineExecContext {

diff --git a/vclusterops/cluster_op_engine_test.go b/vclusterops/cluster_op_engine_test.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/cluster_op_test.go b/vclusterops/cluster_op_test.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/coordinator_database.go b/vclusterops/coordinator_database.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -332,6 +332,7 @@ type VCoordinationNode struct {
 	Subcluster string
 	// empty string if it is not in a sandbox
 	Sandbox string
+	Version string
 }
 
 func makeVCoordinationNode() VCoordinationNode {

diff --git a/vclusterops/create_db.go b/vclusterops/create_db.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -376,7 +376,7 @@ func (vcc VClusterCommands) produceCreateDBBootstrapInstructions(
 	nmaHealthOp := makeNMAHealthOp(hosts)
 
 	// require to have the same vertica version
-	nmaVerticaVersionOp := makeNMAVerticaVersionOp(hosts, true, vdb.IsEon)
+	nmaVerticaVersionOp := makeNMACheckVerticaVersionOp(hosts, true, vdb.IsEon)
 
 	// need username for https operations
 	err := options.validateUserName(vcc.Log)

diff --git a/vclusterops/create_db_test.go b/vclusterops/create_db_test.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/drop_db.go b/vclusterops/drop_db.go
@@ -1,5 +1,5 @@
 /*
- (c) Copyright [2023] Open Text.
+ (c) Copyright [2023-2024] Open Text.
  Licensed under the Apache License, Version 2.0 (the "License");
  You may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/vclusterops/fetch_database.go b/vclusterops/fetch_database.go
@@ -148,18 +148,23 @@ func (vcc VClusterCommands) produceRecoverConfigInstructions(
 	var instructions []clusterOp
 
 	nmaHealthOp := makeNMAHealthOp(options.Hosts)
+
 	nmaGetNodesInfoOp := makeNMAGetNodesInfoOp(options.Hosts, options.DBName, options.CatalogPrefix,
 		true /* ignore internal errors */, vdb)
+
 	nmaReadCatalogEditorOp, err := makeNMAReadCatalogEditorOp(vdb)
 	if err != nil {
 		return instructions, err
 	}
 
+	nmaReadVerticaVersionOp := makeNMAReadVerticaVersionOp(vdb)
+
 	instructions = append(
 		instructions,
 		&nmaHealthOp,
 		&nmaGetNodesInfoOp,
 		&nmaReadCatalogEditorOp,
+		&nmaReadVerticaVersionOp,
 	)
 
 	return instructions, nil