Skip to content

Commit ffc904b

Browse files
lunnytechknowlogick
authored andcommitted
Sleep longer if request speed is over github limitation (#9335)
* Sleep longer if request speed is over github limitation * improve code * remove unused code * fix lint * Use github's rate limit remain value to determine how long to sleep * Save reset time when finished github api request * fix bug * fix lint * Add context.Context for sleep * fix test * improve code * fix bug and lint * fix import order
1 parent d1a4997 commit ffc904b

File tree

8 files changed

+86
-16
lines changed

8 files changed

+86
-16
lines changed

modules/migrations/base/downloader.go

+11
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
package base
77

88
import (
9+
"context"
910
"time"
1011

1112
"code.gitea.io/gitea/modules/structs"
1213
)
1314

1415
// Downloader downloads the site repo informations
1516
type Downloader interface {
17+
SetContext(context.Context)
1618
GetRepoInfo() (*Repository, error)
1719
GetTopics() ([]string, error)
1820
GetMilestones() ([]*Milestone, error)
@@ -30,6 +32,10 @@ type DownloaderFactory interface {
3032
GitServiceType() structs.GitServiceType
3133
}
3234

35+
var (
36+
_ Downloader = &RetryDownloader{}
37+
)
38+
3339
// RetryDownloader retry the downloads
3440
type RetryDownloader struct {
3541
Downloader
@@ -46,6 +52,11 @@ func NewRetryDownloader(downloader Downloader, retryTimes, retryDelay int) *Retr
4652
}
4753
}
4854

55+
// SetContext set context
56+
func (d *RetryDownloader) SetContext(ctx context.Context) {
57+
d.Downloader.SetContext(ctx)
58+
}
59+
4960
// GetRepoInfo returns a repository information with retry
5061
func (d *RetryDownloader) GetRepoInfo() (*Repository, error) {
5162
var (

modules/migrations/git.go

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
package migrations
66

77
import (
8+
"context"
9+
810
"code.gitea.io/gitea/modules/migrations/base"
911
)
1012

@@ -28,6 +30,10 @@ func NewPlainGitDownloader(ownerName, repoName, remoteURL string) *PlainGitDownl
2830
}
2931
}
3032

33+
// SetContext set context
34+
func (g *PlainGitDownloader) SetContext(ctx context.Context) {
35+
}
36+
3137
// GetRepoInfo returns a repository information
3238
func (g *PlainGitDownloader) GetRepoInfo() (*base.Repository, error) {
3339
// convert github repo to stand Repo

modules/migrations/gitea.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package migrations
77

88
import (
9+
"context"
910
"fmt"
1011
"io"
1112
"net/http"
@@ -35,6 +36,7 @@ var (
3536

3637
// GiteaLocalUploader implements an Uploader to gitea sites
3738
type GiteaLocalUploader struct {
39+
ctx context.Context
3840
doer *models.User
3941
repoOwner string
4042
repoName string
@@ -49,8 +51,9 @@ type GiteaLocalUploader struct {
4951
}
5052

5153
// NewGiteaLocalUploader creates an gitea Uploader via gitea API v1
52-
func NewGiteaLocalUploader(doer *models.User, repoOwner, repoName string) *GiteaLocalUploader {
54+
func NewGiteaLocalUploader(ctx context.Context, doer *models.User, repoOwner, repoName string) *GiteaLocalUploader {
5355
return &GiteaLocalUploader{
56+
ctx: ctx,
5457
doer: doer,
5558
repoOwner: repoOwner,
5659
repoName: repoName,

modules/migrations/gitea_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"time"
1111

1212
"code.gitea.io/gitea/models"
13+
"code.gitea.io/gitea/modules/graceful"
1314
"code.gitea.io/gitea/modules/structs"
1415
"code.gitea.io/gitea/modules/util"
1516

@@ -27,7 +28,7 @@ func TestGiteaUploadRepo(t *testing.T) {
2728
var (
2829
downloader = NewGithubDownloaderV3("", "", "go-xorm", "builder")
2930
repoName = "builder-" + time.Now().Format("2006-01-02-15-04-05")
30-
uploader = NewGiteaLocalUploader(user, user.Name, repoName)
31+
uploader = NewGiteaLocalUploader(graceful.GetManager().HammerContext(), user, user.Name, repoName)
3132
)
3233

3334
err := migrateRepository(downloader, uploader, structs.MigrateRepoOption{

modules/migrations/github.go

+54-10
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"net/http"
1212
"net/url"
1313
"strings"
14+
"time"
1415

1516
"code.gitea.io/gitea/modules/log"
1617
"code.gitea.io/gitea/modules/migrations/base"
@@ -73,6 +74,7 @@ type GithubDownloaderV3 struct {
7374
repoName string
7475
userName string
7576
password string
77+
rate *github.Rate
7678
}
7779

7880
// NewGithubDownloaderV3 creates a github Downloader via github v3 API
@@ -107,12 +109,39 @@ func NewGithubDownloaderV3(userName, password, repoOwner, repoName string) *Gith
107109
return &downloader
108110
}
109111

112+
// SetContext set context
113+
func (g *GithubDownloaderV3) SetContext(ctx context.Context) {
114+
g.ctx = ctx
115+
}
116+
117+
func (g *GithubDownloaderV3) sleep() {
118+
for g.rate != nil && g.rate.Remaining <= 0 {
119+
timer := time.NewTimer(time.Until(g.rate.Reset.Time))
120+
select {
121+
case <-g.ctx.Done():
122+
timer.Stop()
123+
return
124+
case <-timer.C:
125+
}
126+
127+
rates, _, err := g.client.RateLimits(g.ctx)
128+
if err != nil {
129+
log.Error("g.client.RateLimits: %s", err)
130+
}
131+
132+
g.rate = rates.GetCore()
133+
}
134+
}
135+
110136
// GetRepoInfo returns a repository information
111137
func (g *GithubDownloaderV3) GetRepoInfo() (*base.Repository, error) {
112-
gr, _, err := g.client.Repositories.Get(g.ctx, g.repoOwner, g.repoName)
138+
g.sleep()
139+
gr, resp, err := g.client.Repositories.Get(g.ctx, g.repoOwner, g.repoName)
113140
if err != nil {
114141
return nil, err
115142
}
143+
g.rate = &resp.Rate
144+
116145
// convert github repo to stand Repo
117146
return &base.Repository{
118147
Owner: g.repoOwner,
@@ -126,16 +155,22 @@ func (g *GithubDownloaderV3) GetRepoInfo() (*base.Repository, error) {
126155

127156
// GetTopics return github topics
128157
func (g *GithubDownloaderV3) GetTopics() ([]string, error) {
129-
r, _, err := g.client.Repositories.Get(g.ctx, g.repoOwner, g.repoName)
130-
return r.Topics, err
158+
g.sleep()
159+
r, resp, err := g.client.Repositories.Get(g.ctx, g.repoOwner, g.repoName)
160+
if err != nil {
161+
return nil, err
162+
}
163+
g.rate = &resp.Rate
164+
return r.Topics, nil
131165
}
132166

133167
// GetMilestones returns milestones
134168
func (g *GithubDownloaderV3) GetMilestones() ([]*base.Milestone, error) {
135169
var perPage = 100
136170
var milestones = make([]*base.Milestone, 0, perPage)
137171
for i := 1; ; i++ {
138-
ms, _, err := g.client.Issues.ListMilestones(g.ctx, g.repoOwner, g.repoName,
172+
g.sleep()
173+
ms, resp, err := g.client.Issues.ListMilestones(g.ctx, g.repoOwner, g.repoName,
139174
&github.MilestoneListOptions{
140175
State: "all",
141176
ListOptions: github.ListOptions{
@@ -145,6 +180,7 @@ func (g *GithubDownloaderV3) GetMilestones() ([]*base.Milestone, error) {
145180
if err != nil {
146181
return nil, err
147182
}
183+
g.rate = &resp.Rate
148184

149185
for _, m := range ms {
150186
var desc string
@@ -189,14 +225,16 @@ func (g *GithubDownloaderV3) GetLabels() ([]*base.Label, error) {
189225
var perPage = 100
190226
var labels = make([]*base.Label, 0, perPage)
191227
for i := 1; ; i++ {
192-
ls, _, err := g.client.Issues.ListLabels(g.ctx, g.repoOwner, g.repoName,
228+
g.sleep()
229+
ls, resp, err := g.client.Issues.ListLabels(g.ctx, g.repoOwner, g.repoName,
193230
&github.ListOptions{
194231
Page: i,
195232
PerPage: perPage,
196233
})
197234
if err != nil {
198235
return nil, err
199236
}
237+
g.rate = &resp.Rate
200238

201239
for _, label := range ls {
202240
labels = append(labels, convertGithubLabel(label))
@@ -260,14 +298,16 @@ func (g *GithubDownloaderV3) GetReleases() ([]*base.Release, error) {
260298
var perPage = 100
261299
var releases = make([]*base.Release, 0, perPage)
262300
for i := 1; ; i++ {
263-
ls, _, err := g.client.Repositories.ListReleases(g.ctx, g.repoOwner, g.repoName,
301+
g.sleep()
302+
ls, resp, err := g.client.Repositories.ListReleases(g.ctx, g.repoOwner, g.repoName,
264303
&github.ListOptions{
265304
Page: i,
266305
PerPage: perPage,
267306
})
268307
if err != nil {
269308
return nil, err
270309
}
310+
g.rate = &resp.Rate
271311

272312
for _, release := range ls {
273313
releases = append(releases, g.convertGithubRelease(release))
@@ -304,11 +344,12 @@ func (g *GithubDownloaderV3) GetIssues(page, perPage int) ([]*base.Issue, bool,
304344
}
305345

306346
var allIssues = make([]*base.Issue, 0, perPage)
307-
308-
issues, _, err := g.client.Issues.ListByRepo(g.ctx, g.repoOwner, g.repoName, opt)
347+
g.sleep()
348+
issues, resp, err := g.client.Issues.ListByRepo(g.ctx, g.repoOwner, g.repoName, opt)
309349
if err != nil {
310350
return nil, false, fmt.Errorf("error while listing repos: %v", err)
311351
}
352+
g.rate = &resp.Rate
312353
for _, issue := range issues {
313354
if issue.IsPullRequest() {
314355
continue
@@ -365,10 +406,12 @@ func (g *GithubDownloaderV3) GetComments(issueNumber int64) ([]*base.Comment, er
365406
},
366407
}
367408
for {
409+
g.sleep()
368410
comments, resp, err := g.client.Issues.ListComments(g.ctx, g.repoOwner, g.repoName, int(issueNumber), opt)
369411
if err != nil {
370412
return nil, fmt.Errorf("error while listing repos: %v", err)
371413
}
414+
g.rate = &resp.Rate
372415
for _, comment := range comments {
373416
var email string
374417
if comment.User.Email != nil {
@@ -408,11 +451,12 @@ func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullReq
408451
},
409452
}
410453
var allPRs = make([]*base.PullRequest, 0, perPage)
411-
412-
prs, _, err := g.client.PullRequests.List(g.ctx, g.repoOwner, g.repoName, opt)
454+
g.sleep()
455+
prs, resp, err := g.client.PullRequests.List(g.ctx, g.repoOwner, g.repoName, opt)
413456
if err != nil {
414457
return nil, fmt.Errorf("error while listing repos: %v", err)
415458
}
459+
g.rate = &resp.Rate
416460
for _, pr := range prs {
417461
var body string
418462
if pr.Body != nil {

modules/migrations/migrate.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package migrations
77

88
import (
9+
"context"
910
"fmt"
1011

1112
"code.gitea.io/gitea/models"
@@ -28,10 +29,10 @@ func RegisterDownloaderFactory(factory base.DownloaderFactory) {
2829
}
2930

3031
// MigrateRepository migrate repository according MigrateOptions
31-
func MigrateRepository(doer *models.User, ownerName string, opts base.MigrateOptions) (*models.Repository, error) {
32+
func MigrateRepository(ctx context.Context, doer *models.User, ownerName string, opts base.MigrateOptions) (*models.Repository, error) {
3233
var (
3334
downloader base.Downloader
34-
uploader = NewGiteaLocalUploader(doer, ownerName, opts.RepoName)
35+
uploader = NewGiteaLocalUploader(ctx, doer, ownerName, opts.RepoName)
3536
theFactory base.DownloaderFactory
3637
)
3738

@@ -69,6 +70,8 @@ func MigrateRepository(doer *models.User, ownerName string, opts base.MigrateOpt
6970
downloader = base.NewRetryDownloader(downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff)
7071
}
7172

73+
downloader.SetContext(ctx)
74+
7275
if err := migrateRepository(downloader, uploader, opts); err != nil {
7376
if err1 := uploader.Rollback(); err1 != nil {
7477
log.Error("rollback failed: %v", err1)

modules/task/migrate.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"strings"
1212

1313
"code.gitea.io/gitea/models"
14+
"code.gitea.io/gitea/modules/graceful"
1415
"code.gitea.io/gitea/modules/log"
1516
"code.gitea.io/gitea/modules/migrations"
1617
"code.gitea.io/gitea/modules/notification"
@@ -95,7 +96,7 @@ func runMigrateTask(t *models.Task) (err error) {
9596
}
9697

9798
opts.MigrateToRepoID = t.RepoID
98-
repo, err := migrations.MigrateRepository(t.Doer, t.Owner.Name, *opts)
99+
repo, err := migrations.MigrateRepository(graceful.GetManager().HammerContext(), t.Doer, t.Owner.Name, *opts)
99100
if err == nil {
100101
log.Trace("Repository migrated [%d]: %s/%s", repo.ID, t.Owner.Name, repo.Name)
101102
return nil

routers/api/v1/repo/repo.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"code.gitea.io/gitea/modules/context"
1919
"code.gitea.io/gitea/modules/convert"
2020
"code.gitea.io/gitea/modules/git"
21+
"code.gitea.io/gitea/modules/graceful"
2122
"code.gitea.io/gitea/modules/log"
2223
"code.gitea.io/gitea/modules/migrations"
2324
"code.gitea.io/gitea/modules/notification"
@@ -481,7 +482,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
481482
}
482483
}()
483484

484-
if _, err = migrations.MigrateRepository(ctx.User, ctxUser.Name, opts); err != nil {
485+
if _, err = migrations.MigrateRepository(graceful.GetManager().HammerContext(), ctx.User, ctxUser.Name, opts); err != nil {
485486
handleMigrateError(ctx, ctxUser, remoteAddr, err)
486487
return
487488
}

0 commit comments

Comments
 (0)