Skip to content

Ignore already errors #7

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

Open
cemeyer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ignore already errors #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d31f587
redsnapper: Remove unneeded "thread" rubygem dependency
cemeyer Nov 7, 2018
aaa4db3
Ignore "Already exists" errors with "-k" flag
cemeyer Nov 7, 2018
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
50 changes: 31 additions & 19 deletions lib/redsnapper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'thread/pool'
require 'thread'
require 'open3'
require 'set'
require 'date'
Expand All @@ -9,6 +9,7 @@ class RedSnapper

EXIT_ERROR = "tarsnap: Error exit delayed from previous errors.\n"
NOT_OLDER_ERROR = "File on disk is not older; skipping.\n"
ALREADY_EXISTS = ": Already exists\n" # -k

GLOB_CHARS = '*?[]{}'

Expand All @@ -32,7 +33,31 @@ def <=>(other)
def initialize(archive, options = {})
@archive = archive
@options = options
@thread_pool = Thread.pool(options[:thread_pool_size] || THREAD_POOL_DEFAULT_SIZE)
@tpsize = options[:thread_pool_size] || THREAD_POOL_DEFAULT_SIZE
@work_qs = (0...@tpsize).map do
Queue.new
end
@thread_pool = (0...@tpsize).map do |i|
Thread.new do
chunk = @work_qs[i].pop()

# The following gross hack works around this gross bug in BSD tar that tarsnap inherits:
# https://github.com/Tarsnap/tarsnap/issues/329
chunk.map! { |file| file.gsub(/([#{Regexp.escape(GLOB_CHARS)}])/) { |m| "\\#{m}" } }
command = [ TARSNAP, '-xvf', @archive, *(@options[:tarsnap_options] + chunk) ]
Open3.popen3(*command) do |_, _, err|
while line = err.gets
next if line.end_with?(NOT_OLDER_ERROR) or line.end_with?(ALREADY_EXISTS)
if line == EXIT_ERROR
@error = true
next
end
@@output_mutex.synchronize { warn line.chomp }
end
end
end
end

@error = false
end

Expand Down Expand Up @@ -82,7 +107,7 @@ def files_to_extract
end

def file_groups
groups = (1..@thread_pool.max).map { Group.new }
groups = (1..@tpsize).map { Group.new }
files_to_extract.sort { |a, b| b.last[:size] <=> a.last[:size] }.each do |name, props|

# If the previous batch of files had an entry with the same size and date,
Expand All @@ -98,24 +123,11 @@ def file_groups
end

def run
file_groups.each do |chunk|
@thread_pool.process do
chunk.map! { |file| file.gsub(/([#{Regexp.escape(GLOB_CHARS)}])/) { |m| "\\#{m}" } }
command = [ TARSNAP, '-xvf', @archive, *(@options[:tarsnap_options] + chunk) ]
Open3.popen3(*command) do |_, _, err|
while line = err.gets
next if line.end_with?(NOT_OLDER_ERROR)
if line == EXIT_ERROR
@error = true
next
end
@@output_mutex.synchronize { warn line.chomp }
end
end
end
file_groups.each_with_index do |chunk, idx|
@work_qs[idx].push chunk
end

@thread_pool.shutdown
@thread_pool.map(&:join)
@@output_mutex.synchronize { warn EXIT_ERROR } if @error
end
end