vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #704 from stevvooe/simplify-image-service

Browse source 
services/images: simplify transaction management
This commit is contained in:
Stephen Day 2017-04-07 11:20:17 -07:00 committed by GitHub
commit 87f8f8c94b
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
services/images/service.go
View file

@ -35,7 +35,7 @@ func (s *Service) Register(server *grpc.Server) error {
func (s *Service) Get(ctx context.Context, req *imagesapi.GetRequest) (*imagesapi.GetResponse, error) { func (s *Service) Get(ctx context.Context, req *imagesapi.GetRequest) (*imagesapi.GetResponse, error) {
var resp imagesapi.GetResponse var resp imagesapi.GetResponse
return &resp, s.withStoreTx(ctx, req.Name, false, func(ctx context.Context, store images.Store) error { return &resp, s.withStoreView(ctx, func(ctx context.Context, store images.Store) error {
image, err := store.Get(ctx, req.Name) image, err := store.Get(ctx, req.Name)
if err != nil { if err != nil {
return mapGRPCError(err, req.Name) return mapGRPCError(err, req.Name)
@ -47,7 +47,7 @@ func (s *Service) Get(ctx context.Context, req *imagesapi.GetRequest) (*imagesap
} }
func (s *Service) Put(ctx context.Context, req *imagesapi.PutRequest) (*empty.Empty, error) { func (s *Service) Put(ctx context.Context, req *imagesapi.PutRequest) (*empty.Empty, error) {
return &empty.Empty{}, s.withStoreTx(ctx, req.Image.Name, true, func(ctx context.Context, store images.Store) error { return &empty.Empty{}, s.withStoreUpdate(ctx, func(ctx context.Context, store images.Store) error {
return mapGRPCError(store.Put(ctx, req.Image.Name, descFromProto(&req.Image.Target)), req.Image.Name) return mapGRPCError(store.Put(ctx, req.Image.Name, descFromProto(&req.Image.Target)), req.Image.Name)
}) })
} }
@ -55,7 +55,7 @@ func (s *Service) Put(ctx context.Context, req *imagesapi.PutRequest) (*empty.Em
func (s *Service) List(ctx context.Context, _ *imagesapi.ListRequest) (*imagesapi.ListResponse, error) { func (s *Service) List(ctx context.Context, _ *imagesapi.ListRequest) (*imagesapi.ListResponse, error) {
var resp imagesapi.ListResponse var resp imagesapi.ListResponse
return &resp, s.withStoreTx(ctx, "", false, func(ctx context.Context, store images.Store) error { return &resp, s.withStoreView(ctx, func(ctx context.Context, store images.Store) error {
images, err := store.List(ctx) images, err := store.List(ctx)
if err != nil { if err != nil {
return mapGRPCError(err, "") return mapGRPCError(err, "")
@ -67,25 +67,19 @@ func (s *Service) List(ctx context.Context, _ *imagesapi.ListRequest) (*imagesap
} }
func (s *Service) Delete(ctx context.Context, req *imagesapi.DeleteRequest) (*empty.Empty, error) { func (s *Service) Delete(ctx context.Context, req *imagesapi.DeleteRequest) (*empty.Empty, error) {
return &empty.Empty{}, s.withStoreTx(ctx, req.Name, true, func(ctx context.Context, store images.Store) error { return &empty.Empty{}, s.withStoreUpdate(ctx, func(ctx context.Context, store images.Store) error {
return mapGRPCError(store.Delete(ctx, req.Name), req.Name) return mapGRPCError(store.Delete(ctx, req.Name), req.Name)
}) })
} }
func (s *Service) withStoreTx(ctx context.Context, id string, writable bool, fn func(ctx context.Context, store images.Store) error) error { func (s *Service) withStore(ctx context.Context, fn func(ctx context.Context, store images.Store) error) func(tx *bolt.Tx) error {
tx, err := s.db.Begin(writable) return func(tx *bolt.Tx) error { return fn(ctx, images.NewImageStore(tx)) }
if err != nil {
return mapGRPCError(err, id)
}
defer tx.Rollback()
if err := fn(ctx, images.NewImageStore(tx)); err != nil {
return err
} }
if writable { func (s *Service) withStoreView(ctx context.Context, fn func(ctx context.Context, store images.Store) error) error {
return tx.Commit() return s.db.View(s.withStore(ctx, fn))
} }
return nil func (s *Service) withStoreUpdate(ctx context.Context, fn func(ctx context.Context, store images.Store) error) error {
return s.db.Update(s.withStore(ctx, fn))
} }