Merge pull request #813 from jakedt/phase2-11-07-2015
Stop reading the v1 checksums from storage
This commit is contained in:
commit
90dd76806c
4 changed files with 4 additions and 4 deletions
|
@ -8,7 +8,7 @@ Create Date: 2015-11-04 16:29:48.905775
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
# revision identifiers, used by Alembic.
|
||||||
revision = '2827d36939e4'
|
revision = '2827d36939e4'
|
||||||
down_revision = '73669db7e12'
|
down_revision = '5cdc2d819c5'
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
|
|
|
@ -6,7 +6,7 @@ Create Date: 2015-07-13 16:51:41.669249
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
# revision identifiers, used by Alembic.
|
||||||
revision = '57dad559ff2d'
|
revision = '57dad559ff2d'
|
||||||
down_revision = '35f538da62'
|
down_revision = '73669db7e12'
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
|
|
|
@ -278,14 +278,14 @@ def put_image_layer(namespace, repository, image_id):
|
||||||
except (IOError, checksums.TarError) as exc:
|
except (IOError, checksums.TarError) as exc:
|
||||||
logger.debug('put_image_layer: Error when computing tarsum %s', exc)
|
logger.debug('put_image_layer: Error when computing tarsum %s', exc)
|
||||||
|
|
||||||
if repo_image.storage.checksum is None:
|
if repo_image.v1_checksum is None:
|
||||||
# We don't have a checksum stored yet, that's fine skipping the check.
|
# We don't have a checksum stored yet, that's fine skipping the check.
|
||||||
# Not removing the mark though, image is not downloadable yet.
|
# Not removing the mark though, image is not downloadable yet.
|
||||||
session['checksum'] = csums
|
session['checksum'] = csums
|
||||||
session['content_checksum'] = 'sha256:{0}'.format(ch.hexdigest())
|
session['content_checksum'] = 'sha256:{0}'.format(ch.hexdigest())
|
||||||
return make_response('true', 200)
|
return make_response('true', 200)
|
||||||
|
|
||||||
checksum = repo_image.storage.checksum
|
checksum = repo_image.v1_checksum
|
||||||
|
|
||||||
# We check if the checksums provided matches one the one we computed
|
# We check if the checksums provided matches one the one we computed
|
||||||
if checksum not in csums:
|
if checksum not in csums:
|
||||||
|
|
Binary file not shown.
Reference in a new issue