Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-18 14:47:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12947 from ywk253100/200902_replication

Browse Source 
retry several times when failed to copy blob during the replication
This commit is contained in:
stonezdj(Daojun Zhang) 2020-09-02 17:01:52 +08:00 committed by GitHub
commit 05489fca1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/replication/transfer/image/transfer.go
View File

@ -17,7 +17,10 @@ package image
import ( import (
"errors" "errors"
"net/http" "net/http"
"os"
"strconv"
"strings" "strings"
"time"
"github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema1"
@ -32,7 +35,15 @@ import (
trans "github.com/goharbor/harbor/src/replication/transfer" trans "github.com/goharbor/harbor/src/replication/transfer"
) )
var (
retry int
)
func init() { func init() {
retry, _ = strconv.Atoi(os.Getenv("COPY_BLOB_RETRY_COUNT"))
if retry <= 0 {
retry = 5
}
if err := trans.RegisterFactory(model.ResourceTypeImage, factory); err != nil { if err := trans.RegisterFactory(model.ResourceTypeImage, factory); err != nil {
log.Errorf("failed to register transfer factory: %v", err) log.Errorf("failed to register transfer factory: %v", err)
} }
@ -244,17 +255,33 @@ func (t *transfer) copyContent(content distribution.Descriptor, srcRepo, dstRepo
// the media type of the layer or config can be "application/octet-stream", // the media type of the layer or config can be "application/octet-stream",
// schema1.MediaTypeManifestLayer, schema2.MediaTypeLayer, schema2.MediaTypeImageConfig // schema1.MediaTypeManifestLayer, schema2.MediaTypeLayer, schema2.MediaTypeImageConfig
default: default:
return t.copyBlob(srcRepo, dstRepo, digest, content.Size) return t.copyBlobWithRetry(srcRepo, dstRepo, digest, content.Size)
} }
} }
func (t *transfer) copyBlobWithRetry(srcRepo, dstRepo, digest string, sizeFromDescriptor int64) error {
var err error
for i, backoff := 1, 2*time.Second; i <= retry; i, backoff = i+1, backoff*2 {
t.logger.Infof("copying the blob %s(the %dth running)...", digest, i)
if err = t.copyBlob(srcRepo, dstRepo, digest, sizeFromDescriptor); err == nil {
t.logger.Infof("copy the blob %s completed", digest)
return nil
}
if i == retry {
break
}
t.logger.Infof("will retry %v later", backoff)
time.Sleep(backoff)
}
return err
}
// copy the layer or artifact config from the source registry to destination // copy the layer or artifact config from the source registry to destination
// the size parameter is taken from manifests. // the size parameter is taken from manifests.
func (t *transfer) copyBlob(srcRepo, dstRepo, digest string, sizeFromDescriptor int64) error { func (t *transfer) copyBlob(srcRepo, dstRepo, digest string, sizeFromDescriptor int64) error {
if t.shouldStop() { if t.shouldStop() {
return nil return nil
} }
t.logger.Infof("copying the blob %s...", digest)
exist, err := t.dst.BlobExist(dstRepo, digest) exist, err := t.dst.BlobExist(dstRepo, digest)
if err != nil { if err != nil {
t.logger.Errorf("failed to check the existence of blob %s on the destination registry: %v", digest, err) t.logger.Errorf("failed to check the existence of blob %s on the destination registry: %v", digest, err)
@ -278,10 +305,9 @@ func (t *transfer) copyBlob(srcRepo, dstRepo, digest string, sizeFromDescriptor
} }
if err = t.dst.PushBlob(dstRepo, digest, size, data); err != nil { if err = t.dst.PushBlob(dstRepo, digest, size, data); err != nil {
t.logger.Errorf("failed to pushing the blob %s: %v", digest, err) t.logger.Errorf("failed to pushing the blob %s, size %d: %v", digest, size, err)
return err return err
} }
t.logger.Infof("copy the blob %s completed", digest)
return nil return nil
} }