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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
17ce21d7
Commit
17ce21d7
authored
Nov 17, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ionice absolute path
parent
f5fa3987
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
lib/gitlab/background_migration/prepare_untracked_uploads.rb
lib/gitlab/background_migration/prepare_untracked_uploads.rb
+3
-2
No files found.
lib/gitlab/background_migration/prepare_untracked_uploads.rb
View file @
17ce21d7
...
@@ -80,14 +80,15 @@ module Gitlab
...
@@ -80,14 +80,15 @@ module Gitlab
def
build_find_command
(
search_dir
)
def
build_find_command
(
search_dir
)
cmd
=
%W[find
#{
search_dir
}
-type f ! ( -path
#{
EXCLUDED_HASHED_UPLOADS_PATH
}
-prune ) ! ( -path
#{
EXCLUDED_TMP_UPLOADS_PATH
}
-prune ) -print0]
cmd
=
%W[find
#{
search_dir
}
-type f ! ( -path
#{
EXCLUDED_HASHED_UPLOADS_PATH
}
-prune ) ! ( -path
#{
EXCLUDED_TMP_UPLOADS_PATH
}
-prune ) -print0]
cmd
=
%w[ionice -c Idle]
+
cmd
if
ionice_is_available?
ionice
=
which_ionice
cmd
=
%W[
#{
ionice
}
-c Idle]
+
cmd
if
ionice
Rails
.
logger
.
info
"PrepareUntrackedUploads find command:
\"
#{
cmd
.
join
(
' '
)
}
\"
"
Rails
.
logger
.
info
"PrepareUntrackedUploads find command:
\"
#{
cmd
.
join
(
' '
)
}
\"
"
cmd
cmd
end
end
def
ionice_is_available?
def
which_ionice
Gitlab
::
Utils
.
which
(
'ionice'
)
Gitlab
::
Utils
.
which
(
'ionice'
)
rescue
StandardError
rescue
StandardError
# In this case, returning false is relatively safe, even though it isn't very nice
# In this case, returning false is relatively safe, even though it isn't very nice
...
...
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