Better report on client side if push failed due to too large object
JGits PushCommand and BasePackPushConnection were throwing a generic exception when the pushed pack-file was rejected by the server since it contained too large objects. Teach JGit to better analyze the server's response to detect this situation and throw a more specific exception. Detect this situation by parsing the status line sent by the server. This change only recognizes the response sent by a JGit based server. All other servers which report such problems in a different way still lead to a generic TransportExceptions. Also see https://git.eclipse.org/r/#/c/46348/ Change-Id: I8d6d65e4585ebb3846f7207e7d1a2f82fa9cbd86 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn
parent
6569a876a3
commit
5b104a7275
|
|
@ -55,6 +55,7 @@
|
|||
import org.eclipse.jgit.api.errors.InvalidRemoteException;
|
||||
import org.eclipse.jgit.api.errors.JGitInternalException;
|
||||
import org.eclipse.jgit.errors.NotSupportedException;
|
||||
import org.eclipse.jgit.errors.TooLargeObjectInPackException;
|
||||
import org.eclipse.jgit.errors.TooLargePackException;
|
||||
import org.eclipse.jgit.errors.TransportException;
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
|
|
@ -160,6 +161,9 @@ public Iterable<PushResult> call() throws GitAPIException,
|
|||
} catch (TooLargePackException e) {
|
||||
throw new org.eclipse.jgit.api.errors.TooLargePackException(
|
||||
e.getMessage(), e);
|
||||
} catch (TooLargeObjectInPackException e) {
|
||||
throw new org.eclipse.jgit.api.errors.TooLargeObjectInPackException(
|
||||
e.getMessage(), e);
|
||||
} catch (TransportException e) {
|
||||
throw new org.eclipse.jgit.api.errors.TransportException(
|
||||
e.getMessage(), e);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,65 @@
|
|||
/*
|
||||
* Copyright (C) 2016, Matthias Sohn <matthias.sohn@sap.com> and
|
||||
* other copyright owners as documented in the project's IP log.
|
||||
*
|
||||
* This program and the accompanying materials are made available under the
|
||||
* terms of the Eclipse Distribution License v1.0 which accompanies this
|
||||
* distribution, is reproduced below, and is available at
|
||||
* http://www.eclipse.org/org/documents/edl-v10.php
|
||||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* - Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
*
|
||||
* - Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from this
|
||||
* software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package org.eclipse.jgit.api.errors;
|
||||
|
||||
/**
|
||||
* Exception thrown when the server rejected a too large pack
|
||||
*
|
||||
* @since 4.4
|
||||
*/
|
||||
public class TooLargeObjectInPackException extends TransportException {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* @param msg
|
||||
* message describing the transport failure.
|
||||
*/
|
||||
public TooLargeObjectInPackException(String msg) {
|
||||
super(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param msg
|
||||
* message describing the transport exception.
|
||||
* @param cause
|
||||
* why the transport failed.
|
||||
*/
|
||||
public TooLargeObjectInPackException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
}
|
||||
|
|
@ -43,13 +43,13 @@
|
|||
|
||||
package org.eclipse.jgit.errors;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.MessageFormat;
|
||||
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
import org.eclipse.jgit.transport.URIish;
|
||||
|
||||
/** Thrown when PackParser finds an object larger than a predefined limit */
|
||||
public class TooLargeObjectInPackException extends IOException {
|
||||
public class TooLargeObjectInPackException extends TransportException {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
|
|
@ -79,4 +79,17 @@ public TooLargeObjectInPackException(long objectSize,
|
|||
super(MessageFormat.format(JGitText.get().receivePackObjectTooLarge2,
|
||||
Long.valueOf(objectSize), Long.valueOf(maxObjectSizeLimit)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a too large object in pack exception.
|
||||
*
|
||||
* @param uri
|
||||
* URI used for transport
|
||||
* @param s
|
||||
* message
|
||||
* @since 4.4
|
||||
*/
|
||||
public TooLargeObjectInPackException(URIish uri, String s) {
|
||||
super(uri.setPass(null) + ": " + s); //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
|
|
@ -57,6 +57,7 @@
|
|||
import org.eclipse.jgit.errors.NoRemoteRepositoryException;
|
||||
import org.eclipse.jgit.errors.NotSupportedException;
|
||||
import org.eclipse.jgit.errors.PackProtocolException;
|
||||
import org.eclipse.jgit.errors.TooLargeObjectInPackException;
|
||||
import org.eclipse.jgit.errors.TooLargePackException;
|
||||
import org.eclipse.jgit.errors.TransportException;
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
|
|
@ -328,12 +329,16 @@ private void readStatusReport(final Map<String, RemoteRefUpdate> refUpdates)
|
|||
if (!unpackLine.startsWith("unpack ")) //$NON-NLS-1$
|
||||
throw new PackProtocolException(uri, MessageFormat.format(JGitText.get().unexpectedReportLine, unpackLine));
|
||||
final String unpackStatus = unpackLine.substring("unpack ".length()); //$NON-NLS-1$
|
||||
if (unpackStatus.startsWith("error Pack exceeds the limit of")) //$NON-NLS-1$
|
||||
if (unpackStatus.startsWith("error Pack exceeds the limit of")) {//$NON-NLS-1$
|
||||
throw new TooLargePackException(uri,
|
||||
unpackStatus.substring("error ".length())); //$NON-NLS-1$
|
||||
if (!unpackStatus.equals("ok")) //$NON-NLS-1$
|
||||
} else if (unpackStatus.startsWith("error Object too large")) {//$NON-NLS-1$
|
||||
throw new TooLargeObjectInPackException(uri,
|
||||
unpackStatus.substring("error ".length())); //$NON-NLS-1$
|
||||
} else if (!unpackStatus.equals("ok")) { //$NON-NLS-1$
|
||||
throw new TransportException(uri, MessageFormat.format(
|
||||
JGitText.get().errorOccurredDuringUnpackingOnTheRemoteEnd, unpackStatus));
|
||||
}
|
||||
|
||||
String refLine;
|
||||
while ((refLine = pckIn.readString()) != PacketLineIn.END) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue