{"thread":{"id":"19258","subject":"[JGIT] exception while pushing if no objects/pack directory exists in origin repo","startedAt":"2009-05-09T20:40:50Z","lastAt":"2009-05-10T23:03:41Z","messageCount":4,"participants":["Mark Struberg","Shawn O. Pearce","Robin Rosenberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113423","messageId":"693615.98383.qm@web27802.mail.ukl.yahoo.com","threadId":"19258","inReplyTo":null,"subject":"[JGIT] exception while pushing if no objects/pack directory exists in origin repo","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-05-09T20:40:50Z","receivedAt":"2009-05-09T20:40:50Z","isPatch":false,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"\nHi!\n\nI have problems with JGit pushing to an old origin repo in my TCK tests of\nmaven-scm-providers-git.\n\nThis 'old' bare repository does not have an object/pack folder, it only has unpacked objects lying\naround. I created it in 2007-11 with git-1.5.3 so this is actually not so old, so I'm not sure why\nthere is no pack folder. Maybe that's caused by some 'prune empty directories' and stuff, I really\ndon't know.\n\nIf I use jgit to push to this repo it crashes because it cannot write to the pack folder. If I\nmkdir the object/pack folder in my origin repo, everything runs smooth.\n\nThe test git repo checked-in in my git repo ;)\n\nhttp://github.com/struberg/maven-scm-providers-git/tree/82e3021576e18a09fc04e1a5ac58368f598167b2/maven-scm-provider-jgit/src/test/resources/repository\n\n\nThe Exception I get when running my TCK test:\n\norg.apache.maven.scm.ScmException: JGit checkin failure!\n\tat\norg.apache.maven.scm.provider.git.jgit.command.checkin.JGitCheckInCommand.executeCheckInCommand(JGitCheckInCommand.java:98)\n\tat\norg.apache.maven.scm.command.checkin.AbstractCheckInCommand.executeCommand(AbstractCheckInCommand.java:53)\n\tat org.apache.maven.scm.command.AbstractCommand.execute(AbstractCommand.java:59)\n\tat\norg.apache.maven.scm.provider.git.AbstractGitScmProvider.executeCommand(AbstractGitScmProvider.java:339)\n\tat\norg.apache.maven.scm.provider.git.AbstractGitScmProvider.checkin(AbstractGitScmProvider.java:265)\n\tat org.apache.maven.scm.provider.AbstractScmProvider.checkIn(AbstractScmProvider.java:342)\n\tat org.apache.maven.scm.provider.AbstractScmProvider.checkIn(AbstractScmProvider.java:326)\n\tat org.apache.maven.scm.manager.AbstractScmManager.checkIn(AbstractScmManager.java:374)\n\tat\norg.apache.maven.scm.tck.command.checkin.CheckInCommandTckTest.testCheckInCommandTest(CheckInCommandTckTest.java:74)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\n\tat java.lang.reflect.Method.invoke(Method.java:597)\n\tat junit.framework.TestCase.runTest(TestCase.java:164)\n\tat junit.framework.TestCase.runBare(TestCase.java:130)\n\tat junit.framework.TestResult$1.protect(TestResult.java:106)\n\tat junit.framework.TestResult.runProtected(TestResult.java:124)\n\tat junit.framework.TestResult.run(TestResult.java:109)\n\tat junit.framework.TestCase.run(TestCase.java:120)\n\tat junit.framework.TestSuite.runTest(TestSuite.java:230)\n\tat junit.framework.TestSuite.run(TestSuite.java:225)\n\tat\norg.eclipse.jdt.internal.junit.runner.junit3.JUnit3TestReference.run(JUnit3TestReference.java:130)\n\tat org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:38)\n\tat org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:460)\n\tat org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:673)\n\tat org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:386)\n\tat org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:196)\nCaused by: org.spearce.jgit.errors.TransportException:\nfile:///home/msx/develop/java/maven2/maven-scm/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/target/scm-test/repository:\nerror occurred during unpacking on the remote end: error Cannot move pack to\n/home/msx/develop/java/maven2/maven-scm/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/target/scm-test/repository/objects/pack/pack-737c284d140709e1182fa00fa1a20d4e370cf2d5.pack\n\tat\norg.spearce.jgit.transport.BasePackPushConnection.readStatusReport(BasePackPushConnection.java:217)\n\tat org.spearce.jgit.transport.BasePackPushConnection.doPush(BasePackPushConnection.java:134)\n\tat org.spearce.jgit.transport.BasePackPushConnection.push(BasePackPushConnection.java:100)\n\tat org.spearce.jgit.transport.PushProcess.execute(PushProcess.java:127)\n\tat org.spearce.jgit.transport.Transport.push(Transport.java:713)\n\tat org.spearce.jgit.simple.SimpleRepository.push(SimpleRepository.java:504)\n\tat org.spearce.jgit.simple.SimpleRepository.push(SimpleRepository.java:436)\n\tat\norg.apache.maven.scm.provider.git.jgit.command.checkin.JGitCheckInCommand.executeCheckInCommand(JGitCheckInCommand.java:66)\n\t... 26 more\n\n\nNot sure if I only have a 'broken' repo (everything runs smooth on the shell) or if this is a\nthing which should get fixed in JGit... \n\n\ntxs and LieGrue,\nstrub\n\n\n      \n"},{"id":"113490","messageId":"20090510213046.GC30527@spearce.org","threadId":"19258","inReplyTo":"693615.98383.qm@web27802.mail.ukl.yahoo.com","subject":"[PATCH] Create $GIT_DIR/objects/pack if missing during renameAndOpenPack","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-05-10T21:30:46Z","receivedAt":"2009-05-10T21:30:46Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Its OK for the objects/pack directory to be missing, an empty\nrepository doesn't have to have it.  C Git's `git repack` will\nautomatically create the directory if it is not present, so we\nneed to do the same behavior here.\n\nWhen the directory doesn't exist, we try to create it, but we\nmay have creation fail if another concurrent thread/process also\nmade the directory at the same time, hence we test once more after\ncreation failure before throwing the exception.\n\nFound-by: Mark Struberg <struberg@yahoo.de>\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n  Mark Struberg <struberg@yahoo.de> wrote:\n  > \n  > If I use jgit to push to this repo it crashes because it cannot write to the pack folder. If I\n  > mkdir the object/pack folder in my origin repo, everything runs smooth.\n  \n  Yea, that's legal.  This patch should fix it.\n  \n .../src/org/spearce/jgit/transport/IndexPack.java  |    8 ++++++++\n 1 files changed, 8 insertions(+), 0 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\nindex b2bcbb7..1eb40d4 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\n@@ -1037,6 +1037,14 @@ public PackLock renameAndOpenPack(final String lockMessage)\n \t\tfinal File finalIdx = new File(packDir, \"pack-\" + name + \".idx\");\n \t\tfinal PackLock keep = new PackLock(finalPack);\n \n+\t\tif (!packDir.exists() && !packDir.mkdir() && !packDir.exists()) {\n+\t\t\t// The objects/pack directory isn't present, and we are unable\n+\t\t\t// to create it. There is no way to move this pack in.\n+\t\t\t//\n+\t\t\tcleanupTemporaryFiles();\n+\t\t\tthrow new IOException(\"Cannot create \" + packDir.getAbsolutePath());\n+\t\t}\n+\n \t\tif (finalPack.exists()) {\n \t\t\t// If the pack is already present we should never replace it.\n \t\t\t//\n-- \n1.6.3.195.gad81\n"},{"id":"113498","messageId":"200905110059.50494.robin.rosenberg.lists@dewire.com","threadId":"19258","inReplyTo":"20090510213046.GC30527@spearce.org","subject":"Re: [PATCH] Create $GIT_DIR/objects/pack if missing during renameAndOpenPack","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-05-10T22:59:50Z","receivedAt":"2009-05-10T22:59:50Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"söndag 10 maj 2009 23:30:46 skrev \"Shawn O. Pearce\" <spearce@spearce.org>:\n> diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\n> index b2bcbb7..1eb40d4 100644\n> --- a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\n> +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\n> @@ -1037,6 +1037,14 @@ public PackLock renameAndOpenPack(final String lockMessage)\n>  \t\tfinal File finalIdx = new File(packDir, \"pack-\" + name + \".idx\");\n>  \t\tfinal PackLock keep = new PackLock(finalPack);\n>  \n> +\t\tif (!packDir.exists() && !packDir.mkdir() && !packDir.exists()) {\n\nIs there a lot to gain by this instead of just if (!packDir.mkdir() && !packDir.exists()) ?\n\n-- robin\n"},{"id":"113499","messageId":"20090510230341.GG30527@spearce.org","threadId":"19258","inReplyTo":"200905110059.50494.robin.rosenberg.lists@dewire.com","subject":"Re: [PATCH] Create $GIT_DIR/objects/pack if missing during renameAndOpenPack","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-05-10T23:03:41Z","receivedAt":"2009-05-10T23:03:41Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:\n> s?ndag 10 maj 2009 23:30:46 skrev \"Shawn O. Pearce\" <spearce@spearce.org>:\n> > diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\n> > index b2bcbb7..1eb40d4 100644\n> > --- a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\n> > +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java\n> > @@ -1037,6 +1037,14 @@ public PackLock renameAndOpenPack(final String lockMessage)\n> >  \t\tfinal File finalIdx = new File(packDir, \"pack-\" + name + \".idx\");\n> >  \t\tfinal PackLock keep = new PackLock(finalPack);\n> >  \n> > +\t\tif (!packDir.exists() && !packDir.mkdir() && !packDir.exists()) {\n> \n> Is there a lot to gain by this instead of just if (!packDir.mkdir() && !packDir.exists()) ?\n\nNo, not really.  But usually the directory exists, its rare when\nit doesn't.\n\nWe probably just wasted more CPU time in our MUAs debating this than\nit really costs in the long run.  I'm too #@!** lazy to go back\nand amend this patch.  But you can amend it if it really bothers\nyou to do the \"!exists && !mkdir && !exists\".\n\n-- \nShawn.\n"}]}