Sync from server repo (2220c12038e3)

.github/workflows/unittests.yaml

@@ -17,7 +17,7 @@ jobs:
       with:
         # When changing this, be sure to update the version at:
         # vertica/make/build-container/*Dockerfile
-        go-version: "1.20.13"
+        go-version: "1.22.5"
 
     - name: Run unit tests
       run: make vet lint test

Makefile

@@ -1,5 +1,7 @@
 default: help
 
+# Note: This file and siblings are under github.com/vertica/vcluster/
+
 ##@ General
 
 # The help target prints out all targets with their descriptions organized
@@ -47,14 +49,13 @@ $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
 GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
-# Make sure that whenever changing this, you also change
-# vertica/make/build-container/*Dockerfile
-GOLANGCI_LINT_VER ?= 1.54.2
+# see [sandbox]/__golint_version__.txt
+GOLANGCI_LINT_VERSION ?= 1.56.0
 
 .PHONY: golangci-lint $(GOLANGCI_LINT)
 golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint
 $(GOLANGCI_LINT): $(LOCALBIN)
-ifneq (${GOLANGCI_LINT_VER}, $(shell [ -f $(GOLANGCI_LINT) ] && $(GOLANGCI_LINT) version --format short 2>&1))
-	@echo "golangci-lint missing or not version '${GOLANGCI_LINT_VER}', downloading..."
-	curl --retry 10 --retry-max-time 1800 -sSfL "https://raw.githubusercontent.com/golangci/golangci-lint/v${GOLANGCI_LINT_VER}/install.sh" | sh -s -- -b ./bin "v${GOLANGCI_LINT_VER}"
+ifneq (${GOLANGCI_LINT_VERSION}, $(shell [ -f $(GOLANGCI_LINT) ] && $(GOLANGCI_LINT) version --format short 2>&1))
+	@echo "golangci-lint missing or not version '${GOLANGCI_LINT_VERSION}', downloading..."
+	curl --retry 10 --retry-max-time 1800 -sSfL "https://raw.githubusercontent.com/golangci/golangci-lint/v${GOLANGCI_LINT_VERSION}/install.sh" | sh -s -- -b ./bin "v${GOLANGCI_LINT_VERSION}"
 endif

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/cluster_command_launcher.go

@@ -59,6 +59,8 @@ const (
 	dataPathKey                 = "dataPath"
 	communalStorageLocationFlag = "communal-storage-location"
 	communalStorageLocationKey  = "communalStorageLocation"
+	archiveNameFlag             = "archive-name"
+	archiveNameKey              = "archiveName"
 	ipv6Flag                    = "ipv6"
 	ipv6Key                     = "ipv6"
 	eonModeFlag                 = "eon-mode"
@@ -118,8 +120,18 @@ const (
 	targetPasswordFileKey  = "targetPasswordFile"
 	targetConnFlag         = "target-conn"
 	targetConnKey          = "targetConn"
+	asyncFlag              = "async"
+	asyncKey               = "async"
 	sourceTLSConfigFlag    = "source-tlsconfig"
 	sourceTLSConfigKey     = "sourceTLSConfig"
+	tableOrSchemaNameFlag  = "table-or-schema-name"
+	tableOrSchemaNameKey   = "tableOrSchemaName"
+	includePatternFlag     = "include-pattern"
+	includePatternKey      = "includePattern"
+	excludePatternFlag     = "exclude-pattern"
+	excludePatternKey      = "excludePattern"
+	targetNamespaceFlag    = "target-namespace"
+	targetNamespaceKey     = "targetNamespace"
 )
 
 // flags to viper key map
@@ -146,11 +158,17 @@ var flagKeyMap = map[string]string{
 	verboseFlag:                 verboseKey,
 	outputFileFlag:              outputFileKey,
 	sandboxFlag:                 sandboxKey,
+	archiveNameFlag:             archiveNameKey,
 	targetDBNameFlag:            targetDBNameKey,
 	targetHostsFlag:             targetHostsKey,
 	targetUserNameFlag:          targetUserNameKey,
 	targetPasswordFileFlag:      targetPasswordFileKey,
+	asyncFlag:                   asyncKey,
 	sourceTLSConfigFlag:         sourceTLSConfigKey,
+	tableOrSchemaNameFlag:       tableOrSchemaNameKey,
+	includePatternFlag:          includePatternKey,
+	excludePatternFlag:          excludePatternKey,
+	targetNamespaceFlag:         targetNamespaceKey,
 }
 
 // target database flags to viper key map
@@ -198,7 +216,10 @@ const (
 	showRestorePointsSubCmd = "show_restore_points"
 	installPkgSubCmd        = "install_packages"
 	// hidden Cmds (for internal testing only)
-	promoteSandboxSubCmd = "promote_sandbox"
+	promoteSandboxSubCmd    = "promote_sandbox"
+	createArchiveCmd        = "create_archive"
+	saveRestorePointsSubCmd = "save_restore_point"
+	getDrainingStatusSubCmd = "get_draining_status"
 )
 
 // cmdGlobals holds global variables shared by multiple
@@ -562,9 +583,10 @@ func constructCmds() []*cobra.Command {
 		makeCmdReplication(),
 		makeCmdCreateConnection(),
 		// hidden cmds (for internal testing only)
+		makeCmdGetDrainingStatus(),
 		makeCmdPromoteSandbox(),
-
-		makeCmdCheckVClusterServerPid(),
+		makeCmdCreateArchive(),
+		makeCmdSaveRestorePoint(),
 	}
 }
 

commands/cmd_add_node.go

@@ -104,9 +104,7 @@ func (c *CmdAddNode) setLocalFlags(cmd *cobra.Command) {
 		&c.addNodeOptions.DepotSize,
 		"depot-size",
 		"",
-		util.GetEonFlagMsg("Size of depot in one of the following formats:\n"+
-			"integer{K|M|G|T}, where K is kilobytes, M is megabytes, G is gigabytes, and T is terabytes.\n"+
-			"integer%, which expresses the depot size as a percentage of the total disk size."),
+		util.GetEonFlagMsg(util.DepotFmtMsg+util.DepotSizeKMGTMsg+util.DepotSizeHint),
 	)
 	cmd.Flags().StringVar(
 		&c.nodeNameListStr,

commands/cmd_add_subcluster.go

@@ -132,8 +132,7 @@ func (c *CmdAddSubcluster) setLocalFlags(cmd *cobra.Command) {
 		&c.addSubclusterOptions.DepotSize,
 		"depot-size",
 		"",
-		util.GetEonFlagMsg("Size of depot in one of the following formats:\n"+
-			"integer{K|M|G|T}, where K is kilobytes, M is megabytes, G is gigabytes, and T is terabytes.\n"+
+		util.GetEonFlagMsg(util.DepotFmtMsg+util.DepotSizeKMGTMsg+
 			"integer%, which expresses the depot size as a percentage of the total disk size.\n"),
 	)
 }