From 04d3ca7fe438b34d4efdeb6eceb1dcda4bd49002 Mon Sep 17 00:00:00 2001 From: Richard Scothern Date: Wed, 23 Mar 2016 17:23:18 -0700 Subject: [PATCH 1/2] Update AUTHORS Signed-off-by: Richard Scothern --- AUTHORS | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index aa6f138a..0857b62f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,12 +8,15 @@ Alex Elman amitshukla Amy Lindburg Andrew Meredith +Andrew T Nguyen Andrey Kostov Andy Goldstein Anton Tiurin Antonio Mercado +Antonio Murdaca Arnaud Porterie Arthur Baars +Asuka Suzuki Avi Miller Ayose Cazorla BadZen @@ -37,7 +40,9 @@ Diogo Mónica DJ Enriquez Donald Huang Doug Davis +Eric Yang farmerworking +Felix Yan Florentin Raud Frederick F. Kautz IV gabriell nascimento @@ -45,29 +50,36 @@ harche Henri Gomez Hu Keping Hua Wang +HuKeping Ian Babrou +igayoso Jack Griffin Jason Freidman Jeff Nickoloff Jessie Frazelle Jianqing Wang +John Starks Jon Poler Jonathan Boulle Jordan Liggitt Josh Hawn Julien Fernandez +Keerthan Mala Kelsey Hightower Kenneth Lim Kenny Leung Li Yi Liu Hua +liuchang0812 Louis Kottmann Luke Carpenter Mary Anthony Matt Bentley +Matt Duch Matt Moore Matt Robenolt Michael Prokop +Michal Minar Miquel Sabaté Morgan Bauer moxiegirl @@ -78,6 +90,7 @@ Nuutti Kotivuori Oilbeater Olivier Gambier Olivier Jacques +Omer Cohen Patrick Devine Philip Misiowiec Richard Scothern @@ -90,6 +103,7 @@ Shawn Falkner-Horine Shreyas Karnik Simon Thulbourn Spencer Rinehart +Stefan Weil Stephen J Day Sungho Moon Sven Dowideit @@ -110,4 +124,5 @@ weiyuan.yl xg.song xiekeyang Yann ROBERT -yuzou \ No newline at end of file +yuzou +姜继忠 From c6b8499d62f8c508e5dc706f58f882c1dd9daffb Mon Sep 17 00:00:00 2001 From: Tony Holdstock-Brown Date: Thu, 24 Mar 2016 11:33:01 -0700 Subject: [PATCH 2/2] utulize config log format within gc Signed-off-by: Tony Holdstock-Brown --- registry/garbagecollect.go | 13 +++++++++---- registry/garbagecollect_test.go | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/registry/garbagecollect.go b/registry/garbagecollect.go index 5e165aea..add25a73 100644 --- a/registry/garbagecollect.go +++ b/registry/garbagecollect.go @@ -17,9 +17,7 @@ import ( "github.com/spf13/cobra" ) -func markAndSweep(storageDriver driver.StorageDriver) error { - ctx := context.Background() - +func markAndSweep(ctx context.Context, storageDriver driver.StorageDriver) error { // Construct a registry registry, err := storage.NewRegistry(ctx, storageDriver) if err != nil { @@ -141,7 +139,14 @@ var GCCmd = &cobra.Command{ os.Exit(1) } - err = markAndSweep(driver) + ctx := context.Background() + ctx, err = configureLogging(ctx, config) + if err != nil { + fmt.Fprintf(os.Stderr, "unable to configure logging with config: %s", err) + os.Exit(1) + } + + err = markAndSweep(ctx, driver) if err != nil { fmt.Fprintf(os.Stderr, "failed to garbage collect: %v", err) os.Exit(1) diff --git a/registry/garbagecollect_test.go b/registry/garbagecollect_test.go index 951a9e81..6096e758 100644 --- a/registry/garbagecollect_test.go +++ b/registry/garbagecollect_test.go @@ -161,7 +161,7 @@ func TestNoDeletionNoEffect(t *testing.T) { } // Run GC - err = markAndSweep(inmemoryDriver) + err = markAndSweep(context.Background(), inmemoryDriver) if err != nil { t.Fatalf("Failed mark and sweep: %v", err) } @@ -193,7 +193,7 @@ func TestDeletionHasEffect(t *testing.T) { manifests.Delete(ctx, image3.manifestDigest) // Run GC - err = markAndSweep(inmemoryDriver) + err = markAndSweep(context.Background(), inmemoryDriver) if err != nil { t.Fatalf("Failed mark and sweep: %v", err) } @@ -327,7 +327,7 @@ func TestOrphanBlobDeleted(t *testing.T) { uploadRandomSchema2Image(t, repo) // Run GC - err = markAndSweep(inmemoryDriver) + err = markAndSweep(context.Background(), inmemoryDriver) if err != nil { t.Fatalf("Failed mark and sweep: %v", err) }