flydata 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281fa8038b28cccba7e12b76d72a5bab7af9d10b
-  data.tar.gz: 78895abe8bc0f92c7835ec9b0f7093e727a8b71f
+  metadata.gz: 325ec216ca30d8548887146aa97bde6daff26476
+  data.tar.gz: 59a60554b1eea3751b0fc904d9df55fbbc1fab4d
 SHA512:
-  metadata.gz: d87649be6f3f5480fd1529e71a879c8b556f8a9d01aba06117d4a305883ae2734ca94e26d586d281af4aeda8bc2ac14e34e9064c1093bcae4a634559ddceebaf
-  data.tar.gz: bdba9b5af4a27d8129d2b8a7ff454de83daa2f6c09219a6a2d8bca09766fc86f473cd773a8575b2a52f65d3a23f6b27cbec057cb59ad3b454f5037c106be7ce4
+  metadata.gz: 34cf256c13392454624c461b5920bbf8f77540fbe99a470b4acc1249a31e49d3ab627934c1f6b54b32083edf520c8e2836622bb71228febd5236b3b02a36abba
+  data.tar.gz: b2004689294e57c0dee428ea852fe421fbd945b1bf47ec130757c097212d4c0e0eb469543df32994365b5b21cd90b4721cc843f195b80c0f15437119c205fa06

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

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.4.2 ruby lib
+# stub: flydata 0.4.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   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-06-23"
+  s.date = "2015-07-08"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]

data/lib/flydata/command/helper.rb

@@ -113,7 +113,7 @@ if #{running_cmd}; then
     sleep 1.0
     if [ $i -gt 10 ]; then  # 10sec
       echo "Timeout warning: It failed to stop within 10 seconds. The process will be killed with SIGKILL."
-      kill -9 -$(ps --pid `#{@helper_config.helper_pid_path}` --no-heading -o "%r" | tr -d ' ')
+      kill -9 -$(ps --pid `cat #{@helper_config.helper_pid_path}` --no-heading -o "%r" | tr -d ' ')
     else
       i=`expr $i + 1`
     fi

data/lib/flydata/command/sender.rb

@@ -86,7 +86,7 @@ EOF
           begin
             stop(options)
           rescue
-            log_out_stderr 'Something has gone wrong... force stopping the FlyData process...'
+            log_warn_stderr 'Something has gone wrong... force stopping the FlyData process...'
             kill_all(options)
           end
         else

data/lib/flydata/command/sync.rb

@@ -387,6 +387,12 @@ EOS
           return call_block_or_return_io(fp, &block)
         end
 
+        log_info_stdout("Checking MySQL server connection and configuration...")
+        Flydata::MysqlCompatibilityCheck.new(dp, de['mysql_data_entry_preference'], dump_dir: fp, backup_dir: sync_fm.backup_dir).check
+        log_info_stdout("Checking the database size...")
+
+        db_bytesize = Flydata::Parser::Mysql::DatabaseSizeCheck.new(de['mysql_data_entry_preference'].merge('tables' => target_tables)).get_db_bytesize
+
         tables = target_tables
         tables ||= '<all tables>'
         data_servers = de['mysql_data_entry_preference']['data_servers'] ? "\n  data servers: #{de['mysql_data_entry_preference']['data_servers']}" : ""
@@ -406,6 +412,7 @@ EOM
 EOM
         confirmation_text << <<-EOM if file_dump
   dump file:    #{fp}
+  approx. size: #{as_size(db_bytesize)} (#{db_bytesize} byte)
 
 Dump file saves contents of your tables temporarily.  Make sure you have enough disk space.
 EOM
@@ -413,13 +420,6 @@ EOM
         log_info confirmation_text.strip
 
         if ask_yes_no('Start Sync?')
-          log_info_stdout("Checking MySQL server connection and configuration...")
-          Flydata::MysqlCompatibilityCheck.new(dp, de['mysql_data_entry_preference'], dump_dir: fp, backup_dir: sync_fm.backup_dir).check
-          log_info_stdout("Checking the database size...")
-
-          db_bytesize = Flydata::Parser::Mysql::DatabaseSizeCheck.new(de['mysql_data_entry_preference'].merge('tables' => target_tables)).get_db_bytesize
-          log_info_stdout("  -> #{as_size(db_bytesize)} (#{db_bytesize} byte)")
-
           if file_dump
             # check free disk space
             free_disk_bytesize = free_disk_space(File.dirname(fp))
@@ -521,8 +521,6 @@ EOM
           log_info_stdout("Resuming... Last processed table: #{option[:table_name]}")
         else
           option[:binlog_pos] = binlog_pos
-          #If its a new sync, ensure server side resources are clean
-          cleanup_sync_server(de, target_tables_for_api) unless opts.skip_cleanup?
         end
         log_info_stdout("Sending data to FlyData Server...")
 

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

@@ -82,7 +82,6 @@ class MysqlBinlogFlydataInput < MysqlBinlogInput
     $log.info "mysql host:\"#{@host}\" port:\"#{@port}\" username:\"#{@username}\" database:\"#{@database}\" tables:\"#{@tables}\" tables_append_only:\"#{tables_append_only}\""
     $log.info "mysql client version: #{`mysql -V`}"
     server_msg = `echo 'select version();' | #{FlydataCore::Mysql::CommandGenerator.generate_mysql_cmd(@db_opts)} 2>&1`
-    server_msg = server_msg.each_line.select{|l| l.start_with?('ERROR ')}.join("\n")
     if ($?.exitstatus == 0)
       $log.info "mysql server version: #{server_msg.strip}"
     else
@@ -174,6 +173,10 @@ EOS
         $log.info "Sent position feature is enabled. sent_position_file:#{@sent_position_file_path}"
         c.sent_binlog_position_file = @sent_position_file_path
       end
+
+      $log.info("Binlog position - resume_pos:'#{IO.read(@position_file) rescue IOError}' " +
+                                  "sent_pos:'#{IO.read(@sent_position_file_path) rescue IOError}'")
+
       c.connection_retry_limit = @retry_limit
       c.connection_retry_wait = @retry_wait
       c.log_level = @log_level.to_sym

metadata

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