flydata 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 550d6891d0b0315d762ded08f079e915888c9b52
-  data.tar.gz: 477cbc3a4977c15b17b9dd3a7ecedfa3fe35595d
+  metadata.gz: d35ee35146966b2d980eb979c3d36c23ce0c5d36
+  data.tar.gz: 9789cbe06d27163a5afc8cfaf9c44a2bf9de495a
 SHA512:
-  metadata.gz: d9eaccb595b37a199a92244e2e27d6b8c8cf79740a8dd69a9add01cce9a68bcd1f94428c2749fdf28d35784d03ff5c0f02c13ccd6d71b324d8b129d93a9f46c5
-  data.tar.gz: bcfa91ee81945016d24f1f686cb329f7c940ab5c36db7baad3886de2fbd34f12d5be6eae80811fccc74aa0f4a2dd31477be98f96045717e486a399d33c86e8e4
+  metadata.gz: 4a7fc6bf22d826f3f7444b0ca85724576f517ded96ed56023a1497b2bc2e2e6e6cc1d561a899d01be0d55b7e1de7cba78aec158e7a78a125b588cd07b7e04479
+  data.tar.gz: f2390bf2dd00890e0cb7e2948d5a7930a2266d3d87aecabe0119e20bb7c97ebe3d3cacf6a6f82348495a9374bd3652ce8fa248d17dda19178128ad68b4bf4dc4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/flydata.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.5.3 ruby lib
+# stub: flydata 0.5.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   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 = "2015-09-03"
+  s.date = "2015-09-08"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]

data/lib/flydata/parser/mysql/dump_parser.rb

@@ -161,12 +161,30 @@ EOS
 
         def create_table_locker
           Fiber.new do
-            client = FlydataMysqlClient.new(@db_opts)
-            # Lock tables
-            client.query "FLUSH LOCAL TABLES;"
+            # short timeout to avoid blocking other queries
+            client = FlydataMysqlClient.new({reconnect: true, read_timeout:9}.merge(@db_opts))
+
             q = flush_tables_with_read_lock_query(client)
             $log.debug "FLUSH TABLES query: #{q}"
-            client.query q
+            thread_id = nil
+            begin
+              thread_id = client.thread_id
+              client.query(q, retry_count: -1, retry_interval: 1,
+                           ) do |retry_count, e|
+                # Query failure callback
+                $log.info "Unable to complete FLUSH TABLES WITH READ LOCK.  Retrying(#{retry_count}).. error:#{e.to_s}"
+                if retry_count >= 360 # should take an hour to get here
+                  raise "Failed to complete FLUSH TABLES WITH READ LOCK after #{retry_count} attemps"
+                end
+                client.query "KILL QUERY #{thread_id}"
+                thread_id = client.thread_id
+              end
+              thread_id = nil
+            ensure
+              if thread_id
+                client.query "KILL QUERY #{thread_id}"
+              end
+            end
             $log.debug "lock acquired"
             begin
               Fiber.yield  # Lock is acquired.  Wait until it can be unlocked.
@@ -223,28 +241,28 @@ EOS
         end
       end
 
-      # Custom mysql client that sets config params (eg:-read_timeout) uniformly for all
-      # mysql access. Also, gives access to the last query that was executed using the client
-      # which can be helpful when handling exceptions
+      # Custom mysql client that gives access to the last query that was
+      # executed using the client which can be helpful when handling exceptions
       class FlydataMysqlClient < Mysql2::Client
 
         attr_accessor :last_query
 
-        def initialize(db_opts)
-          #TODO : Pass timeout in as a setting from the data entry
-          super(db_opts.merge(read_timeout: 3600))
-        end
-
         def query(sql, options = {})
           @last_query = sql
+          max_retry = options[:retry_count] || 0
+          retry_interval = options[:retry_interval] || 3
+          count = 0
+          result = nil
           begin
-            super(sql, options)
-          rescue Mysql2::Error => e
-            if  /^Timeout waiting for a response/ === e.to_s
-              raise "The below query timed out when running. Please check long running processes and locks in your database.\n#{last_query}"
-            end
-            raise e
+            result = super(sql, options)
+          rescue => e
+            count += 1
+            raise e if max_retry != -1 && count > max_retry
+            yield(count, e) if block_given?
+            sleep retry_interval
+            retry
           end
+          result
         end
       end
 

data/spec/flydata/parser/mysql/dump_parser_spec.rb

@@ -40,8 +40,10 @@ module Flydata
             allow(m).to receive(:query).with(/TABLES/)
             allow(m).to receive(:query).with("SHOW VARIABLES LIKE 'version'").
                         and_return([{'Value' => '5.1.40-0ubuntu0.12.04.1-log'}])
+            allow(m).to receive(:query).with("FLUSH TABLES  WITH READ LOCK;", {retry_count:-1, retry_interval:1})
             allow(m).to receive(:query).with("SHOW MASTER STATUS;").
                         and_return([{'File' => 'mysql-bin.000451', 'Position' => 89872}])
+            allow(m).to receive(:thread_id).and_return(1191)
             allow(m).to receive(:close)
             m
           end
@@ -98,11 +100,11 @@ module Flydata
               raise Mysql2::Error.new("Timeout waiting for a response from the last query. (waited 600 seconds)")
             end
           end
-          it 'raises appropriate error when query times out' do
+          it 'raises a timeout error as is' do
             described_class.instance_eval { include DummyMysqlClient }
             sql = "FLUSH LOCAL TABLES"
             test_client = described_class.new(db_opts)
-            expect{test_client.query(sql)}.to raise_error(RuntimeError, /query timed out when running/)
+            expect{test_client.query(sql)}.to raise_error(Mysql2::Error, "Timeout waiting for a response from the last query. (waited 600 seconds)")
             expect(test_client.last_query).to eq(sql)
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client