9074421ec3
The Shaman server is a file storage system that identifies files by SHA256sum and file length. BAT can send packs there by only uploading changed/new files. The BAT pack is reproduced at the Shaman server's checkout directory by creating symlinks to the files in its file storage. Retrying sending files: When we can defer uploading a file (that is, when we have other files to upload as well, and we could send the current file at a later moment) we send an `X-Shaman-Can-Defer-Upload: true` header in the file upload request. In that case, when someone else is already uploading that file, a `208 Already Reported` response is sent and the connection is closed. Python's Requests library unfortunately won't give us that response if we're still streaming the request, and raise a ConnectionError exception instead. This exception can mean two things: - If the `X-Shaman-Can-Defer-Upload: true` header was sent: someone else is currently uploading that file, so defer it. - If that header was not sent: that file is already completely uploaded and does not need to be uploaded again. Instead of retrying each failed file, after a few failures we now just resend the definition file to get a new list of files to upload, then send those. This should considerably reduce the number of HTTP calls when multiple clients are uploading the same set of files.
94 lines
3.9 KiB
Python
94 lines
3.9 KiB
Python
# ***** BEGIN GPL LICENSE BLOCK *****
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
#
|
|
# ***** END GPL LICENCE BLOCK *****
|
|
#
|
|
# (c) 2019, Blender Foundation - Sybren A. Stüvel
|
|
import json
|
|
import pathlib
|
|
from unittest import mock
|
|
|
|
import responses
|
|
|
|
from abstract_test import AbstractBlendFileTest
|
|
from blender_asset_tracer.pack.shaman import transfer
|
|
|
|
httpmock = responses.RequestsMock()
|
|
|
|
|
|
class AbstractChecksumTest(AbstractBlendFileTest):
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super().setUpClass()
|
|
cls.test_file1 = cls.blendfiles / 'linked_cube_compressed.blend'
|
|
cls.test_file2 = cls.blendfiles / 'basic_file.blend'
|
|
cls.expected_checksums = {
|
|
cls.test_file1: '3c525e3a01ece11f26ded1e05e43284c4cce575c8074b97c6bdbc414fa2802ab',
|
|
cls.test_file2: 'd5283988d95f259069d4cd3c25a40526090534b8d188577b6c6fb36c3d481454',
|
|
}
|
|
cls.file_sizes = {
|
|
cls.test_file1: cls.test_file1.stat().st_size,
|
|
cls.test_file2: cls.test_file2.stat().st_size,
|
|
}
|
|
cls.packed_names = {
|
|
cls.test_file1: pathlib.Path('path/in/pack/test1.blend'),
|
|
cls.test_file2: pathlib.Path('path/in/pack/test2.blend'),
|
|
}
|
|
|
|
def assertValidCheckoutDef(self, definition_file: bytes):
|
|
# We don't care much about the order, so compare as set.
|
|
expect_lines = set()
|
|
for filepath in [self.test_file1, self.test_file2]:
|
|
checksum = self.expected_checksums[filepath]
|
|
fsize = self.file_sizes[filepath]
|
|
relpath = str(self.packed_names[filepath])
|
|
expect_lines.add(b'%s %d %s' % (checksum.encode(), fsize, relpath.encode()))
|
|
self.assertEqual(expect_lines, set(definition_file.split(b'\n')))
|
|
|
|
@httpmock.activate
|
|
def test_checkout_happy(self):
|
|
checksum1 = self.expected_checksums[self.test_file1]
|
|
fsize1 = self.file_sizes[self.test_file1]
|
|
|
|
def mock_requirements(request):
|
|
self.assertEqual('text/plain', request.headers['Content-Type'])
|
|
self.assertValidCheckoutDef(request.body)
|
|
|
|
body = 'does-not-exist path/in/pack/test1.blend\n'
|
|
return 200, {'Content-Type': 'text/plain'}, body
|
|
|
|
def mock_checkout_create(request):
|
|
self.assertEqual('text/plain', request.headers['Content-Type'])
|
|
self.assertValidCheckoutDef(request.body)
|
|
return 200, {'Content-Type': 'text/plain'}, 'DA/-JOB-ID'
|
|
|
|
httpmock.add_callback('POST', 'http://unittest.local:1234/checkout/requirements',
|
|
callback=mock_requirements)
|
|
|
|
httpmock.add('POST', 'http://unittest.local:1234/files/%s/%d' % (checksum1, fsize1))
|
|
httpmock.add_callback('POST', 'http://unittest.local:1234/checkout/create/DA-JOB-ID',
|
|
callback=mock_checkout_create)
|
|
|
|
trans = transfer.ShamanTransferrer('auth-token', self.blendfiles,
|
|
'http://unittest.local:1234/', 'DA-JOB-ID')
|
|
trans.start()
|
|
trans.queue_copy(self.test_file1, pathlib.Path('/') / self.packed_names[self.test_file1])
|
|
trans.queue_copy(self.test_file2, pathlib.Path('/') / self.packed_names[self.test_file2])
|
|
trans.done_and_join()
|
|
|
|
self.assertFalse(trans.has_error)
|
|
self.assertEqual('DA/-JOB-ID', trans.checkout_location)
|