From ada5919136bd292cb8cc2f93b28b4b5404171928 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Fri, 17 Jul 2015 17:11:52 +0200 Subject: [PATCH] Fixed: Disabled transactional file transfers since we don't want that feature in master yet. --- .../DiskTests/DiskTransferServiceFixture.cs | 16 ++++++++++++++++ src/NzbDrone.Common/Disk/DiskTransferService.cs | 3 +++ 2 files changed, 19 insertions(+) diff --git a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs index 669449e44..b7e7f4fce 100644 --- a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs +++ b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs @@ -30,6 +30,21 @@ namespace NzbDrone.Common.Test.DiskTests } [Test] + public void should_not_use_verified_transfer() + { + Subject.VerificationMode.Should().Be(DiskTransferVerificationMode.VerifyOnly); + + var result = Subject.TransferFile(_sourcePath, _targetPath, TransferMode.Move); + + Mocker.GetMock() + .Verify(v => v.TryCreateHardLink(_sourcePath, _backupPath), Times.Never()); + + Mocker.GetMock() + .Verify(v => v.MoveFile(_sourcePath, _targetPath, false), Times.Once()); + } + + [Test] + [Ignore("Disabled verified transfer temporarily.")] public void should_use_verified_transfer_on_mono() { MonoOnly(); @@ -38,6 +53,7 @@ namespace NzbDrone.Common.Test.DiskTests } [Test] + [Ignore("Disabled verified transfer temporarily.")] public void should_not_use_verified_transfer_on_windows() { WindowsOnly(); diff --git a/src/NzbDrone.Common/Disk/DiskTransferService.cs b/src/NzbDrone.Common/Disk/DiskTransferService.cs index 80647d61f..74a1d5f25 100644 --- a/src/NzbDrone.Common/Disk/DiskTransferService.cs +++ b/src/NzbDrone.Common/Disk/DiskTransferService.cs @@ -41,6 +41,9 @@ namespace NzbDrone.Common.Disk // TODO: Atm we haven't seen partial transfers on windows so we disable verified transfer. // (If enabled in the future, be sure to check specifically for ReFS, which doesn't support hardlinks.) VerificationMode = OsInfo.IsWindows ? DiskTransferVerificationMode.VerifyOnly : DiskTransferVerificationMode.Transactional; + + // TODO: Disabled the transactional logic entirely coz we have a couple of potential issues which we don't want in master. + VerificationMode = DiskTransferVerificationMode.VerifyOnly; } public TransferMode TransferFolder(String sourcePath, String targetPath, TransferMode mode, bool verified = true)