github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

*: replace 3600 seconds with 1 hour

Browse Source 
Signed-off-by: Samuel Karp <skarp@amazon.com>
This commit is contained in:
Samuel Karp 2018-08-02 11:39:14 -07:00
parent b8f4c7a9bd
commit 9665a2650a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ctr/commands/leases/leases.go
View File

@ -113,7 +113,7 @@ var createCommand = cli.Command{
cli.DurationFlag{ cli.DurationFlag{
Name: "expires, x", Name: "expires, x",
Usage: "expiration of lease (0 value will not expire)", Usage: "expiration of lease (0 value will not expire)",
Value: 24 * 3600 * time.Second, Value: 24 * time.Hour,
}, },
}, },
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {

2
lease.go
View File

@ -34,7 +34,7 @@ func (c *Client) WithLease(ctx context.Context) (context.Context, func(context.C
ls := c.LeasesService() ls := c.LeasesService()
l, err := ls.Create(ctx, leases.WithRandomID(), leases.WithExpiration(24*3600*time.Second)) l, err := ls.Create(ctx, leases.WithRandomID(), leases.WithExpiration(24*time.Hour))
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

4
metadata/content.go
View File

@ -420,12 +420,12 @@ func (cs *contentStore) Writer(ctx context.Context, opts ...content.WriterOpt) (
} }
if !leased { if !leased {
// Add timestamp to allow aborting once stale // Add timestamp to allow aborting once stale
// When lease is set the ingest shoudl be aborted // When lease is set the ingest should be aborted
// after lease it belonged to is deleted. // after lease it belonged to is deleted.
// Expiration can be configurable in the future to // Expiration can be configurable in the future to
// give more control to the daemon, however leases // give more control to the daemon, however leases
// already give users more control of expiration. // already give users more control of expiration.
expireAt := time.Now().UTC().Add(24 * 3600 * time.Second) expireAt := time.Now().UTC().Add(24 * time.Hour)
if err := writeExpireAt(expireAt, bkt); err != nil { if err := writeExpireAt(expireAt, bkt); err != nil {
return err return err
} }

6
metadata/gc_test.go
View File

@ -55,7 +55,7 @@ func TestGCRoots(t *testing.T) {
addContent("ns2", dgst(9), nil), addContent("ns2", dgst(9), nil),
addIngest("ns1", "ingest-1", "", nil), // will be seen as expired addIngest("ns1", "ingest-1", "", nil), // will be seen as expired
addIngest("ns1", "ingest-2", "", timeIn(0)), // expired addIngest("ns1", "ingest-2", "", timeIn(0)), // expired
addIngest("ns1", "ingest-3", "", timeIn(3600*time.Second)), addIngest("ns1", "ingest-3", "", timeIn(time.Hour)),
addIngest("ns2", "ingest-4", "", nil), addIngest("ns2", "ingest-4", "", nil),
addIngest("ns2", "ingest-5", dgst(8), nil), addIngest("ns2", "ingest-5", dgst(8), nil),
addIngest("ns2", "ingest-6", "", nil), // added to expired lease addIngest("ns2", "ingest-6", "", nil), // added to expired lease
@ -73,7 +73,7 @@ func TestGCRoots(t *testing.T) {
addLeaseSnapshot("ns2", "l2", "overlay", "sn6"), addLeaseSnapshot("ns2", "l2", "overlay", "sn6"),
addLeaseContent("ns2", "l1", dgst(4)), addLeaseContent("ns2", "l1", dgst(4)),
addLeaseContent("ns2", "l2", dgst(5)), addLeaseContent("ns2", "l2", dgst(5)),
addLease("ns2", "l3", labelmap(string(labelGCExpire), time.Now().Add(3600*time.Second).Format(time.RFC3339))), addLease("ns2", "l3", labelmap(string(labelGCExpire), time.Now().Add(time.Hour).Format(time.RFC3339))),
addLeaseContent("ns2", "l3", dgst(6)), addLeaseContent("ns2", "l3", dgst(6)),
addLeaseSnapshot("ns2", "l3", "overlay", "sn7"), addLeaseSnapshot("ns2", "l3", "overlay", "sn7"),
addLeaseIngest("ns2", "l3", "ingest-4"), addLeaseIngest("ns2", "l3", "ingest-4"),
@ -156,7 +156,7 @@ func TestGCRemove(t *testing.T) {
addSnapshot("ns1", "overlay", "sn3", "", labelmap(string(labelGCRoot), "always")), addSnapshot("ns1", "overlay", "sn3", "", labelmap(string(labelGCRoot), "always")),
addSnapshot("ns1", "overlay", "sn4", "", nil), addSnapshot("ns1", "overlay", "sn4", "", nil),
addSnapshot("ns2", "overlay", "sn1", "", nil), addSnapshot("ns2", "overlay", "sn1", "", nil),
addLease("ns1", "l1", labelmap(string(labelGCExpire), time.Now().Add(3600*time.Second).Format(time.RFC3339))), addLease("ns1", "l1", labelmap(string(labelGCExpire), time.Now().Add(time.Hour).Format(time.RFC3339))),
addLease("ns2", "l2", labelmap(string(labelGCExpire), time.Now().Format(time.RFC3339))), addLease("ns2", "l2", labelmap(string(labelGCExpire), time.Now().Format(time.RFC3339))),
} }