diff options
| author | John Cai <jcai@gitlab.com> | 2022-06-17 22:59:45 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-06-17 22:59:45 +0300 |
| commit | dfacb9cccdc9f5e023036575f6920cab9afbc762 (patch) | |
| tree | 62d1d39fa78b9f09859452349a81b4b59e1e070e | |
| parent | e63aef748b79946edb018d0256d0b28446499037 (diff) | |
| parent | cb0fb4c0ff91825e8a35c1dbf6a5795535b0d7bf (diff) | |
Merge branch 'wc-untracked-older-than' into 'master'
praefect: Don't overwrite '-older-than' flag
Closes #4294
See merge request gitlab-org/gitaly!4644
| -rw-r--r-- | cmd/praefect/subcmd_list_untracked_repositories.go | 2 | ||||
| -rw-r--r-- | cmd/praefect/subcmd_list_untracked_repositories_test.go | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmd/praefect/subcmd_list_untracked_repositories.go b/cmd/praefect/subcmd_list_untracked_repositories.go index 0d03fa84c..201af51c3 100644 --- a/cmd/praefect/subcmd_list_untracked_repositories.go +++ b/cmd/praefect/subcmd_list_untracked_repositories.go @@ -68,7 +68,7 @@ func (cmd listUntrackedRepositories) Exec(flags *flag.FlagSet, cfg config.Config ctx = metadata.AppendToOutgoingContext(ctx, "client_name", listUntrackedRepositoriesName) logger := cmd.logger.WithField("correlation_id", correlation.ExtractFromContext(ctx)) - logger.Debugf("starting %s command", cmd.FlagSet().Name()) + logger.Debugf("starting %s command", flags.Name()) logger.Debug("dialing to gitaly nodes...") nodeSet, err := dialGitalyStorages(ctx, cfg, defaultDialTimeout) diff --git a/cmd/praefect/subcmd_list_untracked_repositories_test.go b/cmd/praefect/subcmd_list_untracked_repositories_test.go index 83002cd82..1b8415a3b 100644 --- a/cmd/praefect/subcmd_list_untracked_repositories_test.go +++ b/cmd/praefect/subcmd_list_untracked_repositories_test.go @@ -90,7 +90,7 @@ func TestListUntrackedRepositories_Exec(t *testing.T) { out := &bytes.Buffer{} cmd := newListUntrackedRepositories(testhelper.NewDiscardingLogger(t), out) fs := cmd.FlagSet() - require.NoError(t, fs.Parse([]string{})) + require.NoError(t, fs.Parse([]string{"-older-than", "4h"})) // Repositories not managed by praefect. repo1, repo1Path := gittest.InitRepo(t, g1Cfg, g1Cfg.Storages[0]) @@ -99,12 +99,12 @@ func TestListUntrackedRepositories_Exec(t *testing.T) { require.NoError(t, os.Chtimes( repo1Path, - time.Now().Add(-(6*time.Hour+1*time.Second)), - time.Now().Add(-(6*time.Hour+1*time.Second)))) + time.Now().Add(-(4*time.Hour+1*time.Second)), + time.Now().Add(-(4*time.Hour+1*time.Second)))) require.NoError(t, os.Chtimes( repo2Path, - time.Now().Add(-(6*time.Hour+1*time.Second)), - time.Now().Add(-(6*time.Hour+1*time.Second)))) + time.Now().Add(-(4*time.Hour+1*time.Second)), + time.Now().Add(-(4*time.Hour+1*time.Second)))) require.NoError(t, cmd.Exec(fs, conf)) |