flydata 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fccdf7126a1206e340ad7b7d847761999a2cc28a
-  data.tar.gz: 8a6fbebabc89b31223fa8d8ddc23ca78a2b6380e
+  metadata.gz: 86638a18d82f42ee50003d03780a5e9a62b3d82a
+  data.tar.gz: a6d911a12d67f294d1cb855e293a0add77f99a92
 SHA512:
-  metadata.gz: 722ed46e452d826a877e764f481ef379cf383ed2c9ebb780e5ab4a146a6277681685131da597169873cb8270c2f474209d1f2a379b72adba57bdc75992eacae8
-  data.tar.gz: 7f010de4a37d188b05298c7cab6992627337257b040b5b0d5f0e6009cbaf9a3d7133675a37d93449e066b89ab618ccf63845dd7cf15124f7bd20af9bffa03784
+  metadata.gz: a97793d37523ba2319529941ff8661445b64836038bfa179e453800c45b18f4a91103174e0cc479d8ea821feb42e084f6098392ce7b9667b8d9d90e41f68f466
+  data.tar.gz: 94c736d7dd868e197c96ea39404e04c3f466ab8bd07ae5370872d3a11a34f77be1adcf1027df83cf272789476b451089fee682d7781fcef5b5388ad8016756fe

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.8.7

data/flydata-core/lib/flydata-core/mysql/compatibility_checker.rb

@@ -365,13 +365,13 @@ EOT
       def check_result(result, option = @option)
         if result.first["name"] == "binlog retention hours"
           if result.first["value"].nil? ||
-             result.first["value"].to_i <= BINLOG_RETENTION_HOURS
+             result.first["value"].to_i < BINLOG_RETENTION_HOURS
             raise FlydataCore::MysqlCompatibilityError,
               "Binary log retention is too short\n" +
               "  We recommend setting RDS binlog retention " +
               "to be at least #{BINLOG_RETENTION_HOURS} hours. To do this, " +
               "run this on your RDS MySQL database:\n" +
-              "  $> call mysql.rds_set_configuration('binlog retention hours', 94);"
+              "  $> call mysql.rds_set_configuration('binlog retention hours', #{BINLOG_RETENTION_HOURS});"
           end
         end
       end

data/lib/flydata/command/sync.rb

@@ -434,6 +434,8 @@ EOS
         JSON.generate(h)
       end
 
+      MAX_STOP_RETRIES = 5
+      STOP_RETRY_INTERVAL = 10
       def _check(source_pos_context, options = {})
         options[:stop_agent] ||= false
 
@@ -445,15 +447,34 @@ EOS
         data_stuck_at = nil
         abnormal_shutdown = false
         begin
-          begin
-            # wait until no data gets processed for 3 minutes.  This is long
-            # to wait, but there *are* cases where active data processing takes
-            # more than 3 minutes between 2 chunk processing if COPY command
-            # takes minutes to process.
-            flush_buffer_and_stop(@full_tables, force: false, timeout: 180,
-                                  dont_wait_upload: true)
-          rescue ServerDataProcessingTimeout => e
-            data_stuck_at = e.state
+          retry_count = 0
+          loop do
+            begin
+              # wait until no data gets processed for 3 minutes.  This is long
+              # to wait, but there *are* cases where active data processing takes
+              # more than 3 minutes between 2 chunk processing if COPY command
+              # takes minutes to process.
+              flush_buffer_and_stop(@full_tables, force: false, timeout: 180,
+                                    dont_wait_upload: true)
+            rescue ServerDataProcessingTimeout => e
+              data_stuck_at = e.state
+            end
+
+            # #flush_buffer_and_stop should have stopped the agent process but
+            # double-check because running repair (which calls _check) while
+            # agent is running causes a devestating result which requires full resync.
+            if sender.process_exist?
+              if retry_count > MAX_STOP_RETRIES
+                raise "agent did not stop after several stop attempts.  stop the agent and try again."
+              else
+                retry_count += 1
+                $log.warn "agent did not stop.  will try again (#{retry_count})"
+                sleep STOP_RETRY_INTERVAL
+              end
+            else
+              $log.info "confirmed no agent process running.  Start check"
+              break
+            end
           end
 
           # Agent is stopped but locked.  There was an abnormal shutdown.

data/spec/flydata/api/data_entry_spec.rb

@@ -175,10 +175,10 @@ describe DataEntry do
         end
       end
     end
-    context "with more than 50 tables" do
-      let(:tables) { 80.times.collect{|i| "tbl#{i}"} }
-      let(:expected_tables1) { tables[0...50].join(",") }
-      let(:expected_tables2) { tables[50..-1].join(",") }
+    context "with more than 20 tables" do
+      let(:tables) { 30.times.collect{|i| "tbl#{i}"} }
+      let(:expected_tables1) { tables[0...20].join(",") }
+      let(:expected_tables2) { tables[20..-1].join(",") }
 
       let(:expected_message) { double('expected_message') }
 
@@ -318,10 +318,10 @@ describe DataEntry do
     let(:status21) { double('status21') }
     let(:status22) { double('status22') }
 
-    context "with more than 50 tables" do
-      let(:tables) { 80.times.collect {|i| "tbl#{i}"} }
-      let(:expected_tables1) { tables[0...50].join(",") }
-      let(:expected_tables2) { tables[50..-1].join(",") }
+    context "with more than 20 tables" do
+      let(:tables) { 30.times.collect {|i| "tbl#{i}"} }
+      let(:expected_tables1) { tables[0...20].join(",") }
+      let(:expected_tables2) { tables[20..-1].join(",") }
 
       it do
         expect(api_client).to receive(:post).

metadata

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