Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c085f88f
Commit
c085f88f
authored
7 years ago
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix backup task to ignore errors per project
parent
1b76c719
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
26 deletions
+29
-26
lib/backup/repository.rb
lib/backup/repository.rb
+29
-26
No files found.
lib/backup/repository.rb
View file @
c085f88f
...
...
@@ -14,7 +14,7 @@ module Backup
# Create namespace dir if missing
FileUtils
.
mkdir_p
(
File
.
join
(
backup_repos_path
,
project
.
namespace
.
full_path
))
if
project
.
namespace
if
project
.
empty_repo?
if
empty_repo?
(
project
)
$progress
.
puts
"[SKIPPED]"
.
color
(
:cyan
)
else
in_path
(
path_to_project_repo
)
do
|
dir
|
...
...
@@ -23,10 +23,7 @@ module Backup
output
,
status
=
Gitlab
::
Popen
.
popen
(
cmd
)
unless
status
.
zero?
puts
"[FAILED]"
.
color
(
:red
)
puts
"failed:
#{
cmd
.
join
(
' '
)
}
"
puts
output
abort
'Backup failed'
progress_warn
(
project
,
cmd
.
join
(
' '
),
output
)
end
end
...
...
@@ -36,10 +33,7 @@ module Backup
if
status
.
zero?
$progress
.
puts
"[DONE]"
.
color
(
:green
)
else
puts
"[FAILED]"
.
color
(
:red
)
puts
"failed:
#{
cmd
.
join
(
' '
)
}
"
puts
output
abort
'Backup failed'
progress_warn
(
project
,
cmd
.
join
(
' '
),
output
)
end
end
...
...
@@ -49,7 +43,7 @@ module Backup
if
File
.
exist?
(
path_to_wiki_repo
)
$progress
.
print
" *
#{
wiki
.
path_with_namespace
}
... "
if
wiki
.
repository
.
empty?
if
empty_wiki_repo?
(
wiki
)
$progress
.
puts
" [SKIPPED]"
.
color
(
:cyan
)
else
cmd
=
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
--git-dir=
#{
path_to_wiki_repo
}
bundle create
#{
path_to_wiki_bundle
}
--all)
...
...
@@ -57,10 +51,7 @@ module Backup
if
status
.
zero?
$progress
.
puts
" [DONE]"
.
color
(
:green
)
else
puts
" [FAILED]"
.
color
(
:red
)
puts
"failed:
#{
cmd
.
join
(
' '
)
}
"
puts
output
abort
'Backup failed'
progress_warn
(
wiki
,
cmd
.
join
(
' '
),
output
)
end
end
end
...
...
@@ -96,10 +87,7 @@ module Backup
if
status
.
zero?
$progress
.
puts
"[DONE]"
.
color
(
:green
)
else
puts
"[FAILED]"
.
color
(
:red
)
puts
"failed:
#{
cmd
.
join
(
' '
)
}
"
puts
output
abort
'Restore failed'
progress_warn
(
project
,
cmd
.
join
(
' '
),
output
)
end
in_path
(
path_to_tars
(
project
))
do
|
dir
|
...
...
@@ -107,10 +95,7 @@ module Backup
output
,
status
=
Gitlab
::
Popen
.
popen
(
cmd
)
unless
status
.
zero?
puts
"[FAILED]"
.
color
(
:red
)
puts
"failed:
#{
cmd
.
join
(
' '
)
}
"
puts
output
abort
'Restore failed'
progress_warn
(
project
,
cmd
.
join
(
' '
),
output
)
end
end
...
...
@@ -131,10 +116,7 @@ module Backup
if
status
.
zero?
$progress
.
puts
" [DONE]"
.
color
(
:green
)
else
puts
" [FAILED]"
.
color
(
:red
)
puts
"failed:
#{
cmd
.
join
(
' '
)
}
"
puts
output
abort
'Restore failed'
progress_warn
(
project
,
cmd
.
join
(
' '
),
output
)
end
end
end
...
...
@@ -201,6 +183,27 @@ module Backup
private
def
progress_warn
(
project
,
cmd
,
output
)
$progress
.
puts
"[WARNING] Executing
#{
cmd
}
"
.
color
(
:orange
)
$progress
.
puts
"Ignoring error on
#{
project
.
path_with_namespace
}
-
#{
output
}
"
.
color
(
:orange
)
end
def
empty_repo?
(
project
)
project
.
empty_repo?
rescue
=>
e
$progress
.
puts
"Ignoring error on
#{
project
.
full_path
}
repository -
#{
e
.
message
}
"
.
color
(
:orange
)
false
end
def
empty_wiki_repo?
(
wiki
)
wiki
.
repository
.
empty?
rescue
=>
e
$progress
.
puts
"Ignoring error on
#{
wiki
.
path_with_namespace
}
repository -
#{
e
.
message
}
"
.
color
(
:orange
)
false
end
def
repository_storage_paths_args
Gitlab
.
config
.
repositories
.
storages
.
values
.
map
{
|
rs
|
rs
[
'path'
]
}
end
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment