* [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten @ 2009-05-02 20:30 Shawn O. Pearce 2009-05-02 20:30 ` [JGIT PATCH 2/2] Correct Javadoc comment for TransportLocal about forking Shawn O. Pearce 2009-05-03 8:05 ` [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten Robin Rosenberg 0 siblings, 2 replies; 6+ messages in thread From: Shawn O. Pearce @ 2009-05-02 20:30 UTC (permalink / raw) To: Robin Rosenberg; +Cc: git If a PackFile gets overwritten after we read its pack-*.idx we throw a PackMismatchException and then close the PackFile, which discards the index. At this point the PackFile instance is dead and must be discarded by the GC, as it is used as part of the key in the WindowCache and the UnpackedObjectCache. There is however a subtle race condition here. If the PackFile is opened again after the PackMismatchException is thrown we load the new index file into memory, possibly seeing the footer in the index match the footer in the pack, and believing that the file is valid. This can mean that stale windows that haven't yet expired out of the WindowCache suddenly become valid again, even though they contain data from the old version of the pack. By caching the pack signature the very first time we open it we can more reliably detect this overwrite race condition and keep the PackFile instance invalid. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- .../src/org/spearce/jgit/lib/PackFile.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PackFile.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PackFile.java index b107dfe..85690a7 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/PackFile.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PackFile.java @@ -89,6 +89,8 @@ public int compare(final PackFile a, final PackFile b) { private volatile boolean invalid; + private byte[] packChecksum; + private PackIndex loadedIdx; private PackReverseIndex reverseIdx; @@ -115,8 +117,18 @@ public PackFile(final File idxFile, final File packFile) { private synchronized PackIndex idx() throws IOException { if (loadedIdx == null) { + if (invalid) + throw new PackMismatchException("Pack checksum mismatch"); + try { - loadedIdx = PackIndex.open(idxFile); + final PackIndex idx = PackIndex.open(idxFile); + + if (packChecksum == null) + packChecksum = idx.packChecksum; + else if (!Arrays.equals(packChecksum, idx.packChecksum)) + throw new PackMismatchException("Pack checksum mismatch"); + + loadedIdx = idx; } catch (IOException e) { invalid = true; throw e; @@ -339,6 +351,8 @@ synchronized boolean endWindowCache() { private void doOpen() throws IOException { try { + if (invalid) + throw new PackMismatchException("Pack checksum mismatch"); fd = new RandomAccessFile(packFile, "r"); length = fd.length(); onOpenPack(); @@ -423,7 +437,7 @@ private void onOpenPack() throws IOException { + ": " + getPackFile()); NB.readFully(fd.getChannel(), length - 20, buf, 0, 20); - if (!Arrays.equals(buf, idx.packChecksum)) + if (!Arrays.equals(buf, packChecksum)) throw new PackMismatchException("Pack checksum mismatch:" + " pack " + ObjectId.fromRaw(buf).name() + " index " + ObjectId.fromRaw(idx.packChecksum).name() -- 1.6.3.rc3.212.g8c698 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [JGIT PATCH 2/2] Correct Javadoc comment for TransportLocal about forking 2009-05-02 20:30 [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten Shawn O. Pearce @ 2009-05-02 20:30 ` Shawn O. Pearce 2009-05-03 7:52 ` Robin Rosenberg 2009-05-03 8:05 ` [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten Robin Rosenberg 1 sibling, 1 reply; 6+ messages in thread From: Shawn O. Pearce @ 2009-05-02 20:30 UTC (permalink / raw) To: Robin Rosenberg; +Cc: git Since a4548aedff ("Switch local fetch connection to use our own UploadPack") this code has tried to avoid forking to execute the CGit upload-pack or receive-pack processes, instead favoring the creation of a helper thread and performing all work through a shared memory buffer within the same JVM. Update the Javadoc to better reflect what this class does. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- .../org/spearce/jgit/transport/TransportLocal.java | 24 +++++++++++++++---- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java index d5a6c14..230ab76 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java @@ -52,13 +52,27 @@ import org.spearce.jgit.util.FS; /** - * Transport that executes the Git "remote side" processes on a local directory. + * Transport to access a local directory as though it were a remote peer. * <p> * This transport is suitable for use on the local system, where the caller has - * direct read or write access to the remote repository. This implementation - * forks a C Git process to provide the remote side access, much as the - * {@link TransportGitSsh} implementation causes the remote side to run a C Git - * process. + * direct read or write access to the "remote" repository. + * <p> + * By default this transport works by spawning a helper thread within the same + * JVM, and processes the data transfer using a shared memory buffer between the + * calling thread and the helper thread. This is a pure-Java implementation + * which does not require forking an external process. + * <p> + * However, during {@link #openFetch()}, if the Transport has configured + * {@link Transport#getOptionUploadPack()} to be anything other than + * <code>"git-upload-pack"</code> or <code>"git upload-pack"</code>, this + * implementation will fork and execute the external process, using an operating + * system pipe to transfer data. + * <p> + * However, during {@link #openPush()}, if the Transport has configured + * {@link Transport#getOptionReceivePack()} to be anything other than + * <code>"git-receive-pack"</code> or <code>"git receive-pack"</code>, this + * implementation will fork and execute the external process, using an operating + * system pipe to transfer data. */ class TransportLocal extends Transport implements PackTransport { private static final String PWD = "."; -- 1.6.3.rc3.212.g8c698 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [JGIT PATCH 2/2] Correct Javadoc comment for TransportLocal about forking 2009-05-02 20:30 ` [JGIT PATCH 2/2] Correct Javadoc comment for TransportLocal about forking Shawn O. Pearce @ 2009-05-03 7:52 ` Robin Rosenberg 2009-05-04 13:57 ` Shawn O. Pearce 0 siblings, 1 reply; 6+ messages in thread From: Robin Rosenberg @ 2009-05-03 7:52 UTC (permalink / raw) To: Shawn O. Pearce; +Cc: git lördag 02 maj 2009 22:30:30 skrev "Shawn O. Pearce" <spearce@spearce.org>: > + * However, during {@link #openFetch()}, if the Transport has configured > + * {@link Transport#getOptionUploadPack()} to be anything other than > + * <code>"git-upload-pack"</code> or <code>"git upload-pack"</code>, this > + * implementation will fork and execute the external process, using an operating > + * system pipe to transfer data. > + * <p> > + * However, during {@link #openPush()}, if the Transport has configured > + * {@link Transport#getOptionReceivePack()} to be anything other than > + * <code>"git-receive-pack"</code> or <code>"git receive-pack"</code>, this > + * implementation will fork and execute the external process, using an operating > + * system pipe to transfer data. > I'll change the second However to Similarly. I think it reads better, even though I'm not a native English speaker. -- robin ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [JGIT PATCH 2/2] Correct Javadoc comment for TransportLocal about forking 2009-05-03 7:52 ` Robin Rosenberg @ 2009-05-04 13:57 ` Shawn O. Pearce 0 siblings, 0 replies; 6+ messages in thread From: Shawn O. Pearce @ 2009-05-04 13:57 UTC (permalink / raw) To: Robin Rosenberg; +Cc: git Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote: > l?rdag 02 maj 2009 22:30:30 skrev "Shawn O. Pearce" <spearce@spearce.org>: > > + * However, during {@link #openFetch()}, if the Transport has configured > > + * {@link Transport#getOptionUploadPack()} to be anything other than > > + * <code>"git-upload-pack"</code> or <code>"git upload-pack"</code>, this > > + * implementation will fork and execute the external process, using an operating > > + * system pipe to transfer data. > > + * <p> > > + * However, during {@link #openPush()}, if the Transport has configured > > + * {@link Transport#getOptionReceivePack()} to be anything other than > > + * <code>"git-receive-pack"</code> or <code>"git receive-pack"</code>, this > > + * implementation will fork and execute the external process, using an operating > > + * system pipe to transfer data. > > > > I'll change the second However to Similarly. I think it reads better, even though I'm not a native English speaker. Yea, you're right, it does read better that way. Thanks! -- Shawn. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten 2009-05-02 20:30 [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten Shawn O. Pearce 2009-05-02 20:30 ` [JGIT PATCH 2/2] Correct Javadoc comment for TransportLocal about forking Shawn O. Pearce @ 2009-05-03 8:05 ` Robin Rosenberg 2009-05-04 19:30 ` [JGIT PATCH v2 " Shawn O. Pearce 1 sibling, 1 reply; 6+ messages in thread From: Robin Rosenberg @ 2009-05-03 8:05 UTC (permalink / raw) To: Shawn O. Pearce; +Cc: git > @@ -339,6 +351,8 @@ synchronized boolean endWindowCache() { > > private void doOpen() throws IOException { > try { > + if (invalid) > + throw new PackMismatchException("Pack checksum mismatch"); That /may/ be the case. We no longer know why the index failed to open. One way is to save the reason, the other is not to be so d** sure and use a less specific message. -- robin ^ permalink raw reply [flat|nested] 6+ messages in thread
* [JGIT PATCH v2 1/2] Ensure that a PackFile instance stays invalid when overwritten 2009-05-03 8:05 ` [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten Robin Rosenberg @ 2009-05-04 19:30 ` Shawn O. Pearce 0 siblings, 0 replies; 6+ messages in thread From: Shawn O. Pearce @ 2009-05-04 19:30 UTC (permalink / raw) To: Robin Rosenberg; +Cc: git If a PackFile gets overwritten after we read its pack-*.idx we throw a PackMismatchException and then close the PackFile, which discards the index. At this point the PackFile instance is dead and must be discarded by the GC, as it is used as part of the key in the WindowCache and the UnpackedObjectCache. There is however a subtle race condition here. If the PackFile is opened again after the PackMismatchException is thrown we load the new index file into memory, possibly seeing the footer in the index match the footer in the pack, and believing that the file is valid. This can mean that stale windows that haven't yet expired out of the WindowCache suddenly become valid again, even though they contain data from the old version of the pack. By caching the pack signature the very first time we open it we can more reliably detect this overwrite race condition and keep the PackFile instance invalid. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote: > > @@ -339,6 +351,8 @@ synchronized boolean endWindowCache() { > > > > private void doOpen() throws IOException { > > try { > > + if (invalid) > > + throw new PackMismatchException("Pack checksum mismatch"); > > That /may/ be the case. We no longer know why the index failed to open. One way > is to save the reason, the other is not to be so d** sure and use a less specific > message. Good point. v2 fixes that by using a new special exception type. .../spearce/jgit/errors/PackInvalidException.java | 56 ++++++++++++++++++++ .../src/org/spearce/jgit/lib/PackFile.java | 19 ++++++- 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 org.spearce.jgit/src/org/spearce/jgit/errors/PackInvalidException.java diff --git a/org.spearce.jgit/src/org/spearce/jgit/errors/PackInvalidException.java b/org.spearce.jgit/src/org/spearce/jgit/errors/PackInvalidException.java new file mode 100644 index 0000000..2e5485f --- /dev/null +++ b/org.spearce.jgit/src/org/spearce/jgit/errors/PackInvalidException.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2009, Google Inc. + * + * 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 Git Development Community 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.spearce.jgit.errors; + +import java.io.File; +import java.io.IOException; + +/** Thrown when a PackFile previously failed and is known to be unusable */ +public class PackInvalidException extends IOException { + private static final long serialVersionUID = 1L; + + /** + * Construct a pack invalid error. + * + * @param path + * path of the invalid pack file. + */ + public PackInvalidException(final File path) { + super("Pack file invalid: " + path.getAbsolutePath()); + } +} diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PackFile.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PackFile.java index b107dfe..7e17613 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/PackFile.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PackFile.java @@ -54,6 +54,7 @@ import java.util.zip.DataFormatException; import org.spearce.jgit.errors.CorruptObjectException; +import org.spearce.jgit.errors.PackInvalidException; import org.spearce.jgit.errors.PackMismatchException; import org.spearce.jgit.util.NB; import org.spearce.jgit.util.RawParseUtils; @@ -89,6 +90,8 @@ public int compare(final PackFile a, final PackFile b) { private volatile boolean invalid; + private byte[] packChecksum; + private PackIndex loadedIdx; private PackReverseIndex reverseIdx; @@ -115,8 +118,18 @@ public PackFile(final File idxFile, final File packFile) { private synchronized PackIndex idx() throws IOException { if (loadedIdx == null) { + if (invalid) + throw new PackInvalidException(packFile); + try { - loadedIdx = PackIndex.open(idxFile); + final PackIndex idx = PackIndex.open(idxFile); + + if (packChecksum == null) + packChecksum = idx.packChecksum; + else if (!Arrays.equals(packChecksum, idx.packChecksum)) + throw new PackMismatchException("Pack checksum mismatch"); + + loadedIdx = idx; } catch (IOException e) { invalid = true; throw e; @@ -339,6 +352,8 @@ synchronized boolean endWindowCache() { private void doOpen() throws IOException { try { + if (invalid) + throw new PackInvalidException(packFile); fd = new RandomAccessFile(packFile, "r"); length = fd.length(); onOpenPack(); @@ -423,7 +438,7 @@ private void onOpenPack() throws IOException { + ": " + getPackFile()); NB.readFully(fd.getChannel(), length - 20, buf, 0, 20); - if (!Arrays.equals(buf, idx.packChecksum)) + if (!Arrays.equals(buf, packChecksum)) throw new PackMismatchException("Pack checksum mismatch:" + " pack " + ObjectId.fromRaw(buf).name() + " index " + ObjectId.fromRaw(idx.packChecksum).name() -- 1.6.3.rc4.206.g03e16 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-05-04 19:30 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-05-02 20:30 [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten Shawn O. Pearce 2009-05-02 20:30 ` [JGIT PATCH 2/2] Correct Javadoc comment for TransportLocal about forking Shawn O. Pearce 2009-05-03 7:52 ` Robin Rosenberg 2009-05-04 13:57 ` Shawn O. Pearce 2009-05-03 8:05 ` [JGIT PATCH 1/2] Ensure that a PackFile instance stays invalid when overwritten Robin Rosenberg 2009-05-04 19:30 ` [JGIT PATCH v2 " Shawn O. Pearce
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).