rbarman 0.0.8 → 0.0.9

data/lib/rbarman/backup.rb

@@ -13,6 +13,9 @@ module RBarman
     # @return [String, nil] name of the server to which the backup belongs. 
     attr_accessor :server 
 
+    # @return [Integer, nil] the backup's PostgreSQL version 
+    attr_accessor :pg_version
+
     # @overload id
     #   @return [String, nil] id (like '20130304T080002') which identifies 
     #     the backup and is unique among all backups of a server. 
@@ -211,7 +214,14 @@ module RBarman
         if @begin_wal.xlog == xlog.to_s.rjust(8,'0')
           start = @begin_wal.segment.to_i(16)
         end
-        (start..254).each do |seg|
+
+        # http://wiki.postgresql.org/wiki/What's_new_in_PostgreSQL_9.3#WAL_filenames_may_end_in_FF
+        end_segment = 255
+        if @pg_version.nil? || @pg_version < 90300
+          end_segment = 254
+        end
+
+        (start..end_segment).each do |seg|
           w = WalFile.new
           w.timeline = @begin_wal.timeline
           w.xlog = xlog.rjust(8,'0')

data/lib/rbarman/cli_command.rb

@@ -117,13 +117,13 @@ module RBarman
     def wal_files(server, backup_id)
       lines = run_barman_command("list-files --target wal #{server} #{backup_id}")
       wal_files = parse_wal_files_list(lines)
-      xlog_db_lines = file_content("#{@barman_home}/#{server}/wals/xlog.db")
+      xlog_db = read_xlog_db(server)
       wal_files.each do |w| 
         wal = "#{w.timeline}#{w.xlog}#{w.segment}"
-        lines = xlog_db_lines.grep(/^#{wal}\t.+/)
-        raise(RuntimeError, "Found more than one wal file entry in xlog.db for #{wal}") if lines.count > 1
-        raise(RuntimeError, "Could not find any entry for #{wal} in xlog.db") if lines.count == 0
-        wal_file_info_from_xlog_db_line(w, lines[0])
+        entry = xlog_db[wal]
+        w.size = entry[:size]
+        w.compression = entry[:compression].downcase.to_sym
+        w.created = entry[:created].to_i
       end
       return wal_files
     end
@@ -162,6 +162,8 @@ module RBarman
           s.base_backups_dir = value
         when "wals_directory"
           s.wals_dir = value
+        when "server_txt_version"
+          s.pg_version = value
         end
       end
       return s
@@ -249,21 +251,12 @@ module RBarman
           backup.end_wal = WalFile.parse(value)
         when "pgdata"
           backup.pgdata = value
+        when "version"
+          backup.pg_version = value.to_i
         end
       end
     end
 
-    # Assigns size, created and compression values to a {WalFile} by parsing a line from xlog.db
-    # @param [WalFile] wal_file the wal file
-    # @param [String] line a string like '00000001000005A9000000BC\\t4684503\t1360568429.0\\tbzip2'
-    # @return [void]
-    def wal_file_info_from_xlog_db_line(wal_file, line)
-      splitted = line.split("\t")
-      wal_file.size = splitted[1]
-      wal_file.created = splitted[2].to_i
-      wal_file.compression = splitted[3].downcase.to_sym
-    end
-
     # Converts the size according to the unit to bytes
     # @param [Numeric] size the size
     # @param [String] unit the unit, like `B`, `KiB`, `MiB`, `GiB` or `TiB`
@@ -356,5 +349,18 @@ module RBarman
     def file_content(path)
       return File.readlines(path).map { |l| l.chomp }
     end
+
+    def read_xlog_db(server)
+      result = Hash.new
+      File.readlines("#{@barman_home}/#{server}/wals/xlog.db").each do |line|
+        splitted = line.chomp.split("\t")
+        result[splitted[0]] = {
+          :size => splitted[1],
+          :created => splitted[2],
+          :compression => splitted[3].downcase.to_sym
+        }
+      end
+      result
+    end
   end
 end

data/lib/rbarman/server.rb

@@ -45,6 +45,10 @@ module RBarman
     # @return [Backups, nil] server backups
     attr_accessor :backups
 
+    # @param [String] PostgreSQL version
+    # @return [String] PostgreSQL version
+    attr_accessor :pg_version
+
 
     # Creates a new instance of {Server}
     def initialize(name)

data/lib/rbarman/version.rb

@@ -1,3 +1,3 @@
 module RBarman
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/rbarman/wal_file.rb

@@ -60,6 +60,10 @@ module RBarman
     def initialize
     end
 
+    def to_s
+      "#{timeline}#{xlog}#{segment}"
+    end
+
     def timeline=(timeline)
       validate(timeline)
       @timeline = timeline

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rbarman
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
+  prerelease: 
 platform: ruby
 authors:
 - Holger Amann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,25 +97,32 @@ files:
 homepage: https://github.com/sauspiel/rbarman
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -547344130825939559
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -547344130825939559
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Wrapper for 2ndQuadrant's PostgreSQL backup tool 'barman'
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 51204ed022e1cb170e2b95a345423251ce9cfbfb
-  data.tar.gz: 02c0228594aaea19f4e6526645b74212ca55d895
-SHA512:
-  metadata.gz: 2f0e62639147bab58e67c0067f8590217dc267337ca40d72362d4e90eeb9372db410937627e4cb57012369fc2a625c2c782fc463237efb772667e2ae1815ef65
-  data.tar.gz: fb0fc2ff0e19e5d5a711ac03add7a53a2f1ff740140c9d8d11ff9e49747de6295e8c5a5fcd3a9899b2f8e5b3b43e2d66f40ceb370cfb5b387fd2fae5ac9629bd