Merge branch 'jc-add-repository-info' into 'master'

Add GetObjectPool RPC

See merge request gitlab-org/gitaly!1583

10 files changed, 499 insertions, 70 deletions

diff --git a/changelogs/unreleased/jc-add-repository-info.yml b/changelogs/unreleased/jc-add-repository-info.yml
new file mode 100644
index 000000000..8df804caf
--- /dev/null
+++ b/changelogs/unreleased/jc-add-repository-info.yml
@@ -0,0 +1,5 @@
+---
+title: Add GetObjectPool RPC
+merge_request: 1583
+author:
+type: added
diff --git a/internal/git/objectpool/link.go b/internal/git/objectpool/link.go
index 92edeca99..9f062cb0c 100644
--- a/internal/git/objectpool/link.go
+++ b/internal/git/objectpool/link.go
@@ -1,7 +1,6 @@
 package objectpool
 
 import (
-	"bufio"
 	"context"
 	"errors"
 	"fmt"
@@ -13,7 +12,6 @@ import (
 
 	"gitlab.com/gitlab-org/gitaly/internal/git/remote"
 	"gitlab.com/gitlab-org/gitaly/internal/git/repository"
-	"gitlab.com/gitlab-org/gitaly/internal/helper/text"
 
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
@@ -29,23 +27,18 @@ func (o *ObjectPool) Link(ctx context.Context, repo *gitalypb.Repository) error
 		return err
 	}
 
-	relPath, err := o.getRelativeObjectPath(repo)
+	expectedRelPath, err := o.getRelativeObjectPath(repo)
 	if err != nil {
 		return err
 	}
 
-	expectedContent := filepath.Join(relPath, "objects")
-
-	actualContentBytes, err := ioutil.ReadFile(altPath)
-	if err == nil {
-		actualContent := text.ChompBytes(actualContentBytes)
-		if actualContent == expectedContent {
-			return nil
-		}
+	linked, err := o.LinkedToRepository(repo)
+	if err != nil {
+		return err
+	}
 
-		if filepath.Clean(actualContent) != filepath.Join(o.FullPath(), "objects") {
-			return fmt.Errorf("unexpected alternates content: %q", actualContent)
-		}
+	if linked {
+		return nil
 	}
 
 	if err != nil && !os.IsNotExist(err) {
@@ -58,7 +51,7 @@ func (o *ObjectPool) Link(ctx context.Context, repo *gitalypb.Repository) error
 	}
 	defer os.Remove(tmp.Name())
 
-	if _, err := io.WriteString(tmp, expectedContent); err != nil {
+	if _, err := io.WriteString(tmp, expectedRelPath); err != nil {
 		return err
 	}
 
@@ -142,36 +135,30 @@ func (o *ObjectPool) getRelativeObjectPath(repo *gitalypb.Repository) (string, e
 		return "", err
 	}
 
-	return relPath, nil
+	return filepath.Join(relPath, "objects"), nil
 }
 
 // LinkedToRepository tests if a repository is linked to an object pool
 func (o *ObjectPool) LinkedToRepository(repo *gitalypb.Repository) (bool, error) {
-	altPath, err := git.InfoAlternatesPath(repo)
+	relPath, err := getAlternateObjectDir(repo)
 	if err != nil {
+		if err == ErrAlternateObjectDirNotExist {
+			return false, nil
+		}
 		return false, err
 	}
 
-	relPath, err := o.getRelativeObjectPath(repo)
+	expectedRelPath, err := o.getRelativeObjectPath(repo)
 	if err != nil {
 		return false, err
 	}
 
-	if stat, err := os.Stat(altPath); err == nil && stat.Size() > 0 {
-		alternatesFile, err := os.Open(altPath)
-		if err != nil {
-			return false, err
-		}
-		defer alternatesFile.Close()
-
-		r := bufio.NewReader(alternatesFile)
-
-		b, err := r.ReadBytes('\n')
-		if err != nil && err != io.EOF {
-			return false, fmt.Errorf("reading alternates file: %v", err)
-		}
+	if relPath == expectedRelPath {
+		return true, nil
+	}
 
-		return string(b) == filepath.Join(relPath, "objects"), nil
+	if filepath.Clean(relPath) != filepath.Join(o.FullPath(), "objects") {
+		return false, fmt.Errorf("unexpected alternates content: %q", relPath)
 	}
 
 	return false, nil
diff --git a/internal/git/objectpool/pool.go b/internal/git/objectpool/pool.go
index 4a44bf6bc..5674421ab 100644
--- a/internal/git/objectpool/pool.go
+++ b/internal/git/objectpool/pool.go
@@ -1,10 +1,15 @@
 package objectpool
 
 import (
+	"bufio"
+	"bytes"
 	"context"
+	"errors"
 	"fmt"
+	"io"
 	"os"
 	"path"
+	"path/filepath"
 
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
@@ -111,3 +116,96 @@ func (o *ObjectPool) Init(ctx context.Context) (err error) {
 
 	return cmd.Wait()
 }
+
+// FromRepo returns an instance of ObjectPool that the repository points to
+func FromRepo(repo *gitalypb.Repository) (*ObjectPool, error) {
+	dir, err := getAlternateObjectDir(repo)
+	if err != nil {
+		return nil, err
+	}
+
+	if dir == "" {
+		return nil, nil
+	}
+
+	altPathRelativeToStorage, err := objectPathRelativeToStorage(repo, dir)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewObjectPool(repo.GetStorageName(), filepath.Dir(altPathRelativeToStorage))
+}
+
+var (
+	// ErrInvalidPoolRepository indicates the directory the alternates file points to is not a valid git repository
+	ErrInvalidPoolRepository = errors.New("object pool is not a valid git repository")
+
+	// ErrAlternateObjectDirNotExist indicates a repository does not have an alternates file
+	ErrAlternateObjectDirNotExist = errors.New("no alternates directory exists")
+)
+
+// getAlternateObjectDir returns the entry in the objects/info/attributes file if it exists
+// it will only return the first line of the file if there are multiple lines.
+func getAlternateObjectDir(repo *gitalypb.Repository) (string, error) {
+	altPath, err := git.InfoAlternatesPath(repo)
+	if err != nil {
+		return "", err
+	}
+
+	if _, err = os.Stat(altPath); err != nil {
+		if os.IsNotExist(err) {
+			return "", ErrAlternateObjectDirNotExist
+		}
+		return "", err
+	}
+
+	altFile, err := os.Open(altPath)
+	if err != nil {
+		return "", err
+	}
+	defer altFile.Close()
+
+	r := bufio.NewReader(altFile)
+	b, err := r.ReadBytes('\n')
+	if err != nil && err != io.EOF {
+		return "", fmt.Errorf("reading alternates file: %v", err)
+	}
+
+	if err == nil {
+		b = b[:len(b)-1]
+	}
+
+	if bytes.HasPrefix(b, []byte("#")) {
+		return "", ErrAlternateObjectDirNotExist
+	}
+
+	return string(b), nil
+}
+
+// objectPathRelativeToStorage takes an object path that's relative to a repository's object directory
+// and returns the path relative to the storage path of the repository.
+func objectPathRelativeToStorage(repo *gitalypb.Repository, path string) (string, error) {
+	repoPath, err := helper.GetPath(repo)
+	if err != nil {
+		return "", err
+	}
+
+	storagePath, err := helper.GetStorageByName(repo.GetStorageName())
+	if err != nil {
+		return "", err
+	}
+	objectDirPath := filepath.Join(repoPath, "objects")
+
+	poolObjectDirFullPath := filepath.Join(objectDirPath, path)
+
+	if !helper.IsGitDirectory(filepath.Dir(poolObjectDirFullPath)) {
+		return "", ErrInvalidPoolRepository
+	}
+
+	poolRelPath, err := filepath.Rel(storagePath, poolObjectDirFullPath)
+	if err != nil {
+		return "", err
+	}
+
+	return poolRelPath, nil
+}
diff --git a/internal/git/objectpool/pool_test.go b/internal/git/objectpool/pool_test.go
index e609f5027..530ccee94 100644
--- a/internal/git/objectpool/pool_test.go
+++ b/internal/git/objectpool/pool_test.go
@@ -1,8 +1,10 @@
 package objectpool
 
 import (
+	"io/ioutil"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -19,6 +21,74 @@ func TestNewObjectPool(t *testing.T) {
 	require.Error(t, err, "creating pool in storage that does not exist should fail")
 }
 
+func TestNewFromRepoSuccess(t *testing.T) {
+	ctx, cancel := testhelper.Context()
+	testRepo, _, cleanup := testhelper.NewTestRepo(t)
+	defer cleanup()
+
+	relativePoolPath := testhelper.NewTestObjectPoolName(t)
+
+	pool, err := NewObjectPool(testRepo.GetStorageName(), relativePoolPath)
+	require.NoError(t, err)
+	defer pool.Remove(ctx)
+
+	defer cancel()
+	require.NoError(t, pool.Create(ctx, testRepo))
+	require.NoError(t, pool.Link(ctx, testRepo))
+
+	poolFromRepo, err := FromRepo(testRepo)
+	require.NoError(t, err)
+	require.Equal(t, relativePoolPath, poolFromRepo.relativePath)
+	require.Equal(t, pool.storageName, poolFromRepo.storageName)
+}
+
+func TestNewFromRepoNoObjectPool(t *testing.T) {
+	testRepo, testRepoPath, cleanup := testhelper.NewTestRepo(t)
+	defer cleanup()
+
+	// no alternates file
+	poolFromRepo, err := FromRepo(testRepo)
+	require.Equal(t, ErrAlternateObjectDirNotExist, err)
+	require.Nil(t, poolFromRepo)
+
+	// with an alternates file
+	testCases := []struct {
+		desc        string
+		fileContent []byte
+		expectedErr error
+	}{
+		{
+			desc:        "points to non existent path",
+			fileContent: []byte("/tmp/invalid_path"),
+			expectedErr: ErrInvalidPoolRepository,
+		},
+		{
+			desc:        "empty file",
+			fileContent: nil,
+			expectedErr: nil,
+		},
+		{
+			desc:        "first line commented out",
+			fileContent: []byte("#/tmp/invalid/path"),
+			expectedErr: ErrAlternateObjectDirNotExist,
+		},
+	}
+
+	require.NoError(t, os.MkdirAll(filepath.Join(testRepoPath, "objects", "info"), 0755))
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			alternateFilePath := filepath.Join(testRepoPath, "objects", "info", "alternates")
+			require.NoError(t, ioutil.WriteFile(alternateFilePath, tc.fileContent, 0644))
+			poolFromRepo, err := FromRepo(testRepo)
+			require.Equal(t, tc.expectedErr, err)
+			require.Nil(t, poolFromRepo)
+
+			require.NoError(t, os.Remove(alternateFilePath))
+		})
+	}
+}
+
 func TestCreate(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
diff --git a/internal/service/objectpool/get.go b/internal/service/objectpool/get.go
new file mode 100644
index 000000000..c04d27139
--- /dev/null
+++ b/internal/service/objectpool/get.go
@@ -0,0 +1,35 @@
+package objectpool
+
+import (
+	"context"
+	"errors"
+
+	grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
+	"gitlab.com/gitlab-org/gitaly/internal/git/objectpool"
+	"gitlab.com/gitlab-org/gitaly/internal/helper"
+	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
+)
+
+func (s *server) GetObjectPool(ctx context.Context, in *gitalypb.GetObjectPoolRequest) (*gitalypb.GetObjectPoolResponse, error) {
+	if in.GetRepository() == nil {
+		return nil, helper.ErrInternal(errors.New("repository is empty"))
+	}
+
+	objectPool, err := objectpool.FromRepo(in.GetRepository())
+
+	if err != nil {
+		grpc_logrus.Extract(ctx).
+			WithError(err).
+			WithField("storage", in.GetRepository().GetStorageName()).
+			WithField("storage", in.GetRepository().GetRelativePath()).
+			Warn("alternates file does not point to valid git repository")
+	}
+
+	if objectPool == nil {
+		return &gitalypb.GetObjectPoolResponse{}, nil
+	}
+
+	return &gitalypb.GetObjectPoolResponse{
+		ObjectPool: objectPool.ToProto(),
+	}, nil
+}
diff --git a/internal/service/objectpool/get_test.go b/internal/service/objectpool/get_test.go
new file mode 100644
index 000000000..392758fd3
--- /dev/null
+++ b/internal/service/objectpool/get_test.go
@@ -0,0 +1,91 @@
+package objectpool
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"gitlab.com/gitlab-org/gitaly/internal/git/objectpool"
+	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
+)
+
+func TestGetObjectPoolSuccess(t *testing.T) {
+	server, serverSocketPath := runObjectPoolServer(t)
+	defer server.Stop()
+
+	client, conn := newObjectPoolClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	relativePoolPath := testhelper.NewTestObjectPoolName(t)
+
+	pool, err := objectpool.NewObjectPool(testRepo.GetStorageName(), relativePoolPath)
+	require.NoError(t, err)
+
+	poolCtx, cancel := testhelper.Context()
+	defer cancel()
+	require.NoError(t, pool.Create(poolCtx, testRepo))
+	require.NoError(t, pool.Link(poolCtx, testRepo))
+
+	ctx, cancel := testhelper.Context()
+	defer pool.Remove(ctx)
+	defer cancel()
+
+	resp, err := client.GetObjectPool(ctx, &gitalypb.GetObjectPoolRequest{
+		Repository: testRepo,
+	})
+
+	require.NoError(t, err)
+	require.Equal(t, relativePoolPath, resp.GetObjectPool().GetRepository().GetRelativePath())
+}
+
+func TestGetObjectPoolNoFile(t *testing.T) {
+	server, serverSocketPath := runObjectPoolServer(t)
+	defer server.Stop()
+
+	client, conn := newObjectPoolClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	resp, err := client.GetObjectPool(ctx, &gitalypb.GetObjectPoolRequest{
+		Repository: testRepo,
+	})
+
+	require.NoError(t, err)
+	require.Nil(t, resp.GetObjectPool())
+}
+
+func TestGetObjectPoolBadFile(t *testing.T) {
+	server, serverSocketPath := runObjectPoolServer(t)
+	defer server.Stop()
+
+	client, conn := newObjectPoolClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	alternatesFilePath := filepath.Join(testRepoPath, "objects", "info", "alternates")
+	require.NoError(t, os.MkdirAll(filepath.Dir(alternatesFilePath), 0755))
+	require.NoError(t, ioutil.WriteFile(alternatesFilePath, []byte("not-a-directory"), 0644))
+
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	resp, err := client.GetObjectPool(ctx, &gitalypb.GetObjectPoolRequest{
+		Repository: testRepo,
+	})
+
+	require.NoError(t, err)
+	require.Nil(t, resp.GetObjectPool())
+}
diff --git a/proto/go/gitalypb/objectpool.pb.go b/proto/go/gitalypb/objectpool.pb.go
index 2fa353791..5fd046192 100644
--- a/proto/go/gitalypb/objectpool.pb.go
+++ b/proto/go/gitalypb/objectpool.pb.go
@@ -562,6 +562,84 @@ func (m *FetchIntoObjectPoolResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_FetchIntoObjectPoolResponse proto.InternalMessageInfo
 
+type GetObjectPoolRequest struct {
+	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *GetObjectPoolRequest) Reset()         { *m = GetObjectPoolRequest{} }
+func (m *GetObjectPoolRequest) String() string { return proto.CompactTextString(m) }
+func (*GetObjectPoolRequest) ProtoMessage()    {}
+func (*GetObjectPoolRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_949871727a345eae, []int{14}
+}
+
+func (m *GetObjectPoolRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetObjectPoolRequest.Unmarshal(m, b)
+}
+func (m *GetObjectPoolRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetObjectPoolRequest.Marshal(b, m, deterministic)
+}
+func (m *GetObjectPoolRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetObjectPoolRequest.Merge(m, src)
+}
+func (m *GetObjectPoolRequest) XXX_Size() int {
+	return xxx_messageInfo_GetObjectPoolRequest.Size(m)
+}
+func (m *GetObjectPoolRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetObjectPoolRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetObjectPoolRequest proto.InternalMessageInfo
+
+func (m *GetObjectPoolRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+type GetObjectPoolResponse struct {
+	ObjectPool           *ObjectPool `protobuf:"bytes,1,opt,name=object_pool,json=objectPool,proto3" json:"object_pool,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *GetObjectPoolResponse) Reset()         { *m = GetObjectPoolResponse{} }
+func (m *GetObjectPoolResponse) String() string { return proto.CompactTextString(m) }
+func (*GetObjectPoolResponse) ProtoMessage()    {}
+func (*GetObjectPoolResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_949871727a345eae, []int{15}
+}
+
+func (m *GetObjectPoolResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetObjectPoolResponse.Unmarshal(m, b)
+}
+func (m *GetObjectPoolResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetObjectPoolResponse.Marshal(b, m, deterministic)
+}
+func (m *GetObjectPoolResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetObjectPoolResponse.Merge(m, src)
+}
+func (m *GetObjectPoolResponse) XXX_Size() int {
+	return xxx_messageInfo_GetObjectPoolResponse.Size(m)
+}
+func (m *GetObjectPoolResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetObjectPoolResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetObjectPoolResponse proto.InternalMessageInfo
+
+func (m *GetObjectPoolResponse) GetObjectPool() *ObjectPool {
+	if m != nil {
+		return m.ObjectPool
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*CreateObjectPoolRequest)(nil), "gitaly.CreateObjectPoolRequest")
 	proto.RegisterType((*CreateObjectPoolResponse)(nil), "gitaly.CreateObjectPoolResponse")
@@ -577,47 +655,52 @@ func init() {
 	proto.RegisterType((*DisconnectGitAlternatesResponse)(nil), "gitaly.DisconnectGitAlternatesResponse")
 	proto.RegisterType((*FetchIntoObjectPoolRequest)(nil), "gitaly.FetchIntoObjectPoolRequest")
 	proto.RegisterType((*FetchIntoObjectPoolResponse)(nil), "gitaly.FetchIntoObjectPoolResponse")
+	proto.RegisterType((*GetObjectPoolRequest)(nil), "gitaly.GetObjectPoolRequest")
+	proto.RegisterType((*GetObjectPoolResponse)(nil), "gitaly.GetObjectPoolResponse")
 }
 
 func init() { proto.RegisterFile("objectpool.proto", fileDescriptor_949871727a345eae) }
 
 var fileDescriptor_949871727a345eae = []byte{
-	// 557 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcd, 0x6e, 0xd3, 0x40,
-	0x14, 0x85, 0x35, 0xad, 0x08, 0xe1, 0xa6, 0x42, 0x61, 0x10, 0x24, 0x1a, 0x68, 0x93, 0x0e, 0x6d,
-	0x31, 0x95, 0xea, 0x10, 0xf7, 0x09, 0x80, 0xaa, 0x08, 0x09, 0x01, 0x32, 0x65, 0xc3, 0x06, 0x39,
-	0xee, 0x55, 0x6a, 0xea, 0x7a, 0xcc, 0x78, 0x82, 0x54, 0xb6, 0x6c, 0x41, 0x62, 0x83, 0xf2, 0x52,
-	0x3c, 0x51, 0x56, 0x28, 0xf6, 0x24, 0xce, 0xdf, 0x24, 0x56, 0xdb, 0x9d, 0x6d, 0x9d, 0x9c, 0xf3,
-	0xf9, 0xfa, 0x9e, 0x09, 0x54, 0x45, 0xe7, 0x2b, 0xfa, 0x2a, 0x16, 0x22, 0xb4, 0x63, 0x29, 0x94,
-	0xa0, 0xa5, 0x6e, 0xa0, 0xbc, 0xf0, 0x92, 0x6d, 0x24, 0x67, 0x9e, 0xc4, 0xd3, 0xec, 0x29, 0xff,
-	0x01, 0xb5, 0x57, 0x12, 0x3d, 0x85, 0xef, 0x53, 0xfd, 0x07, 0x21, 0x42, 0x17, 0xbf, 0xf5, 0x30,
-	0x51, 0xf4, 0x10, 0x2a, 0x99, 0xc9, 0x97, 0xa1, 0x4b, 0x9d, 0x34, 0x89, 0x55, 0x71, 0xa8, 0x9d,
-	0xd9, 0xd8, 0x13, 0x7a, 0x10, 0xe3, 0x6b, 0xba, 0x0f, 0x25, 0x21, 0x83, 0x6e, 0x10, 0xd5, 0xd7,
-	0xa6, 0xf5, 0x2e, 0xc6, 0x22, 0x09, 0x94, 0x90, 0x97, 0xae, 0x56, 0x70, 0x06, 0xf5, 0xf9, 0xec,
-	0x24, 0x16, 0x51, 0x82, 0xfc, 0x1d, 0xd4, 0x8e, 0x30, 0xc4, 0x9b, 0xe2, 0x1a, 0x66, 0xcd, 0xfb,
-	0xe9, 0xac, 0x5f, 0x04, 0xb6, 0xdf, 0x06, 0xd1, 0x79, 0x8e, 0x78, 0x22, 0x6e, 0x68, 0x1c, 0x0e,
-	0x80, 0x1c, 0xbb, 0x2e, 0x19, 0xc9, 0x84, 0x8a, 0xef, 0x00, 0x5f, 0x46, 0xa3, 0xa1, 0xff, 0x10,
-	0xd8, 0xfd, 0x14, 0x85, 0x53, 0xc2, 0x63, 0x29, 0x2e, 0xe6, 0xc1, 0xa7, 0x19, 0x48, 0x11, 0x86,
-	0xd9, 0x97, 0x5d, 0x2b, 0x34, 0x63, 0x0b, 0xf6, 0x56, 0x11, 0x69, 0x78, 0x17, 0x1e, 0xbb, 0x78,
-	0xda, 0x8b, 0xc3, 0xc0, 0xf7, 0x14, 0x4e, 0x30, 0x5c, 0x1d, 0x99, 0x37, 0x60, 0xd3, 0xe0, 0xa9,
-	0x43, 0x4f, 0x60, 0xeb, 0x28, 0x48, 0x7c, 0x11, 0x45, 0xe8, 0xab, 0xd7, 0x81, 0x7a, 0x11, 0x2a,
-	0x94, 0x91, 0xa7, 0x30, 0xb9, 0x4e, 0xec, 0x36, 0x34, 0x8c, 0xae, 0x3a, 0xf8, 0x2f, 0x01, 0x76,
-	0x8c, 0xca, 0x3f, 0x7b, 0x13, 0xa9, 0x05, 0x8b, 0x95, 0x57, 0x86, 0xac, 0xaa, 0xcc, 0x95, 0xbe,
-	0x0b, 0x7d, 0x08, 0x25, 0x89, 0xb1, 0xe7, 0x9f, 0xd7, 0xd7, 0x9b, 0xc4, 0x2a, 0xbb, 0xfa, 0x8e,
-	0x6f, 0xc2, 0xa3, 0x85, 0x58, 0x19, 0xb6, 0xf3, 0xaf, 0x04, 0xf7, 0xf2, 0xc7, 0x1f, 0x51, 0x7e,
-	0x0f, 0x7c, 0xa4, 0x08, 0xd5, 0xd9, 0xd2, 0xd2, 0xc6, 0x08, 0xc0, 0x70, 0x94, 0xb0, 0xa6, 0x59,
-	0xa0, 0x67, 0x74, 0x77, 0xd0, 0xb7, 0xa0, 0x4c, 0xd8, 0x7a, 0xdb, 0x6e, 0x73, 0xe2, 0xd0, 0x0e,
-	0x54, 0x67, 0xfb, 0x9a, 0xc7, 0x18, 0x4e, 0x86, 0x3c, 0xc6, 0x58, 0xf5, 0xca, 0xa0, 0x6f, 0xdd,
-	0xd6, 0x31, 0xf4, 0x27, 0x01, 0x66, 0x6e, 0x1a, 0x7d, 0x36, 0x72, 0x5b, 0x79, 0x36, 0xb0, 0xfd,
-	0x22, 0xd2, 0x99, 0x37, 0x25, 0x0e, 0x4f, 0x29, 0x7e, 0x13, 0xd8, 0x5a, 0x5e, 0x1b, 0x7a, 0x30,
-	0xb2, 0x2f, 0x54, 0x78, 0x66, 0x17, 0x95, 0x6b, 0xa2, 0x8d, 0x41, 0xdf, 0x2a, 0x0f, 0x89, 0xd2,
-	0xc9, 0x0b, 0x78, 0xb0, 0xb0, 0x47, 0x74, 0x27, 0xdf, 0x4b, 0x73, 0x75, 0xd9, 0xee, 0x0a, 0x95,
-	0xce, 0xbc, 0x33, 0xe8, 0x5b, 0xb7, 0xd2, 0x4c, 0xda, 0x83, 0x9a, 0xa1, 0x41, 0x74, 0x6f, 0xfc,
-	0x41, 0x97, 0x16, 0x97, 0x3d, 0x5d, 0xa9, 0x9b, 0x8f, 0x8d, 0xe0, 0xfe, 0x82, 0xed, 0xa7, 0x7c,
-	0x64, 0x65, 0x6e, 0x2c, 0x7b, 0xb2, 0x54, 0x33, 0xbb, 0xd1, 0xce, 0x70, 0xa3, 0xdb, 0x2f, 0x9f,
-	0x7f, 0x1e, 0xfe, 0x2a, 0xf4, 0x3a, 0xb6, 0x2f, 0x2e, 0x5a, 0xd9, 0xe5, 0x81, 0x90, 0xdd, 0x56,
-	0xe6, 0xd5, 0x4a, 0xff, 0x8f, 0x5b, 0x5d, 0xa1, 0xef, 0xe3, 0x4e, 0xa7, 0x94, 0x3e, 0x3a, 0xfc,
-	0x1f, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xbc, 0xac, 0x59, 0xcc, 0x07, 0x00, 0x00,
+	// 598 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xd3, 0x40,
+	0x18, 0xd4, 0xa6, 0x22, 0x0d, 0x5f, 0x0a, 0x0a, 0x0b, 0x25, 0xd1, 0xd2, 0x34, 0xe9, 0xd2, 0x16,
+	0x53, 0xa9, 0x0e, 0x71, 0x9f, 0x00, 0xa8, 0x5a, 0x81, 0x2a, 0x40, 0xa6, 0x08, 0x89, 0x0b, 0x72,
+	0xdc, 0x55, 0x6a, 0xea, 0x7a, 0xcd, 0x7a, 0x83, 0x54, 0xae, 0x5c, 0x41, 0xe2, 0x82, 0xf2, 0x04,
+	0xbc, 0x64, 0x4e, 0x28, 0xf6, 0x26, 0x4e, 0x9c, 0x6c, 0x12, 0x85, 0xdc, 0xfc, 0x33, 0x9a, 0x99,
+	0xfd, 0xfc, 0xcd, 0xc8, 0x50, 0xe2, 0xad, 0x2f, 0xcc, 0x95, 0x21, 0xe7, 0xbe, 0x19, 0x0a, 0x2e,
+	0x39, 0xce, 0xb7, 0x3d, 0xe9, 0xf8, 0x37, 0x64, 0x23, 0xba, 0x74, 0x04, 0xbb, 0x48, 0x9e, 0xd2,
+	0xef, 0x50, 0x7e, 0x29, 0x98, 0x23, 0xd9, 0xdb, 0x18, 0xff, 0x8e, 0x73, 0xdf, 0x66, 0x5f, 0x3b,
+	0x2c, 0x92, 0xf8, 0x08, 0x8a, 0x09, 0xc9, 0xe7, 0x3e, 0x4b, 0x05, 0xd5, 0x91, 0x51, 0xb4, 0xb0,
+	0x99, 0xd0, 0x98, 0x23, 0x78, 0xe0, 0xc3, 0x6b, 0x7c, 0x00, 0x79, 0x2e, 0xbc, 0xb6, 0x17, 0x54,
+	0x72, 0xe3, 0x78, 0x9b, 0x85, 0x3c, 0xf2, 0x24, 0x17, 0x37, 0xb6, 0x42, 0x50, 0x02, 0x95, 0x49,
+	0xed, 0x28, 0xe4, 0x41, 0xc4, 0xe8, 0x1b, 0x28, 0x1f, 0x33, 0x9f, 0xad, 0xca, 0x57, 0x5f, 0x6b,
+	0x92, 0x4f, 0x69, 0xfd, 0x44, 0xb0, 0x73, 0xe6, 0x05, 0x57, 0xa9, 0xc5, 0x73, 0xbe, 0xa2, 0x71,
+	0x58, 0x00, 0x62, 0xc8, 0x3a, 0x63, 0x24, 0x23, 0x28, 0xba, 0x0b, 0x74, 0x96, 0x1b, 0x65, 0xfa,
+	0x37, 0x82, 0xbd, 0x0f, 0x81, 0x3f, 0x06, 0x3c, 0x11, 0xfc, 0x7a, 0xd2, 0xf8, 0xb8, 0x07, 0xb4,
+	0x88, 0x87, 0xec, 0x61, 0x73, 0x0b, 0xcd, 0xd8, 0x80, 0xfd, 0x79, 0x8e, 0x94, 0x79, 0x1b, 0xb6,
+	0x6c, 0x76, 0xd1, 0x09, 0x7d, 0xcf, 0x75, 0x24, 0x1b, 0xf1, 0xb0, 0xbc, 0x65, 0x5a, 0x83, 0xaa,
+	0x86, 0x53, 0x89, 0x9e, 0xc3, 0xf6, 0xb1, 0x17, 0xb9, 0x3c, 0x08, 0x98, 0x2b, 0x4f, 0x3d, 0xf9,
+	0xdc, 0x97, 0x4c, 0x04, 0x8e, 0x64, 0xd1, 0xff, 0xc8, 0xee, 0x40, 0x4d, 0xcb, 0xaa, 0x84, 0xff,
+	0x20, 0x20, 0x27, 0x4c, 0xba, 0x97, 0xaf, 0x02, 0x39, 0x65, 0xb1, 0xd2, 0xc8, 0xa0, 0x79, 0x91,
+	0x59, 0xea, 0xbb, 0xe0, 0x87, 0x90, 0x17, 0x2c, 0x74, 0xdc, 0xab, 0xca, 0x5a, 0x1d, 0x19, 0x05,
+	0x5b, 0xdd, 0xd1, 0x2a, 0x3c, 0x9a, 0x6a, 0x4b, 0xd9, 0x7e, 0x0d, 0x0f, 0x4e, 0x99, 0x5c, 0xc9,
+	0x3e, 0xd1, 0x33, 0xd8, 0xcc, 0x70, 0x25, 0x22, 0x4b, 0xa5, 0xca, 0xfa, 0xbb, 0x0e, 0xf7, 0xd2,
+	0x57, 0xef, 0x99, 0xf8, 0xe6, 0xb9, 0x0c, 0x33, 0x28, 0x65, 0xeb, 0x04, 0xd7, 0x06, 0x4c, 0x9a,
+	0x92, 0x23, 0x75, 0x3d, 0x40, 0x8d, 0xe1, 0x6e, 0xaf, 0x6b, 0x40, 0x01, 0x91, 0xb5, 0xa6, 0xd9,
+	0xa4, 0xc8, 0xc2, 0x2d, 0x28, 0x65, 0x9b, 0x24, 0x95, 0xd1, 0x74, 0x56, 0x2a, 0xa3, 0x2d, 0xa1,
+	0x62, 0xaf, 0x6b, 0xac, 0x2b, 0x19, 0xfc, 0x03, 0x01, 0xd1, 0x77, 0x00, 0x7e, 0x3a, 0x60, 0x9b,
+	0xdb, 0x5a, 0xe4, 0x60, 0x11, 0x68, 0xe6, 0xa4, 0xc8, 0xa2, 0xb1, 0x8b, 0x5f, 0x08, 0xb6, 0x67,
+	0x07, 0x1a, 0x1f, 0x0e, 0xe8, 0x17, 0xaa, 0x22, 0x62, 0x2e, 0x0a, 0x57, 0x8e, 0x36, 0x7a, 0x5d,
+	0xa3, 0xd0, 0x77, 0x14, 0x4f, 0x9e, 0xc3, 0xe6, 0xd4, 0x84, 0xe3, 0xdd, 0x74, 0xfb, 0xf4, 0xa5,
+	0x42, 0xf6, 0xe6, 0xa0, 0x94, 0xe6, 0xed, 0x5e, 0xd7, 0xb8, 0x15, 0x6b, 0xe2, 0x0e, 0x94, 0x35,
+	0xd9, 0xc6, 0xfb, 0xc3, 0x0f, 0x3a, 0xb3, 0x52, 0xc8, 0x93, 0xb9, 0xb8, 0x49, 0xd9, 0x00, 0xee,
+	0x4f, 0xc9, 0x25, 0xa6, 0x03, 0x2a, 0x7d, 0x97, 0x90, 0xc7, 0x33, 0x31, 0xd9, 0x8d, 0xb6, 0xfa,
+	0x1b, 0xdd, 0xc4, 0x1f, 0xe1, 0xce, 0x58, 0x38, 0xf1, 0xd6, 0x80, 0x65, 0x5a, 0xfe, 0x49, 0x55,
+	0xf3, 0x76, 0xec, 0x20, 0x39, 0x82, 0x9a, 0x2f, 0x9e, 0x7d, 0xea, 0x43, 0x7d, 0xa7, 0x65, 0xba,
+	0xfc, 0xba, 0x91, 0x5c, 0x1e, 0x72, 0xd1, 0x6e, 0x24, 0x04, 0x8d, 0xf8, 0x17, 0xa4, 0xd1, 0xe6,
+	0xea, 0x3e, 0x6c, 0xb5, 0xf2, 0xf1, 0xa3, 0xa3, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xac,
+	0x18, 0x11, 0xbf, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -640,6 +723,7 @@ type ObjectPoolServiceClient interface {
 	ReduplicateRepository(ctx context.Context, in *ReduplicateRepositoryRequest, opts ...grpc.CallOption) (*ReduplicateRepositoryResponse, error)
 	DisconnectGitAlternates(ctx context.Context, in *DisconnectGitAlternatesRequest, opts ...grpc.CallOption) (*DisconnectGitAlternatesResponse, error)
 	FetchIntoObjectPool(ctx context.Context, in *FetchIntoObjectPoolRequest, opts ...grpc.CallOption) (*FetchIntoObjectPoolResponse, error)
+	GetObjectPool(ctx context.Context, in *GetObjectPoolRequest, opts ...grpc.CallOption) (*GetObjectPoolResponse, error)
 }
 
 type objectPoolServiceClient struct {
@@ -713,6 +797,15 @@ func (c *objectPoolServiceClient) FetchIntoObjectPool(ctx context.Context, in *F
 	return out, nil
 }
 
+func (c *objectPoolServiceClient) GetObjectPool(ctx context.Context, in *GetObjectPoolRequest, opts ...grpc.CallOption) (*GetObjectPoolResponse, error) {
+	out := new(GetObjectPoolResponse)
+	err := c.cc.Invoke(ctx, "/gitaly.ObjectPoolService/GetObjectPool", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ObjectPoolServiceServer is the server API for ObjectPoolService service.
 type ObjectPoolServiceServer interface {
 	CreateObjectPool(context.Context, *CreateObjectPoolRequest) (*CreateObjectPoolResponse, error)
@@ -723,6 +816,7 @@ type ObjectPoolServiceServer interface {
 	ReduplicateRepository(context.Context, *ReduplicateRepositoryRequest) (*ReduplicateRepositoryResponse, error)
 	DisconnectGitAlternates(context.Context, *DisconnectGitAlternatesRequest) (*DisconnectGitAlternatesResponse, error)
 	FetchIntoObjectPool(context.Context, *FetchIntoObjectPoolRequest) (*FetchIntoObjectPoolResponse, error)
+	GetObjectPool(context.Context, *GetObjectPoolRequest) (*GetObjectPoolResponse, error)
 }
 
 // UnimplementedObjectPoolServiceServer can be embedded to have forward compatible implementations.
@@ -750,6 +844,9 @@ func (*UnimplementedObjectPoolServiceServer) DisconnectGitAlternates(ctx context
 func (*UnimplementedObjectPoolServiceServer) FetchIntoObjectPool(ctx context.Context, req *FetchIntoObjectPoolRequest) (*FetchIntoObjectPoolResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FetchIntoObjectPool not implemented")
 }
+func (*UnimplementedObjectPoolServiceServer) GetObjectPool(ctx context.Context, req *GetObjectPoolRequest) (*GetObjectPoolResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetObjectPool not implemented")
+}
 
 func RegisterObjectPoolServiceServer(s *grpc.Server, srv ObjectPoolServiceServer) {
 	s.RegisterService(&_ObjectPoolService_serviceDesc, srv)
@@ -881,6 +978,24 @@ func _ObjectPoolService_FetchIntoObjectPool_Handler(srv interface{}, ctx context
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ObjectPoolService_GetObjectPool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetObjectPoolRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ObjectPoolServiceServer).GetObjectPool(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/gitaly.ObjectPoolService/GetObjectPool",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ObjectPoolServiceServer).GetObjectPool(ctx, req.(*GetObjectPoolRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _ObjectPoolService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.ObjectPoolService",
 	HandlerType: (*ObjectPoolServiceServer)(nil),
@@ -913,6 +1028,10 @@ var _ObjectPoolService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "FetchIntoObjectPool",
 			Handler:    _ObjectPoolService_FetchIntoObjectPool_Handler,
 		},
+		{
+			MethodName: "GetObjectPool",
+			Handler:    _ObjectPoolService_GetObjectPool_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "objectpool.proto",
diff --git a/proto/objectpool.proto b/proto/objectpool.proto
index 94b962c8e..128e7dfcc 100644
--- a/proto/objectpool.proto
+++ b/proto/objectpool.proto
@@ -11,8 +11,7 @@ service ObjectPoolService {
     option (op_type) = {
       op: MUTATOR
       target_repository_field: "1.1"
-      additional_repository_field: "2"
-    };
+      additional_repository_field: "2" };
   }
   rpc DeleteObjectPool(DeleteObjectPoolRequest) returns (DeleteObjectPoolResponse) {
     option (op_type) = {
@@ -56,6 +55,12 @@ service ObjectPoolService {
       additional_repository_field: "1"
     };
   }
+  rpc GetObjectPool(GetObjectPoolRequest) returns (GetObjectPoolResponse) {
+    option (op_type) = {
+      op: ACCESSOR
+      target_repository_field: "1"
+    };
+  }
 }
 
 // Creates an object pool from the repository. The client is responsible for
@@ -104,3 +109,13 @@ message FetchIntoObjectPoolRequest {
   bool repack = 3;
 }
 message FetchIntoObjectPoolResponse {}
+
+message GetObjectPoolRequest {
+  Repository repository = 1;
+}
+
+message GetObjectPoolResponse {
+  ObjectPool object_pool = 1;
+}
+
+
diff --git a/ruby/proto/gitaly/objectpool_pb.rb b/ruby/proto/gitaly/objectpool_pb.rb
index 95234f2aa..9a1077f9d 100644
--- a/ruby/proto/gitaly/objectpool_pb.rb
+++ b/ruby/proto/gitaly/objectpool_pb.rb
@@ -45,6 +45,12 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   end
   add_message "gitaly.FetchIntoObjectPoolResponse" do
   end
+  add_message "gitaly.GetObjectPoolRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+  end
+  add_message "gitaly.GetObjectPoolResponse" do
+    optional :object_pool, :message, 1, "gitaly.ObjectPool"
+  end
 end
 
 module Gitaly
@@ -62,4 +68,6 @@ module Gitaly
   DisconnectGitAlternatesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.DisconnectGitAlternatesResponse").msgclass
   FetchIntoObjectPoolRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FetchIntoObjectPoolRequest").msgclass
   FetchIntoObjectPoolResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FetchIntoObjectPoolResponse").msgclass
+  GetObjectPoolRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetObjectPoolRequest").msgclass
+  GetObjectPoolResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetObjectPoolResponse").msgclass
 end
diff --git a/ruby/proto/gitaly/objectpool_services_pb.rb b/ruby/proto/gitaly/objectpool_services_pb.rb
index 356a3cbf7..0881389c0 100644
--- a/ruby/proto/gitaly/objectpool_services_pb.rb
+++ b/ruby/proto/gitaly/objectpool_services_pb.rb
@@ -22,6 +22,7 @@ module Gitaly
       rpc :ReduplicateRepository, ReduplicateRepositoryRequest, ReduplicateRepositoryResponse
       rpc :DisconnectGitAlternates, DisconnectGitAlternatesRequest, DisconnectGitAlternatesResponse
       rpc :FetchIntoObjectPool, FetchIntoObjectPoolRequest, FetchIntoObjectPoolResponse
+      rpc :GetObjectPool, GetObjectPoolRequest, GetObjectPoolResponse
     end
 
     Stub = Service.rpc_stub_class