flydata 0.7.18 → 0.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f6e6673d1001075c0ba38d2c4551aceac38d5b5
-  data.tar.gz: ff03d98fe9137ff5e4a10176a0e9b0c000d68c72
+  metadata.gz: 4dff651087e062d77ad662250b2b10cc15730e5b
+  data.tar.gz: fc52bbcfc5f20d7c1b34032e3f614fdd70a88dc2
 SHA512:
-  metadata.gz: abedde840231a9460445b0983a7ec8d9e1da3d043792352c626d8202b1792787a150571c502ccf39a3d6ea6f3840a0fd617b96922ae55d0c37c81d86cdd73556
-  data.tar.gz: dc1a691a6c514f75339b99ed7c8c46238b8ca6b32bedb3c923e182408382f0bbe13a1e4556c41175876bfa0423a588a9e5af412afb6fe4bd6a7f828f3dedb387
+  metadata.gz: 37ee16a2f265fc533e1b98d13488a1db0e4e05876d8f3a25521f493f120cf499c9d9732d5c99c8118ac6da191eaaab144d786bff51708391ad9261396cbbc7ad
+  data.tar.gz: 94e5da1e6d1fe2dfd439852315684ea63228196352397c219844da71bf03491127ce7b2b6c0027dfe738c9fb6c5de0ea807e6209a57a82526b3119c593c02cd6

data/VERSION

@@ -1 +1 @@
-0.7.18
+0.7.19

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.7.18"
+  s.version = "0.7.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2017-01-26"
+  s.date = "2017-02-01"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdredshift", "flydata", "serverinfo", "split_sync_ddl.rb"]

data/lib/flydata/command/sender.rb

@@ -69,7 +69,7 @@ module Flydata
         Flydata::Command::Sync.new.try_initial_sync(
           source_pos_ready_callback: start_fluentd,
           no_email: opts.no_email?,
-          auto_create: opts.auto_create?,
+          auto_create: options[:auto_create] || opts.auto_create?,
           slop_opts: opts,
         )
         options[:quiet] = quiet_option

data/lib/flydata/command/sync.rb

@@ -258,6 +258,25 @@ EOS
         log_info_stdout("Reset completed successfully.")
       end
 
+      # Command: flydata sync:resync
+      #  - Arguments
+      def self.slop_resync
+        resync_opts = self.slop_reset
+        resync_opts.options.concat(Flydata::Command::Sender.slop_start.options)
+        resync_opts
+      end
+
+      # Command: flydata sync:resync
+      #  - Entry method
+      def resync(*tables)
+        self.reset(*tables)
+        sender = Flydata::Command::Sender.new(opts)
+        sender.start(auto_create: true)
+      rescue => e
+        log_error_stderr("[error] Failed to resync - error:\"#{e}\"")
+        raise e
+      end
+
       # Depricated Command: flydata sync:skip
       # skip initial sync
       def skip
@@ -783,13 +802,21 @@ EOM
           if file_dump
             # check free disk space
             free_disk_bytesize = free_disk_space(File.dirname(fp))
-            if (free_disk_bytesize - db_bytesize) < (1024 * 1024 * 1024) # 1GB
+            diff_bytesize = free_disk_bytesize - db_bytesize
+            # db_bytesize is less than 1GB or
+            # db_bytesize is bigger than 100GB and diff_bytesize is small than 200GB
+            if diff_bytesize < (1024**3) || (db_bytesize > 100*1024**3 && diff_bytesize < 200*1024**3)
+            #if diff_bytesize < (100*1024**3) || (db_bytesize > 100 && diff_bytesize < 200*1024**3)  # for testing
               log_warn_stderr("!!WARNING There may not be enough disk space for a DB dump. We recommend 1GB free disk space after the dump. free disk space:#{as_size(free_disk_bytesize)}(#{free_disk_bytesize} byte) /" +
                               " db size:#{as_size(db_bytesize)}(#{db_bytesize} byte)")
               unless ask_yes_no('Do you want to continue?')
                 log_warn_stderr("To change the dump file directory, delete '#' and modify the path of 'dump_dir:' in '#{Preference::DataEntryPreference.conf_path(de)}'")
                 exit 1
               end
+              # Raise an error if both auto_create and yes option is set to avoid disk full error
+              if options[:auto_create] && opts.yes?
+                raise "Lack of disk space. Please add more disk space or change dump path which has enough space. dbsize:#{as_size(db_bytesize)} free_disk_bytesize:#{as_size(free_disk_bytesize)}"
+              end
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.7.19
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client