Sync from server repo (3ffc8516100)

README.md

@@ -94,4 +94,4 @@ We can use similar way to set up and call other vcluster-ops commands.
 
 
 ## Licensing
-vcluster is open source code and is under the Apache 2.0 license. Please see `LICENSE` for details.
+vcluster is open source and is under the Apache 2.0 license. Please see `LICENSE` for details.

commands/cmd_create_db.go

@@ -275,7 +275,6 @@ func (c *CmdCreateDB) Run(vcc vclusterops.ClusterCommands) error {
 	vcc.V(1).Info("Called method Run()")
 	vdb, createError := vcc.VCreateDatabase(c.createDBOptions)
 	if createError != nil {
-		vcc.LogError(createError, "Failed to create the database.")
 		return createError
 	}
 

vclusterops/cluster_op.go

@@ -72,10 +72,11 @@ const (
 )
 
 const (
-	SuccessCode        = 200
-	MultipleChoiceCode = 300
-	UnauthorizedCode   = 401
-	InternalErrorCode  = 500
+	SuccessCode            = 200
+	MultipleChoiceCode     = 300
+	UnauthorizedCode       = 401
+	PreconditionFailedCode = 412
+	InternalErrorCode      = 500
 )
 
 // hostHTTPResult is used to save result of an Adapter's sendRequest(...) function
@@ -97,13 +98,17 @@ const respSuccStatusCode = 0
 // The HTTP response with a 401 status code can have several scenarios:
 // 1. Wrong password
 // 2. Wrong certificate
-// 3. The local node has not yet joined the cluster; the HTTP server will accept connections once the node joins the cluster.
-// HTTPCheckDBRunningOp in create_db need to check all scenarios to see any HTTP running
-// For HTTPSPollNodeStateOp in start_db, it requires only handling the first and second scenarios
+// HTTPCheckDBRunningOp in create_db and HTTPSPollNodeStateOp in start_db need to handle these scenarios
 func (hostResult *hostHTTPResult) isUnauthorizedRequest() bool {
 	return hostResult.statusCode == UnauthorizedCode
 }
 
+// The HTTP response with a 412 may happen if
+// the local node has not yet joined the cluster; the HTTP server will accept connections once the node joins the cluster.
+func (hostResult *hostHTTPResult) hasPreconditionFailed() bool {
+	return hostResult.statusCode == PreconditionFailedCode
+}
+
 // isSuccess returns true if status code is 200
 func (hostResult *hostHTTPResult) isSuccess() bool {
 	return hostResult.statusCode == SuccessCode
@@ -129,7 +134,8 @@ func (hostResult *hostHTTPResult) isInternalError() bool {
 }
 
 func (hostResult *hostHTTPResult) isHTTPRunning() bool {
-	if hostResult.isPassing() || hostResult.isUnauthorizedRequest() || hostResult.isInternalError() {
+	if hostResult.isPassing() || hostResult.isUnauthorizedRequest() ||
+		hostResult.isInternalError() || hostResult.hasPreconditionFailed() {
 		return true
 	}
 	return false

vclusterops/create_db.go

@@ -295,6 +295,7 @@ func (vcc VClusterCommands) VCreateDatabase(options *VCreateDatabaseOptions) (VC
 	vdb := makeVCoordinationDatabase()
 	err := vdb.setFromCreateDBOptions(options, vcc.Log)
 	if err != nil {
+		vcc.Log.Error(err, "fail to create database")
 		return vdb, err
 	}
 	// produce instructions

vclusterops/fetch_node_state.go

@@ -72,7 +72,7 @@ func (vcc VClusterCommands) VFetchNodeState(options *VFetchNodeStateOptions) ([]
 
 	// this vdb is used to fetch node version
 	var vdb VCoordinationDatabase
-	err = vcc.getVDBFromRunningDBIncludeSandbox(&vdb, &options.DatabaseOptions, util.MainClusterSandbox)
+	err = vcc.getVDBFromMainRunningDBContainsSandbox(&vdb, &options.DatabaseOptions)
 	if err != nil {
 		vcc.Log.PrintInfo("Error from vdb build: %s", err.Error())
 
@@ -91,7 +91,13 @@ func (vcc VClusterCommands) VFetchNodeState(options *VFetchNodeStateOptions) ([]
 		return vcc.fetchNodeStateFromDownDB(options)
 	}
 
-	// produce list_all_nodes instructions
+	nodeStates := buildNodeStateList(&vdb, false /*forDownDatabase*/)
+	// return the result if no need to get version info
+	if !options.GetVersion {
+		return nodeStates, nil
+	}
+
+	// produce instructions to fill node information
 	instructions, err := vcc.produceListAllNodesInstructions(options, &vdb)
 	if err != nil {
 		return nil, fmt.Errorf("fail to produce instructions, %w", err)
@@ -102,7 +108,6 @@ func (vcc VClusterCommands) VFetchNodeState(options *VFetchNodeStateOptions) ([]
 
 	// give the instructions to the VClusterOpEngine to run
 	runError := clusterOpEngine.run(vcc.Log)
-	nodeStates := clusterOpEngine.execContext.nodesInfo
 	if runError == nil {
 		// fill node version
 		for i, nodeInfo := range nodeStates {
@@ -116,34 +121,9 @@ func (vcc VClusterCommands) VFetchNodeState(options *VFetchNodeStateOptions) ([]
 					nodeInfo.Address)
 			}
 		}
-
-		return nodeStates, nil
-	}
-
-	// error out in case of wrong certificate or password
-	if len(clusterOpEngine.execContext.hostsWithWrongAuth) > 0 {
-		return nodeStates,
-			fmt.Errorf("wrong certificate or password on hosts %v", clusterOpEngine.execContext.hostsWithWrongAuth)
-	}
-
-	// if failed to get node info from a running database,
-	// we will try to get it by reading catalog editor
-	upNodeCount := 0
-	for _, n := range nodeStates {
-		if n.State == util.NodeUpState {
-			upNodeCount++
-		}
-	}
-
-	if upNodeCount == 0 {
-		if options.SkipDownDatabase {
-			return []NodeInfo{}, rfc7807.New(rfc7807.FetchDownDatabase)
-		}
-
-		return vcc.fetchNodeStateFromDownDB(options)
 	}
 
-	return nodeStates, runError
+	return nodeStates, nil
 }
 
 func (vcc VClusterCommands) fetchNodeStateFromDownDB(options *VFetchNodeStateOptions) ([]NodeInfo, error) {
@@ -163,18 +143,7 @@ func (vcc VClusterCommands) fetchNodeStateFromDownDB(options *VFetchNodeStateOpt
 		return nodeStates, err
 	}
 
-	for _, h := range vdb.HostList {
-		var nodeInfo NodeInfo
-		n := vdb.HostNodeMap[h]
-		nodeInfo.Address = n.Address
-		nodeInfo.Name = n.Name
-		nodeInfo.CatalogPath = n.CatalogPath
-		nodeInfo.Subcluster = n.Subcluster
-		nodeInfo.IsPrimary = n.IsPrimary
-		nodeInfo.Version = n.Version
-		nodeInfo.State = util.NodeDownState
-		nodeStates = append(nodeStates, nodeInfo)
-	}
+	nodeStates = buildNodeStateList(&vdb, true /*forDownDatabase*/)
 
 	return nodeStates, nil
 }
@@ -186,73 +155,64 @@ func (vcc VClusterCommands) produceListAllNodesInstructions(
 	vdb *VCoordinationDatabase) ([]clusterOp, error) {
 	var instructions []clusterOp
 
-	// get hosts
-	hosts := options.Hosts
-
-	// validate user name
-	usePassword := false
-	if options.Password != nil {
-		usePassword = true
-		err := options.validateUserName(vcc.Log)
-		if err != nil {
-			return instructions, err
-		}
-	}
-
 	nmaHealthOp := makeNMAHealthOpSkipUnreachable(options.Hosts)
 	nmaReadVerticaVersionOp := makeNMAReadVerticaVersionOp(vdb)
 
-	// Trim host list
-	hosts = options.updateHostlist(vcc, vdb, hosts)
-
-	httpsCheckNodeStateOp, err := makeHTTPSCheckNodeStateOp(hosts,
-		usePassword, options.UserName, options.Password)
-	if err != nil {
-		return instructions, err
-	}
-
 	if options.GetVersion {
 		instructions = append(instructions,
 			&nmaHealthOp,
 			&nmaReadVerticaVersionOp)
 	}
 
-	instructions = append(instructions,
-		&httpsCheckNodeStateOp,
-	)
-
 	return instructions, nil
 }
 
-// Update and limit the hostlist based on status and sandbox info
-// Note: if we have any UP main cluster host in the input list, the trimmed hostlist would always contain
-//
-//	only main cluster UP hosts.
-func (options *VFetchNodeStateOptions) updateHostlist(vcc VClusterCommands, vdb *VCoordinationDatabase, inputHosts []string) []string {
-	var mainClusterHosts []string
-	var upSandboxHosts []string
-
-	for _, h := range inputHosts {
-		vnode, ok := vdb.HostNodeMap[h]
-		if !ok {
-			// host address not found in vdb, skip it
-			continue
+func buildNodeStateList(vdb *VCoordinationDatabase, forDownDatabase bool) []NodeInfo {
+	var nodeStates []NodeInfo
+
+	// a map from a subcluster name to whether it is primary
+	// Context: if a node is primary, the subcluster it belongs to is a primary subcluster.
+	// If any of the nodes are down in such a primary subcluster, HTTPSUpdateNodeStateOp cannot correctly
+	//   update its IsPrimary value, because this op sends request to each host.
+	// We use the following scMap to check whether any node is primary in each subcluster,
+	//   then update other nodes' IsPrimary value in this subcluster.
+	scMap := make(map[string]bool)
+
+	for _, h := range vdb.HostList {
+		var nodeInfo NodeInfo
+		n := vdb.HostNodeMap[h]
+		nodeInfo.Address = n.Address
+		nodeInfo.CatalogPath = n.CatalogPath
+		nodeInfo.IsPrimary = n.IsPrimary
+		nodeInfo.Name = n.Name
+		nodeInfo.Sandbox = n.Sandbox
+		if forDownDatabase {
+			nodeInfo.State = util.NodeDownState
+		} else {
+			nodeInfo.State = n.State
 		}
-		if vnode.Sandbox == "" && (vnode.State == util.NodeUpState || vnode.State == util.NodeUnknownState) {
-			mainClusterHosts = append(mainClusterHosts, vnode.Address)
-		} else if vnode.State == util.NodeUpState {
-			upSandboxHosts = append(upSandboxHosts, vnode.Address)
+		nodeInfo.Subcluster = n.Subcluster
+		nodeInfo.Version = n.Version
+
+		nodeStates = append(nodeStates, nodeInfo)
+
+		if !forDownDatabase {
+			if isPrimary, exists := scMap[n.Subcluster]; exists {
+				scMap[n.Subcluster] = isPrimary || n.IsPrimary
+			} else {
+				scMap[n.Subcluster] = n.IsPrimary
+			}
 		}
 	}
-	if len(mainClusterHosts) > 0 {
-		vcc.Log.PrintWarning("Main cluster UP node found in host list. The status would be fetched from a main cluster host!")
-		return mainClusterHosts
-	}
-	if len(upSandboxHosts) > 0 {
-		vcc.Log.PrintWarning("Only sandboxed UP nodes found in host list. The status would be fetched from a sandbox host!")
-		return upSandboxHosts
+
+	// update IsPrimary of the nodes for running database
+	if !forDownDatabase {
+		for i := 0; i < len(nodeStates); i++ {
+			nodeInfo := nodeStates[i]
+			scName := nodeInfo.Subcluster
+			nodeStates[i].IsPrimary = scMap[scName]
+		}
 	}
 
-	// We do not have an up host, so better try with complete input hostlist
-	return inputHosts
+	return nodeStates
 }