comparison hgext/lfs/blobstore.py @ 37242:67db84842356

lfs: improve the client message when the server signals an object error

Two things here.  First, the previous message included a snippet of JSON, which
tends to be long (and in the case of lfs-test-server, has no error message).
Instead, give a concise message where possible, and leave the JSON to a debug
output.  Second, the server can signal issues other than a missing individual
file.  This change shows a corrupt file, but I'm debating letting the corrupt
file get downloaded, because 1) the error code doesn't really fit, and 2) having
it locally makes forensics easier.  Maybe need a config knob for that.

37241:79af9ae46a78

        for response in responses:
            # The server should return 404 when objects cannot be found. Some
            # server implementation (ex. lfs-test-server)  does not set "error"
            # but just removes "download" from "actions". Treat that case
            # as the same as 404 error.
            notfound = (response.get('error', {}).get('code') == 404
                        or (action == 'download'
                            and action not in response.get('actions', [])))
            if notfound:
                ptrmap = {p.oid(): p for p in pointers}
                p = ptrmap.get(response['oid'], None)
                if p:
                    filename = getattr(p, 'filename', 'unknown')
                    raise LfsRemoteError(
                        _(('LFS server error. Remote object '
                          'for "%s" not found: %r')) % (filename, response))
                else:
                    raise LfsRemoteError(
                        _('LFS server error. Unsolicited response for oid %s')
                        % response['oid'])
            if 'error' in response:
                raise LfsRemoteError(_('LFS server error: %r') % response)

    def _extractobjects(self, response, pointers, action):
        """extract objects from response of the batch API

        response: parsed JSON object returned by batch API

37242:67db84842356

        for response in responses:
            # The server should return 404 when objects cannot be found. Some
            # server implementation (ex. lfs-test-server)  does not set "error"
            # but just removes "download" from "actions". Treat that case
            # as the same as 404 error.
            if 'error' not in response:
                if (action == 'download'
                    and action not in response.get('actions', [])):
                    code = 404
                else:
                    continue
            else:
                # An error dict without a code doesn't make much sense, so
                # treat as a server error.
                code = response.get('error').get('code', 500)

            ptrmap = {p.oid(): p for p in pointers}
            p = ptrmap.get(response['oid'], None)
            if p:
                filename = getattr(p, 'filename', 'unknown')
                errors = {
                    404: 'The object does not exist',
                    410: 'The object was removed by the owner',
                    422: 'Validation error',
                    500: 'Internal server error',
                }
                msg = errors.get(code, 'status code %d' % code)
                raise LfsRemoteError(_('LFS server error for "%s": %s')
                                     % (filename, msg))
            else:
                raise LfsRemoteError(
                    _('LFS server error. Unsolicited response for oid %s')
                    % response['oid'])

    def _extractobjects(self, response, pointers, action):
        """extract objects from response of the batch API

        response: parsed JSON object returned by batch API