flydata 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b07bc6d96c6f880657b1c3bd04cdca32b6a7733
-  data.tar.gz: c229361c0f7a9a901c47d843575472ded9160580
+  metadata.gz: 4c20a47aa58c47fa1b27cbc66f95ddf6a1e2167f
+  data.tar.gz: b3004ee91995280c34054010d17b30ee969f5f32
 SHA512:
-  metadata.gz: 055ebeaa6935d909a447d38ecaabe75a99886fe4640bde07b58724274967a487d122da6cf6ae2948d0a1fec742df011cda5bdb3ec1ce46250f639826b0aa78c9
-  data.tar.gz: 86341f2728f2d142e9e4b44b9d10cabc583c3b3507b92dde437aab89d49a1fa6e303d0344a43a2cc2e82fb8bee4716975eb8892f55f06e888858f43efae1444e
+  metadata.gz: b114a92cdb9ec3559a1bd631bb79abe43da8f4b1b75627024acb4d29c9763daf566a68094c97ded5a2c0a028a1545d3f3159d3c2326b7df3c111cc4ad909250d
+  data.tar.gz: a35079372596b80168ea1222fbb8c8649fe191288b2e3dd71d0507f718664a6976337527ca831f1d8aba1f73a48c4ec7cb01f416ab4bbfc469647e988d788ddb

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/circle.yml

@@ -15,6 +15,7 @@ dependencies:
     - wget --no-check-certificate -O mysql-replication-listener.zip https://github.com/flydata/mysql-replication-listener/archive/master.zip
     - unzip mysql-replication-listener.zip
     - cd mysql-replication-listener-master; cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DBoost_NO_BOOST_CMAKE=ON .; make -j4; sudo make install
+    - gem install io-console -v 0.4.6
 
 database:
   override:

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.8.3"
+  s.version = "0.8.4"
 
   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-02-14"
+  s.date = "2017-02-22"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdredshift", "flydata", "serverinfo", "split_sync_ddl.rb"]
@@ -207,6 +207,7 @@ Gem::Specification.new do |s|
     "lib/flydata/helper/action/check_abnormal_shutdown.rb",
     "lib/flydata/helper/action/check_remote_actions.rb",
     "lib/flydata/helper/action/clear.rb",
+    "lib/flydata/helper/action/flush.rb",
     "lib/flydata/helper/action/repair.rb",
     "lib/flydata/helper/action/reset.rb",
     "lib/flydata/helper/action/restart_agent.rb",
@@ -367,6 +368,7 @@ Gem::Specification.new do |s|
     "spec/flydata/helper/action/check_abnormal_shutdown_spec.rb",
     "spec/flydata/helper/action/check_remote_actions_spec.rb",
     "spec/flydata/helper/action/clear_spec.rb",
+    "spec/flydata/helper/action/flush_spec.rb",
     "spec/flydata/helper/action/repair_spec.rb",
     "spec/flydata/helper/action/reset_spec.rb",
     "spec/flydata/helper/action/restart_agent_spec.rb",

data/lib/flydata/command/sync.rb

@@ -97,6 +97,8 @@ module Flydata
           on 'f', 'skip-flush', 'Skip server flush'
           on 'y', 'yes', 'Skip command prompt assuming yes to all questions.  Use this for batch operation.'
           on 'force-run', 'Run forcefully, ignoring exclusive run info'
+          on 'server-timeout=', 'Server data processing timeout', as: Integer, default: SERVER_DATA_PROCESSING_TIMEOUT
+          on 'dont-wait-upload', 'Do not wait for queue items to be processed.'
         end
       end
 
@@ -104,7 +106,9 @@ module Flydata
       #  - Entry method
       def flush(*tables)
         begin
-          flush_buffer_and_stop(tables, skip_flush: opts.skip_flush?)
+          flush_buffer_and_stop(tables, skip_flush: opts.skip_flush?,
+                                        timeout: opts[:'server-timeout'],
+                                        dont_wait_upload: opts.dont_wait_upload?)
         rescue ServerDataProcessingTimeout => e
           ee = ServerDataProcessingTimeout.new("Delayed Data Processing")
           ee.description = <<EOS

data/lib/flydata/helper/action/flush.rb

@@ -0,0 +1,32 @@
+require 'flydata/helper/action/agent_action'
+
+module Flydata
+  module Helper
+    module Action
+      class Flush <  AgentAction
+        def command(opts = {})
+          "sync:flush -y %s" % [build_options(opts)]
+        end
+
+        def build_options(opts)
+          opt_str = ""
+
+          if config_hash(opts)[:skip_flush] # skip server flush
+            opt_str << " --skip-flush"
+          end
+
+          timeout = config_hash(opts)[:server_timeout].to_i
+          if timeout > 0 && timeout <= 3600 # max 1 hour
+            opt_str << " --server-timeout #{timeout}"
+          end
+
+          if !!config_hash(opts)[:dont_wait_upload]
+            opt_str << " --dont-wait-upload"
+          end
+
+          opt_str
+        end
+      end
+    end
+  end
+end

data/lib/flydata/helper/action_ownership.rb

@@ -53,6 +53,7 @@ module Flydata
           self.new(:clear, true, Action::Clear),
           self.new(:stop_helper, true, Action::StopHelper),
           self.new(:reset, true, Action::Reset),
+          self.new(:flush, true, Action::Flush),
         ].inject({}) do |h, action|
           h[action.action_name] = action
           h

data/spec/flydata/helper/action/flush_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require_relative '../helper_shared_context'
+require 'flydata/helper/action/flush'
+
+module Flydata
+  module Helper
+    module Action
+      describe Flush do
+        include_context 'helper context'
+
+        describe "#command" do
+          subject { described_class.new(config).command(opts) }
+
+          context 'without opts' do
+            let(:opts) { {} }
+            it { is_expected.to eq("sync:flush -y ") }
+          end
+
+          context 'with skip flush option' do
+            let(:opts) { {config_hash: {skip_flush: true}} }
+            it { is_expected.to eq("sync:flush -y  --skip-flush") }
+          end
+
+          context 'with server-timeout option' do
+            let(:opts) { {config_hash: {server_timeout: 180}} }
+            it { is_expected.to eq("sync:flush -y  --server-timeout 180")}
+          end
+
+          context 'with dont-wait-upload option' do
+            let(:opts) { {config_hash: {dont_wait_upload: true}} }
+            it { is_expected.to eq("sync:flush -y  --dont-wait-upload")}
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -710,6 +710,7 @@ files:
 - lib/flydata/helper/action/check_abnormal_shutdown.rb
 - lib/flydata/helper/action/check_remote_actions.rb
 - lib/flydata/helper/action/clear.rb
+- lib/flydata/helper/action/flush.rb
 - lib/flydata/helper/action/repair.rb
 - lib/flydata/helper/action/reset.rb
 - lib/flydata/helper/action/restart_agent.rb
@@ -870,6 +871,7 @@ files:
 - spec/flydata/helper/action/check_abnormal_shutdown_spec.rb
 - spec/flydata/helper/action/check_remote_actions_spec.rb
 - spec/flydata/helper/action/clear_spec.rb
+- spec/flydata/helper/action/flush_spec.rb
 - spec/flydata/helper/action/repair_spec.rb
 - spec/flydata/helper/action/reset_spec.rb
 - spec/flydata/helper/action/restart_agent_spec.rb