From bcea6a777569d7a4188a4f4d94a84f7477cbc366 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 May 2013 14:27:39 -0400 Subject: migrate: Detect if a file gets corrupted while it's being migrated. --- Command/Migrate.hs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'Command') diff --git a/Command/Migrate.hs b/Command/Migrate.hs index d8bfd74f1..0fdf0e817 100644 --- a/Command/Migrate.hs +++ b/Command/Migrate.hs @@ -52,15 +52,20 @@ upgradableKey backend key = isNothing (Types.Key.keySize key) || backendupgradab {- Store the old backend's key in the new backend - The old backend's key is not dropped from it, because there may - - be other files still pointing at that key. -} + - be other files still pointing at that key. + - + - To ensure that the data we have for the old key is valid, it's + - fscked here. First we generate the new key. This ensures that the + - data cannot get corrupted after the fsck but before the new key is + - generated. + -} perform :: FilePath -> Key -> Backend -> Backend -> CommandPerform -perform file oldkey oldbackend newbackend = do - ifM (Command.Fsck.checkBackend oldbackend oldkey (Just file)) - ( maybe stop go =<< genkey - , stop - ) +perform file oldkey oldbackend newbackend = go =<< genkey where - go newkey = stopUnless (Command.ReKey.linkKey oldkey newkey) $ + go Nothing = stop + go (Just newkey) = stopUnless checkcontent $ finish newkey + checkcontent = Command.Fsck.checkBackend oldbackend oldkey $ Just file + finish newkey = stopUnless (Command.ReKey.linkKey oldkey newkey) $ next $ Command.ReKey.cleanup file oldkey newkey genkey = do content <- calcRepo $ gitAnnexLocation oldkey -- cgit v1.2.3