Change georeplication queuing to use new batch system
This commit is contained in:
parent
732ab67b57
commit
9413e25123
2 changed files with 31 additions and 11 deletions
|
@ -21,7 +21,7 @@ from image.docker import ManifestException
|
|||
from image.docker.schema1 import DockerSchema1Manifest, DockerSchema1ManifestBuilder
|
||||
from image.docker.schema2 import DOCKER_SCHEMA2_CONTENT_TYPES
|
||||
from util.names import VALID_TAG_PATTERN
|
||||
from util.registry.replication import queue_storage_replication
|
||||
from util.registry.replication import queue_replication_batch
|
||||
from util.validation import is_json
|
||||
|
||||
|
||||
|
@ -197,11 +197,11 @@ def _write_manifest_and_log(namespace_name, repo_name, manifest):
|
|||
repo, storage_map = _write_manifest(namespace_name, repo_name, manifest)
|
||||
|
||||
# Queue all blob manifests for replication.
|
||||
# TODO(jschorr): Find a way to optimize this insertion.
|
||||
if features.STORAGE_REPLICATION:
|
||||
for layer in manifest.layers:
|
||||
digest_str = str(layer.digest)
|
||||
queue_storage_replication(namespace_name, storage_map[digest_str])
|
||||
with queue_replication_batch(namespace_name) as queue_storage_replication:
|
||||
for layer in manifest.layers:
|
||||
digest_str = str(layer.digest)
|
||||
queue_storage_replication(storage_map[digest_str])
|
||||
|
||||
track_and_log('push_repo', repo, tag=manifest.tag)
|
||||
spawn_notification(repo, 'repo_push', {'updated_tags': [manifest.tag]})
|
||||
|
|
Reference in a new issue