higgs 0.1.1 → 0.1.2

data/ChangeLog

@@ -1,8 +1,22 @@
+2007-10-12  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/higgs/version.rb: version 0.1.2.
+
+2007-10-10  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/higgs/storage.rb (Higgs::Storage class),
+	lib/higgs/utils/bman.rb (Higgs::Utils::BackupManager class): fixed
+	some close leakage bugs of file lock in the error case of
+	recovery.
+
+	* lib/higgs/flock.rb (Higgs::FileLock class): open with block.
+
 2007-10-08  TOKI Yoshinori  <toki@freedom.ne.jp>
 
 	* lib/higgs/version.rb: version 0.1.1.
 
-	* lib/higgs/utils/bman.rb: added variation of incremental backup.
+	* lib/higgs/utils/bman.rb (Higgs::Utils::BackupManager class):
+	added variation of incremental backup.
 
 	* bin/higgs_backup: changed command line syntax. added restore
 	commands.

data/lib/higgs/flock.rb

@@ -1,8 +1,8 @@
 # = file lock
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-09-26 00:20:20 +0900 (Wed, 26 Sep 2007) $
-# Revision:: $Revision: 559 $
+# Date:: $Date: 2007-10-10 00:49:33 +0900 (Wed, 10 Oct 2007) $
+# Revision:: $Revision: 626 $
 #
 # == license
 #   :include:LICENSE
@@ -11,7 +11,7 @@
 module Higgs
   class FileLock
     # for ident(1)
-    CVS_ID = '$Id: flock.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: flock.rb 626 2007-10-09 15:49:33Z toki $'
 
     def initialize(path, read_only=false)
       @path = path
@@ -68,6 +68,16 @@ module Higgs
 
       r
     end
+
+    def self.open(*args)
+      flock = new(*args)
+      begin
+        r = yield(flock)
+      ensure
+        flock.close
+      end
+      r
+    end
   end
 end
 

data/lib/higgs/storage.rb

@@ -1,8 +1,8 @@
 # = transactional storage core
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-05 02:35:02 +0900 (Fri, 05 Oct 2007) $
-# Revision:: $Revision: 614 $
+# Date:: $Date: 2007-10-10 00:49:33 +0900 (Wed, 10 Oct 2007) $
+# Revision:: $Revision: 626 $
 #
 # == license
 #   :include:LICENSE
@@ -23,7 +23,7 @@ module Higgs
   # = transactional storage core
   class Storage
     # for ident(1)
-    CVS_ID = '$Id: storage.rb 614 2007-10-04 17:35:02Z toki $'
+    CVS_ID = '$Id: storage.rb 626 2007-10-09 15:49:33Z toki $'
 
     extend Forwardable
     include Exceptions
@@ -837,41 +837,41 @@ module Higgs
       jlog_name = "#{name}.jlog"
       lock_name = "#{name}.lock"
 
