1558e03014
That git fixed a memory leak that could cause an OOM during the upgrade. Most git-annex builds have a new enough git already. OSX git was upgraded with brew. Linux i386ancient build's git was too old. Upgrading it to a fixed git didn't work (due to the newer git not working with the old ssh, https://bugs.chromium.org/p/git/issues/detail?id=7 ) Choices to deal with that were: * Somehow make direct mode upgrade work with the old git, avoiding its OOM problem. One way would be to switch the repo to indirect mode first, and so upgrade to a repo with locked files. Not good when the filesystem does not support symlinks. * backport the OOM fix from git 2.22 (And do what about the version number so git-annex knows it's fixed?) * backport openssh (and possibly more stuff) * move the i386ancient build to at least Debian stretch (still backporting git) But this will make it no longer work with some of the ancient kernels it targets. Of those, backporting the OOM fix seemed the best approach. Put "oomfix" in the git version number to indicate it. I have not automated building the git backport, so here's the patch I used: diff -ur orig/git-2.1.4/convert.c git-2.1.4/convert.c --- orig/git-2.1.4/convert.c 2014-12-18 18:42:18.000000000 +0000 +++ git-2.1.4/convert.c 2019-08-29 20:05:04.371872338 +0100 @@ -404,7 +404,7 @@ if (start_async(&async)) return 0; /* error was already reported */ - if (strbuf_read(&nbuf, async.out, len) < 0) { + if (strbuf_read(&nbuf, async.out, 0) < 0) { error("read from external filter %s failed", cmd); ret = 0; } diff -ur orig/git-2.1.4/GIT-VERSION-GEN git-2.1.4/GIT-VERSION-GEN --- orig/git-2.1.4/GIT-VERSION-GEN 2014-12-18 18:42:18.000000000 +0000 +++ git-2.1.4/GIT-VERSION-GEN 2019-08-29 20:06:39.132743228 +0100 @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.1.4 +DEF_VER=v2.1.4.oomfix LF=' ' diff -ur orig/git-2.1.4/configure git-2.1.4/configure --- orig/git-2.1.4/configure 2014-12-18 18:42:19.000000000 +0000 +++ git-2.1.4/configure 2019-08-29 20:27:45.896380015 +0100 @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='git' PACKAGE_TARNAME='git' -PACKAGE_VERSION='2.1.4' -PACKAGE_STRING='git 2.1.4' +PACKAGE_VERSION='2.1.4.oomfix' +PACKAGE_STRING='git 2.1.4.oomfix' PACKAGE_BUGREPORT='git@vger.kernel.org' PACKAGE_URL='' diff -ur orig/git-2.1.4/version git-2.1.4/version --- orig/git-2.1.4/version 2014-12-18 18:42:19.000000000 +0000 +++ git-2.1.4/version 2019-08-29 20:06:17.572545210 +0100 @@ -1 +1 @@ -2.1.4 +2.1.4.oomfix
161 lines
5.2 KiB
Haskell
161 lines
5.2 KiB
Haskell
{- git-annex v5 -> v6 upgrade support
|
|
-
|
|
- Copyright 2015-2019 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Upgrade.V5 where
|
|
|
|
import Annex.Common
|
|
import qualified Annex
|
|
import Config
|
|
import Config.Smudge
|
|
import Annex.InodeSentinal
|
|
import Annex.Link
|
|
import Annex.CatFile
|
|
import Annex.WorkTree
|
|
import Annex.UUID
|
|
import Logs.Location
|
|
import qualified Upgrade.V5.Direct as Direct
|
|
import qualified Annex.Content as Content
|
|
import qualified Database.Keys
|
|
import qualified Git
|
|
import qualified Git.LsFiles
|
|
import qualified Git.Branch
|
|
import qualified Git.Version
|
|
import Git.FilePath
|
|
import Git.FileMode
|
|
import Git.Config
|
|
import Git.Ref
|
|
import Utility.InodeCache
|
|
import Utility.DottedVersion
|
|
import Annex.AdjustedBranch
|
|
|
|
import qualified Data.ByteString as S
|
|
|
|
upgrade :: Bool -> Annex Bool
|
|
upgrade automatic = flip catchNonAsync (const $ return False) $ do
|
|
unless automatic $
|
|
showAction "v5 to v6"
|
|
ifM isDirect
|
|
( do
|
|
checkGitVersionForDirectUpgrade
|
|
convertDirect
|
|
-- Worktree files are already populated, so don't
|
|
-- have this try to populate them again.
|
|
scanUnlockedFiles False
|
|
, do
|
|
checkGitVersionForIndirectUpgrade
|
|
scanUnlockedFiles True
|
|
)
|
|
configureSmudgeFilter
|
|
-- Inode sentinal file was only used in direct mode and when
|
|
-- locking down files as they were added. In v6, it's used more
|
|
-- extensively, so make sure it exists, since old repos that didn't
|
|
-- use direct mode may not have created it.
|
|
unlessM isDirect $
|
|
createInodeSentinalFile True
|
|
return True
|
|
|
|
-- git before 2.22 would OOM running git status on a large file.
|
|
--
|
|
-- Older versions of git that are patched (with
|
|
-- commit 02156ab031e430bc45ce6984dfc712de9962dec8)
|
|
-- can include "oomfix" in their version to indicate it.
|
|
gitWillOOM :: Annex Bool
|
|
gitWillOOM = liftIO $ do
|
|
v <- Git.Version.installed
|
|
return $ v < Git.Version.normalize "2.22" &&
|
|
not ("oomfix" `isInfixOf` fromDottedVersion v)
|
|
|
|
-- configureSmudgeFilter has to run git status, and direct mode files
|
|
-- are unlocked, so avoid the upgrade failing half way through.
|
|
checkGitVersionForDirectUpgrade :: Annex ()
|
|
checkGitVersionForDirectUpgrade = whenM gitWillOOM $
|
|
giveup "You must upgrade git to version 2.22 or newer in order to use this version of git-annex in this repository."
|
|
|
|
checkGitVersionForIndirectUpgrade :: Annex ()
|
|
checkGitVersionForIndirectUpgrade = whenM gitWillOOM $
|
|
warning "Git is older than version 2.22 and so it has a memory leak that affects using unlocked files. Recommend you upgrade git before unlocking any files in your repository."
|
|
|
|
convertDirect :: Annex ()
|
|
convertDirect = do
|
|
{- Direct mode makes the same tradeoff of using less disk
|
|
- space, with less preservation of old versions of files
|
|
- as does annex.thin. -}
|
|
setConfig (annexConfig "thin") (boolConfig True)
|
|
Annex.changeGitConfig $ \c -> c { annexThin = True }
|
|
Direct.setIndirect
|
|
cur <- fromMaybe (error "Somehow no branch is checked out")
|
|
<$> inRepo Git.Branch.current
|
|
upgradeDirectWorkTree
|
|
removeDirectCruft
|
|
{- Create adjusted branch where all files are unlocked.
|
|
- This should have the same content for each file as
|
|
- have been staged in upgradeDirectWorkTree. -}
|
|
AdjBranch b <- adjustBranch (LinkAdjustment UnlockAdjustment) cur
|
|
{- Since the work tree was already set up by
|
|
- upgradeDirectWorkTree, and contains unlocked file
|
|
- contents too, don't use git checkout to check out the
|
|
- adjust branch. Instead, update HEAD manually. -}
|
|
inRepo $ setHeadRef b
|
|
|
|
{- Walk work tree from top and convert all annex symlinks to pointer files,
|
|
- staging them in the index, and populating the annex objects with
|
|
- hard links (or copies) of the work tree files (when not modified or
|
|
- deleted).
|
|
-}
|
|
upgradeDirectWorkTree :: Annex ()
|
|
upgradeDirectWorkTree = do
|
|
top <- fromRepo Git.repoPath
|
|
(l, clean) <- inRepo $ Git.LsFiles.stagedDetails [top]
|
|
forM_ l go
|
|
void $ liftIO clean
|
|
where
|
|
go (f, Just _sha, Just mode) | isSymLink mode = do
|
|
-- Cannot use lookupFile here, as we're in between direct
|
|
-- mode and v6.
|
|
mk <- catKeyFile f
|
|
case mk of
|
|
Nothing -> noop
|
|
Just k -> do
|
|
stagePointerFile f Nothing =<< hashPointerFile k
|
|
ifM (isJust <$> getAnnexLinkTarget f)
|
|
( writepointer f k
|
|
, fromdirect f k
|
|
)
|
|
Database.Keys.addAssociatedFile k
|
|
=<< inRepo (toTopFilePath f)
|
|
go _ = noop
|
|
|
|
fromdirect f k = ifM (Direct.goodContent k f)
|
|
( do
|
|
-- If linkToAnnex fails for some reason, the work tree
|
|
-- file still has the content; the annex object file
|
|
-- is just not populated with it. Since the work tree
|
|
-- file is recorded as an associated file, things will
|
|
-- still work that way, it's just not ideal.
|
|
ic <- withTSDelta (liftIO . genInodeCache f)
|
|
void $ Content.linkToAnnex k f ic
|
|
, unlessM (Content.inAnnex k) $ do
|
|
-- Worktree file was deleted or modified;
|
|
-- if there are no other copies of the content
|
|
-- then it's been lost.
|
|
locs <- Direct.associatedFiles k
|
|
unlessM (anyM (Direct.goodContent k) locs) $ do
|
|
u <- getUUID
|
|
logChange k u InfoMissing
|
|
)
|
|
|
|
writepointer f k = liftIO $ do
|
|
nukeFile f
|
|
S.writeFile f (formatPointer k)
|
|
|
|
{- Remove all direct mode bookkeeping files. -}
|
|
removeDirectCruft :: Annex ()
|
|
removeDirectCruft = mapM_ go =<< Content.listKeys Content.InAnywhere
|
|
where
|
|
go k = do
|
|
Direct.removeInodeCache k
|
|
Direct.removeAssociatedFiles k
|