1412d6e47a
A Git LFS client may not have the entire history of the objects for the repository. However, in some situations, we traverse the entire history of a branch when pushing it, meaning that we need to process every LFS object in the history of that branch. If the objects for the entire history are not present, we currently fail to push. Instead, let's mark objects we don't have on disk as missing and only fail when we would need to upload those objects. We'll know the server has the objects if the batch response provides no actions to take for them when we request an upload. Pass the missing flag down through the code, and always set it to false for non-uploads. If for some reason we fail to properly flag a missing object, we will still fail later on when we cannot open the file, just in a messier and more poorly controlled way. The technique used here will attempt to abort the batch as soon as we notice a problem, which means that in the common case (less than 100 objects) we won't have transferred any objects, so the user can notice the failure as soon as possible. Update the tests to look for a string which will occur in the error message, since we no longer produce the system error message for ENOENT.
97 lines
2.4 KiB
Go
97 lines
2.4 KiB
Go
package tq
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/git-lfs/git-lfs/errors"
|
|
"github.com/git-lfs/git-lfs/git"
|
|
"github.com/git-lfs/git-lfs/lfsapi"
|
|
"github.com/git-lfs/git-lfs/lfshttp"
|
|
"github.com/rubyist/tracerx"
|
|
)
|
|
|
|
type tqClient struct {
|
|
MaxRetries int
|
|
*lfsapi.Client
|
|
}
|
|
|
|
type batchRef struct {
|
|
Name string `json:"name,omitempty"`
|
|
}
|
|
|
|
type batchRequest struct {
|
|
Operation string `json:"operation"`
|
|
Objects []*Transfer `json:"objects"`
|
|
TransferAdapterNames []string `json:"transfers,omitempty"`
|
|
Ref *batchRef `json:"ref"`
|
|
}
|
|
|
|
type BatchResponse struct {
|
|
Objects []*Transfer `json:"objects"`
|
|
TransferAdapterName string `json:"transfer"`
|
|
endpoint lfshttp.Endpoint
|
|
}
|
|
|
|
func Batch(m *Manifest, dir Direction, remote string, remoteRef *git.Ref, objects []*Transfer) (*BatchResponse, error) {
|
|
if len(objects) == 0 {
|
|
return &BatchResponse{}, nil
|
|
}
|
|
|
|
return m.batchClient().Batch(remote, &batchRequest{
|
|
Operation: dir.String(),
|
|
Objects: objects,
|
|
TransferAdapterNames: m.GetAdapterNames(dir),
|
|
Ref: &batchRef{Name: remoteRef.Refspec()},
|
|
})
|
|
}
|
|
|
|
func (c *tqClient) Batch(remote string, bReq *batchRequest) (*BatchResponse, error) {
|
|
bRes := &BatchResponse{}
|
|
if len(bReq.Objects) == 0 {
|
|
return bRes, nil
|
|
}
|
|
|
|
if len(bReq.TransferAdapterNames) == 1 && bReq.TransferAdapterNames[0] == "basic" {
|
|
bReq.TransferAdapterNames = nil
|
|
}
|
|
|
|
missing := make(map[string]bool)
|
|
for _, obj := range bReq.Objects {
|
|
missing[obj.Oid] = obj.Missing
|
|
}
|
|
|
|
bRes.endpoint = c.Endpoints.Endpoint(bReq.Operation, remote)
|
|
requestedAt := time.Now()
|
|
|
|
req, err := c.NewRequest("POST", bRes.endpoint, "objects/batch", bReq)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "batch request")
|
|
}
|
|
|
|
tracerx.Printf("api: batch %d files", len(bReq.Objects))
|
|
|
|
req = c.Client.LogRequest(req, "lfs.batch")
|
|
res, err := c.DoAPIRequestWithAuth(remote, lfshttp.WithRetries(req, c.MaxRetries))
|
|
if err != nil {
|
|
tracerx.Printf("api error: %s", err)
|
|
return nil, errors.Wrap(err, "batch response")
|
|
}
|
|
|
|
if err := lfshttp.DecodeJSON(res, bRes); err != nil {
|
|
return bRes, errors.Wrap(err, "batch response")
|
|
}
|
|
|
|
if res.StatusCode != 200 {
|
|
return nil, lfshttp.NewStatusCodeError(res)
|
|
}
|
|
|
|
for _, obj := range bRes.Objects {
|
|
obj.Missing = missing[obj.Oid]
|
|
for _, a := range obj.Actions {
|
|
a.createdAt = requestedAt
|
|
}
|
|
}
|
|
|
|
return bRes, nil
|
|
}
|