flydata 0.2.24 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6418100e744a1d2e8b56aa267859c01fd27b320
-  data.tar.gz: 49d47ce3f12d3a0128cb2facb1d6a1da96dcd0c7
+  metadata.gz: 950ac222e77c45b7dfb9a65f2921d612d78d0a56
+  data.tar.gz: 50e414cced803f9a3ebf279ebef5c5b0409607b6
 SHA512:
-  metadata.gz: 1a63f2132dd06a44904d4ddacf305466466f498c2823da2ff5b84b2054ee28745f4627be3484bd82c723304f0ccf5408b16ba6da0d0841b34691287ab7d2e2b1
-  data.tar.gz: 604b769fda44673787567480d1075bb4913886389bb8a641642de37d0de16d7e17ae58b98f8058f786dbc33ad099d2b81f04e65af4e2b29a4d18828db3954a6c
+  metadata.gz: c9ead00fb45d5f022632e7e59d9b128e9c44b7878e85c6a9796aae0b77e9f5d41bcb83812ef5c32058a1372d5c87be5dc6e9febe4d6416d7e81e2ba8564c2dc3
+  data.tar.gz: f1f36e0bb8354c5580e8be6df19f7f2bf4c23714420b28d9a0a74cd84d9d83dbc692c371503db66376dd42825d9ddab9ff505490f63169d11af818cb59f3b613

data/VERSION

@@ -1 +1 @@
-0.2.24
+0.2.25

data/flydata.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: flydata 0.2.25 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.2.24"
+  s.version = "0.2.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2014-12-18"
+  s.date = "2014-12-21"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]
@@ -143,8 +145,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://flydata.com/"
   s.licenses = ["All right reserved."]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
+  s.rubygems_version = "2.2.2"
   s.summary = "FlyData Agent"
 
   if s.respond_to? :specification_version then

data/lib/flydata/command/sync.rb

@@ -92,6 +92,7 @@ module Flydata
         delete_files.flatten.each do |path|
           FileUtils.rm(path) if File.exists?(path)
         end
+        sync_fm.close
         log_info_stdout("Reset completed successfully.")
       end
 
@@ -142,6 +143,7 @@ module Flydata
         de = retrieve_data_entry
         sync_fm = Flydata::FileUtil::SyncFileManager.new(de)
         binlog_path = sync_fm.binlog_path
+        sync_fm.close
         `touch #{binlog_path}`
         log_info_stdout("Created an empty binlog position file.")
         log_info_stdout("-> #{binlog_path}")
@@ -169,6 +171,7 @@ module Flydata
         sync_fm = Flydata::FileUtil::SyncFileManager.new(de)
         dump_pos_info = sync_fm.load_dump_pos
         fp = sync_fm.dump_file_path
+        sync_fm.close
 
         # status is parsing but dumpfile doesn't exist due to streaming -> raise error
         if dump_pos_info[:status] == STATUS_PARSING && !File.exists?(fp)
@@ -297,6 +300,7 @@ module Flydata
           parse_mysqldump_and_send(mysqldump_io, dp, de, sync_fm, db_bytesize)
         end
         wait_for_mysqldump_processed(dp, de, sync_fm)
+        sync_fm.close
         complete
       end
 
@@ -553,6 +557,7 @@ Thank you for using FlyData!
         else
           raise "Initial sync status is not complete. Try running 'flydata sync'."
         end
+        sync_fm.close
       end
 
       def generate_json(mysql_table, values)
@@ -578,6 +583,7 @@ Thank you for using FlyData!
           mp['initial_sync'] = rs[:initial_sync]
           mp['tables'] = rs[:tables]
         end
+        sync_fm.close
         de
       end
 

data/lib/flydata/fluent-plugins/in_mysql_binlog_flydata.rb

@@ -72,7 +72,7 @@ class MysqlBinlogFlydataInput < MysqlBinlogInput
       @tables << table unless @tables.include?(table)
       @omit_events[table] = [:delete]
     end
-    sync_fm = Flydata::FileUtil::SyncFileManager.new(nil) # Passing nil for data_entry as this class does not use methods which require data_entry
+    @sync_fm = Flydata::FileUtil::SyncFileManager.new(nil) # Passing nil for data_entry as this class does not use methods which require data_entry
 
     table_meta = Mysql::TableMeta.new(
       mysql_url: mysql_url, database: @database, tables: @tables)
@@ -80,7 +80,7 @@ class MysqlBinlogFlydataInput < MysqlBinlogInput
 
     @context = Mysql::Context.new(
       database: @database, tables: @tables,
-      tag: @tag, sync_fm: sync_fm, omit_events: @omit_events,
+      tag: @tag, sync_fm: @sync_fm, omit_events: @omit_events,
       table_meta: table_meta,
     )
     @record_dispatcher = Mysql::FlydataBinlogRecordDispatcher.new(@context)
@@ -169,6 +169,7 @@ EOS
         $log.error "Unable to stop Kodama"
       end
     end
+    @sync_fm.close
   end
 
   def wait_till_safe_to_stop

data/lib/flydata/sync_file_manager.rb

@@ -6,6 +6,12 @@ module Flydata
       TABLE_POSITIONS_DIR = ENV['FLYDATA_TABLE_POSITIONS'] || File.join(FLYDATA_HOME, 'positions')
       def initialize(data_entry)
         @data_entry = data_entry
+        @table_position_files = {} # File objects keyed by table name
+      end
+
+      def close
+        @table_position_files.values.each {|f| f.close }
+        @table_position_files = {}
       end
 
       def dump_file_path
@@ -81,14 +87,7 @@ module Flydata
         file = File.join(table_positions_dir_path, table_name + ".pos")
         retry_count = 0
         begin
-          File.open(file, "r+") do |f|
-            seq = f.read
-            seq = seq.to_i + 1
-            yield(seq)
-            f.rewind
-            f.truncate(0)
-            f.write(seq)
-          end
+          @table_position_files[table_name] ||= File.open(file, "r+")
         rescue Errno::ENOENT
           raise if retry_count > 0 # Already retried.  Must be a differentfile causing the error
           # File not exist.  Create one with initial value of '0'
@@ -96,6 +95,15 @@ module Flydata
           retry_count += 1
           retry
         end
+        f = @table_position_files[table_name]
+        seq = f.read
+        seq = seq.to_i + 1
+        yield(seq)
+        f.rewind
+        f.truncate(0)
+        f.write(seq)
+        f.flush
+        f.rewind
       end
 
       def sync_info_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -565,7 +565,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: FlyData Agent