Skip to content

Rework repository archive #14723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Jun 23, 2021
Merged

Rework repository archive #14723

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
705e256
Use storage to store archive files
lunny Feb 18, 2021
d8fe2b3
Fix backend lint
lunny Mar 18, 2021
a98990f
Add archiver table on database
lunny Mar 20, 2021
23f0577
Finish archive download
lunny Apr 16, 2021
75e2230
Fix test
lunny Apr 17, 2021
6e38463
Add database migrations
lunny Apr 20, 2021
3581718
Add status for archiver
lunny Apr 20, 2021
064b7d4
Fix lint
lunny Apr 20, 2021
23c9702
Add queue
lunny Apr 22, 2021
b65f3bf
Add doctor to check and delete old archives
lunny Apr 24, 2021
732046d
Improve archive queue
lunny Apr 24, 2021
fd779aa
Fix tests
lunny Apr 24, 2021
86eed11
improve archive storage
lunny Apr 24, 2021
dbd829e
Delete repo archives
lunny Apr 24, 2021
3b89940
Add missing fixture
lunny Apr 24, 2021
2d26520
fix fixture
lunny Apr 25, 2021
6bcc9dd
Fix fixture
lunny Apr 27, 2021
149fe6d
Fix test
lunny Apr 28, 2021
950ef31
Fix archiver cleaning
lunny Apr 28, 2021
45ad7ab
Fix bug
lunny May 31, 2021
aaa55d1
Add docs for repository archive storage
lunny Jun 2, 2021
fe149b1
remove repo-archive configuration
lunny Jun 4, 2021
739ac25
Fix test
lunny Jun 4, 2021
aa19e02
Fix test
lunny Jun 4, 2021
486ecc8
Fix lint
lunny Jun 14, 2021
e39ee22
Merge branch 'main' into lunny/archive_storage
6543 Jun 23, 2021
b10a053
Merge branch 'main' into lunny/archive_storage
techknowlogick Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test
  • Loading branch information
@lunny
lunny committed Jun 22, 2021
commit 739ac2569072700475322ff29302085a15d583a6
12 changes: 7 additions & 5 deletions modules/setting/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ func getStorage(name, typ string, targetSec *ini.Section) Storage {
sec.Key("MINIO_LOCATION").MustString("us-east-1")
sec.Key("MINIO_USE_SSL").MustBool(false)

if targetSec == nil {
targetSec = &ini.Section{}
}

var storage Storage
storage.Section = targetSec
storage.Type = typ
Expand All @@ -64,11 +68,9 @@ func getStorage(name, typ string, targetSec *ini.Section) Storage {
overrides = append(overrides, sec)

for _, override := range overrides {
if targetSec != nil {
for _, key := range override.Keys() {
if !targetSec.HasKey(key.Name()) {
_, _ = targetSec.NewKey(key.Name(), key.Value())
}
for _, key := range override.Keys() {
if !targetSec.HasKey(key.Name()) {
_, _ = targetSec.NewKey(key.Name(), key.Value())
}
}
if len(storage.Type) == 0 {
Expand Down