mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-05 13:05:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into data-mover-ms-node-agent-resume

Browse Source 
Signed-off-by: lyndon-li <98304688+Lyndon-Li@users.noreply.github.com>
This commit is contained in:
lyndon-li
2024-08-07 17:13:35 +08:00
committed by GitHub
parent 3b06d915ca dd3d05bbac
commit 60f5ad5cf4
12 changed files with 101 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cmd/cli/datamover/backup.go
View File

@@ -207,8 +207,7 @@ func (s *dataMoverBackup) run() {
}
}()
// TODOOO: call s.runDataPath()
time.Sleep(time.Duration(1<<63 - 1))
s.runDataPath()
}
func (s *dataMoverBackup) runDataPath() {

3
pkg/cmd/cli/datamover/restore.go
View File

@@ -198,8 +198,7 @@ func (s *dataMoverRestore) run() {
}
}()
// TODOOO: call s.runDataPath()
time.Sleep(time.Duration(1<<63 - 1))
s.runDataPath()
}
func (s *dataMoverRestore) runDataPath() {

2
pkg/cmd/cli/nodeagent/server.go
View File

@@ -104,7 +104,7 @@ func NewServerCommand(f client.Factory) *cobra.Command {
logLevel := logLevelFlag.Parse()
logrus.Infof("Setting log-level to %s", strings.ToUpper(logLevel.String()))
logger := logging.DefaultLogger(logLevel, formatFlag.Parse())
logger := logging.DefaultMergeLogger(logLevel, formatFlag.Parse())
logger.Infof("Starting Velero node-agent server %s (%s)", buildinfo.Version, buildinfo.FormattedGitSHA())
f.SetBasename(fmt.Sprintf("%s-%s", c.Parent().Name(), c.Name()))