-      flock = FileLock.new(lock_name)
-      flock.synchronize{
-        begin
-          w_io = File.open(tar_name, File::WRONLY | File::CREAT | File::EXCL, 0660)
-        rescue Errno::EEXIST
-          w_io = File.open(tar_name, File::WRONLY, 0660)
-        end
-        w_io.binmode
-        w_tar = Tar::ArchiveWriter.new(w_io)
+      FileLock.open(lock_name) {|flock|
+        flock.synchronize{
+          begin
+            w_io = File.open(tar_name, File::WRONLY | File::CREAT | File::EXCL, 0660)
+          rescue Errno::EEXIST
+            w_io = File.open(tar_name, File::WRONLY, 0660)
+          end
+          w_io.binmode
+          w_tar = Tar::ArchiveWriter.new(w_io)
 
-        index = Index.new
-        index.load(idx_name) if (File.exist? idx_name)
+          index = Index.new
+          index.load(idx_name) if (File.exist? idx_name)
 
-        out << "recovery target: #{name}\n" if (out && verbose_level >= 1)
-        jlog_list = rotate_entries(jlog_name)
-        jlog_list << jlog_name if (File.exist? jlog_name)
-        for curr_name in jlog_list
-          begin
-            JournalLogger.each_log(curr_name) do |log|
-              change_number = log[0]
-              out << "apply journal log: #{change_number}\n" if (out && verbose_level >= 1)
-              apply_journal(w_tar, index, log)
+          out << "recovery target: #{name}\n" if (out && verbose_level >= 1)
+          jlog_list = rotate_entries(jlog_name)
+          jlog_list << jlog_name if (File.exist? jlog_name)
+          for curr_name in jlog_list
+            begin
+              JournalLogger.each_log(curr_name) do |log|
+                change_number = log[0]
+                out << "apply journal log: #{change_number}\n" if (out && verbose_level >= 1)
+                apply_journal(w_tar, index, log)
+              end
+            rescue Block::BrokenError
+              out << "warning: incompleted journal log and stopped at #{curr_name}\n" if out
             end
-          rescue Block::BrokenError
-            out << "warning: incompleted journal log and stopped at #{curr_name}\n" if out
           end
-        end
-        w_tar.seek(index.eoa)
-        w_tar.write_EOA
+          w_tar.seek(index.eoa)
+          w_tar.write_EOA
 
-        index.save(idx_name)
-        w_tar.fsync
-        w_tar.close(false)
+          index.save(idx_name)
+          w_tar.fsync
+          w_tar.close(false)
+        }
       }
-      flock.close
 
       nil
     end

data/lib/higgs/utils/bman.rb

@@ -1,8 +1,8 @@
 # = backup manager
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-08 22:10:08 +0900 (Mon, 08 Oct 2007) $
-# Revision:: $Revision: 621 $
+# Date:: $Date: 2007-10-10 00:49:33 +0900 (Wed, 10 Oct 2007) $
+# Revision:: $Revision: 626 $
 #
 # == license
 #   :include:LICENSE
@@ -146,7 +146,7 @@ module Higgs
     # as <tt>BACKUP_TARGET_STORAGE</tt>.
     #
     # === OPTION: <tt>--jlog-rotate-service-uri=URI</tt>
-    # access point journal log rotation remote service.
+    # access point for journal log rotation remote service.
     # <tt>URI</tt> is the same as <tt>:jlog_rotate_service_uri</tt>
     # when Higgs::Storage is opened.
     #
@@ -158,7 +158,7 @@ module Higgs
     #
     class BackupManager
       # for ident(1)
-      CVS_ID = '$Id: bman.rb 621 2007-10-08 13:10:08Z toki $'
+      CVS_ID = '$Id: bman.rb 626 2007-10-09 15:49:33Z toki $'
 
       def initialize(options={})
         @from = options[:from]
@@ -326,14 +326,16 @@ module Higgs
         unless (@to) then
           raise 'required to_storage'
         end
-        FileLock.new("#{@from}.lock").synchronize{
-          FileUtils.cp("#{@to}.idx", "#{@from}.idx", :preserve => true, :verbose => @verbose >= 2)
-          FileUtils.cp("#{@to}.tar", "#{@from}.tar", :preserve => true, :verbose => @verbose >= 2)
-          for path in Storage.rotate_entries("#{@to}.jlog")
-            path =~ /\.jlog\.\d+$/ or raise "mismatch jlog name: #{path}"
-            ext = $&
-            FileUtils.cp(path, "#{@from}#{ext}", :preserve => true, :verbose => @verbose >= 2)
-          end
+        FileLock.open("#{@from}.lock") {|flock|
+          flock.synchronize{
+            FileUtils.cp("#{@to}.idx", "#{@from}.idx", :preserve => true, :verbose => @verbose >= 2)
+            FileUtils.cp("#{@to}.tar", "#{@from}.tar", :preserve => true, :verbose => @verbose >= 2)
+            for path in Storage.rotate_entries("#{@to}.jlog")
+              path =~ /\.jlog\.\d+$/ or raise "mismatch jlog name: #{path}"
+              ext = $&
+              FileUtils.cp(path, "#{@from}#{ext}", :preserve => true, :verbose => @verbose >= 2)
+            end
+          }
         }
         @out << log('completed storage files restore.') if (@verbose >= 1)
         nil

data/lib/higgs/version.rb

@@ -1,8 +1,8 @@
 # = version
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-08 22:16:13 +0900 (Mon, 08 Oct 2007) $
-# Revision:: $Revision: 622 $
+# Date:: $Date: 2007-10-12 16:19:52 +0900 (Fri, 12 Oct 2007) $
+# Revision:: $Revision: 628 $
 #
 # == license
 #   :include:LICENSE
@@ -10,9 +10,9 @@
 
 module Higgs
   # for ident(1)
-  CVS_ID = '$Id: version.rb 622 2007-10-08 13:16:13Z toki $'
+  CVS_ID = '$Id: version.rb 628 2007-10-12 07:19:52Z toki $'
 
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end
 
 # Local Variables:

data/test/test_online_backup.rb

@@ -30,7 +30,7 @@ module Higgs::Test
     include OnlineBackupParams
 
     # for ident(1)
-    CVS_ID = '$Id: test_online_backup.rb 584 2007-09-29 15:05:15Z toki $'
+    CVS_ID = '$Id: test_online_backup.rb 627 2007-10-12 07:10:13Z toki $'
 
     def setup
       srand(0)
@@ -143,9 +143,9 @@ module Higgs::Test
         Storage.recover(@restore_name)
 
         # recovered files are same as original files.
-        assert(FileUtils.cmp("#{@backup_name}.tar", "#{@restore_name}.tar"), 'tar')
+        assert(FileUtils.cmp("#{@backup_name}.tar", "#{@restore_name}.tar"), 'data')
         assert_equal(Index.new.load("#{@backup_name}.idx").to_h,
-                     Index.new.load("#{@restore_name}.idx").to_h, 'idx')
+                     Index.new.load("#{@restore_name}.idx").to_h, 'index')
       ensure
         FileUtils.touch(@stop_latch)
         FileUtils.touch(@end_latch)

data/test/test_storage.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 609 2007-10-04 16:27:39Z toki $'
+    CVS_ID = '$Id: test_storage.rb 627 2007-10-12 07:10:13Z toki $'
 
     def setup
       srand(0)                  # preset for rand
@@ -36,7 +36,7 @@ module Higgs::Test
     include StorageTestCase
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 609 2007-10-04 16:27:39Z toki $'
+    CVS_ID = '$Id: test_storage.rb 627 2007-10-12 07:10:13Z toki $'
 
     def new_storage
       Storage.new(@name, :logger => @logger)
@@ -372,7 +372,7 @@ module Higgs::Test
     include StorageTestCase
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 609 2007-10-04 16:27:39Z toki $'
+    CVS_ID = '$Id: test_storage.rb 627 2007-10-12 07:10:13Z toki $'
 
     def new_storage
       Storage.new(@name,
@@ -421,8 +421,9 @@ module Higgs::Test
       end
       Storage.recover(other_name)
 
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'tar')
-      assert(FileUtils.cmp("#{@name}.idx", "#{other_name}.idx"), 'idx')
+      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'data')
+      assert(Index.new.load("#{@name}.idx").to_h ==
+             Index.new.load("#{other_name}.idx").to_h, 'index')
     end
 
     def test_auto_recovery
@@ -445,9 +446,10 @@ module Higgs::Test
       st2 = Storage.new(other_name, :logger => @logger)
       st2.shutdown
 
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'tar')
-      assert(FileUtils.cmp("#{@name}.idx", "#{other_name}.idx"), 'idx')
-      assert(FileUtils.cmp("#{@name}.jlog", "#{other_name}.jlog"), 'jlog')
+      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'data')
+      assert(Index.new.load("#{@name}.idx").to_h ==
+             Index.new.load("#{other_name}.idx").to_h)
+      assert(FileUtils.cmp("#{@name}.jlog", "#{other_name}.jlog"), 'index')
     end
 
     def test_lost_journal_log_error
@@ -474,7 +476,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 609 2007-10-04 16:27:39Z toki $'
+    CVS_ID = '$Id: test_storage.rb 627 2007-10-12 07:10:13Z toki $'
 
     def setup
       @test_dir = 'st_test'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: higgs
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-10-08 00:00:00 +09:00
+  version: 0.1.2
+date: 2007-10-12 00:00:00 +09:00
 summary: pure ruby transactional storage compatible with unix TAR format
 require_paths: 
 - lib